Commit 327b54d9 authored by liqin's avatar liqin 💬

bug fixed

parent 71c73084
...@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiImplicitParam; ...@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
...@@ -20,7 +22,6 @@ import java.util.List; ...@@ -20,7 +22,6 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/account") @RequestMapping("/account")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class AccountController { public class AccountController {
@Autowired @Autowired
private AccountService accountService; private AccountService accountService;
......
...@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/bank") @RequestMapping("/bank")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class BankController { public class BankController {
@Autowired @Autowired
private BankService bankService; private BankService bankService;
......
...@@ -7,7 +7,10 @@ import io.swagger.annotations.ApiParam; ...@@ -7,7 +7,10 @@ import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -25,7 +28,6 @@ import java.util.UUID; ...@@ -25,7 +28,6 @@ import java.util.UUID;
@RestController @RestController
@RequestMapping("/pic") @RequestMapping("/pic")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class FileUploadController { public class FileUploadController {
/** /**
......
package cn.wisenergy.web.admin.controller.app; package cn.wisenergy.web.admin.controller.app;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -10,7 +9,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -10,7 +9,6 @@ import org.springframework.web.bind.annotation.RestController;
* @author 86187 * @author 86187
*/ */
@RestController @RestController
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class IndexController { public class IndexController {
@GetMapping("/index") @GetMapping("/index")
......
...@@ -2,10 +2,10 @@ package cn.wisenergy.web.admin.controller.app; ...@@ -2,10 +2,10 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.enums.ResultEnum; import cn.wisenergy.common.enums.ResultEnum;
import cn.wisenergy.common.utils.*; import cn.wisenergy.common.utils.*;
import cn.wisenergy.web.sms.*;
import cn.wisenergy.model.app.User; import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto; import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.service.app.UserService; import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.sms.BaseException;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation; ...@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -29,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; ...@@ -29,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
@Slf4j @Slf4j
@RequestMapping("/api/user") @RequestMapping("/api/user")
@RestController @RestController
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class LoginController { public class LoginController {
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
......
...@@ -2,15 +2,13 @@ package cn.wisenergy.web.admin.controller.app; ...@@ -2,15 +2,13 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.enums.ResultEnum; import cn.wisenergy.common.enums.ResultEnum;
import cn.wisenergy.common.utils.*; import cn.wisenergy.common.utils.*;
import cn.wisenergy.web.sms.*; import cn.wisenergy.web.sms.BaseException;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j @Slf4j
@RequestMapping("/api/sms") @RequestMapping("/api/sms")
@RestController @RestController
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class SmsController { public class SmsController {
@Autowired @Autowired
......
...@@ -9,7 +9,6 @@ import io.swagger.annotations.Api; ...@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/ZX") @RequestMapping("/ZX")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class TestController { public class TestController {
// @Autowired // @Autowired
......
...@@ -4,19 +4,22 @@ import cn.wisenergy.common.utils.Result; ...@@ -4,19 +4,22 @@ import cn.wisenergy.common.utils.Result;
import cn.wisenergy.model.app.Page; import cn.wisenergy.model.app.Page;
import cn.wisenergy.model.app.shopZx; import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.service.app.UploadService; import cn.wisenergy.service.app.UploadService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import io.swagger.annotations.*; import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.*;
/** /**
...@@ -26,7 +29,6 @@ import java.util.*; ...@@ -26,7 +29,6 @@ import java.util.*;
@RestController @RestController
@RequestMapping("/ZX") @RequestMapping("/ZX")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class UploadController { public class UploadController {
@Autowired @Autowired
......
...@@ -3,17 +3,11 @@ package cn.wisenergy.web.admin.controller.app; ...@@ -3,17 +3,11 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.constant.RedisConsts; import cn.wisenergy.common.constant.RedisConsts;
import cn.wisenergy.common.utils.R; import cn.wisenergy.common.utils.R;
import cn.wisenergy.common.utils.RedisUtils; import cn.wisenergy.common.utils.RedisUtils;
import cn.wisenergy.common.utils.StringUtil;
import cn.wisenergy.mapper.RecommendUserMapper;
import cn.wisenergy.mapper.TeamUserInfoMapper;
import cn.wisenergy.model.app.RecommendUser; import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo; import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User; import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.WithdrawBankDto;
import cn.wisenergy.model.vo.AerialDeliveryVo; import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserAndRecommendVo; import cn.wisenergy.model.vo.UserAndRecommendVo;
import cn.wisenergy.model.vo.WithdrawalRecordVo;
import cn.wisenergy.service.app.RecommendUserService; import cn.wisenergy.service.app.RecommendUserService;
import cn.wisenergy.service.app.TeamUserInfoService; import cn.wisenergy.service.app.TeamUserInfoService;
import cn.wisenergy.service.app.UserForestStatusService; import cn.wisenergy.service.app.UserForestStatusService;
...@@ -21,9 +15,6 @@ import cn.wisenergy.service.app.UserService; ...@@ -21,9 +15,6 @@ import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.common.BaseController; import cn.wisenergy.web.common.BaseController;
import cn.wisenergy.web.config.JwtConfig; import cn.wisenergy.web.config.JwtConfig;
import cn.wisenergy.web.shiro.JwtUtil; import cn.wisenergy.web.shiro.JwtUtil;
import cn.wisenergy.web.sms.*;
import com.alibaba.druid.sql.ast.statement.SQLIfStatement;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -34,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -34,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.Month;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -47,7 +37,6 @@ import java.util.Map; ...@@ -47,7 +37,6 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/user") @RequestMapping("/user")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class UserController extends BaseController { public class UserController extends BaseController {
@Autowired @Autowired
......
...@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiOperation; ...@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -24,7 +23,6 @@ import java.util.List; ...@@ -24,7 +23,6 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/wallet") @RequestMapping("/wallet")
@Slf4j @Slf4j
@CrossOrigin(allowCredentials = "true", origins = "*", maxAge = 3600)
public class WalletController { public class WalletController {
@Autowired @Autowired
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment