Browse Source

替换@requestHead

lyhzzz 2 years ago
parent
commit
7c9e1b2c2d

+ 3 - 0
src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -83,5 +83,8 @@ public class BaseController {
     protected String getToken(){
         return request.getHeader("token");
     }
+    protected String getSign(){
+        return request.getHeader("sign");
+    }
 
 }

+ 16 - 16
src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -40,8 +40,8 @@ public class CameraController extends BaseController {
      * 获取设备到期数量
      */
     @PostMapping("/deadlineNumber")
-    public Result deadlineNumber(@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result deadlineNumber(){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(cameraDetailService.deadlineNumber(username));
     }
 
@@ -49,8 +49,8 @@ public class CameraController extends BaseController {
      * 分页列表
      */
     @PostMapping("/listNew")
-    public Result listNew(@RequestBody CameraParam param ,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result listNew(@RequestBody CameraParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(cameraService.pageList(param));
     }
@@ -59,8 +59,8 @@ public class CameraController extends BaseController {
      * 获取用户设备到期信息
      */
     @PostMapping("/deadline")
-    public Result deadline(@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result deadline(){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(cameraService.deadline(username));
     }
 
@@ -68,8 +68,8 @@ public class CameraController extends BaseController {
      * 用户解绑设备
      */
     @PostMapping("/unbind")
-    public Result unbind(@RequestBody JSONObject jsonObject,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result unbind(@RequestBody JSONObject jsonObject){
+        String username = JwtUtil.getUsername(getToken());
         cameraService.unbind(jsonObject.getLong("cameraId"),jsonObject.getString("ids"),username);
         return Result.success();
     }
@@ -78,8 +78,8 @@ public class CameraController extends BaseController {
      *用户绑定设备
      */
     @PostMapping("/add")
-    public Result add(@RequestBody JSONObject jsonObject,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result add(@RequestBody JSONObject jsonObject){
+        String username = JwtUtil.getUsername(getToken());
         cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),username);
         return Result.success();
     }
@@ -88,8 +88,8 @@ public class CameraController extends BaseController {
      * 添加相机协作用户
      */
     @PostMapping("/saveCooperationUser")
-    public Result saveCooperationUser(@RequestBody JSONObject jsonObject,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result saveCooperationUser(@RequestBody JSONObject jsonObject){
+        String username = JwtUtil.getUsername(getToken());
         if(jsonObject.getString("userName").equals(username)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3025, LoginConstant.FAILURE_MSG_3025);
         }
@@ -122,19 +122,19 @@ public class CameraController extends BaseController {
      * 获取用户设备--新(根据sn返回全部不分页)
      */
     @PostMapping("/listNewAll")
-    public Result listNewAll(@RequestBody JSONObject jsonObject,@RequestHeader String token){
+    public Result listNewAll(@RequestBody JSONObject jsonObject){
         if(jsonObject.get("childName") == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        return Result.success(cameraService.getAllList(jsonObject.getString("childName"),token));
+        return Result.success(cameraService.getAllList(jsonObject.getString("childName"),getToken()));
     }
 
     /**
      * 获取协作相机sn码集合
      */
     @PostMapping(value = "/getCooperationSnCodes")
-    public Result getCooperationSnCodes(@RequestHeader String token) throws Exception {
-        User user = userService.getByToken(token);
+    public Result getCooperationSnCodes() throws Exception {
+        User user = userService.getByToken(getToken());
         LambdaQueryWrapper<CameraDetail> condition = new LambdaQueryWrapper<>();
         condition.eq(CameraDetail::getCooperationUser,user.getId());
         condition.eq(CameraDetail::getGoodsId,10);

+ 8 - 7
src/main/java/com/fdkankan/ucenter/controller/CartController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.ICartService;
 import com.fdkankan.ucenter.vo.request.CartParam;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/ucenter/user/cart")
-public class CartController {
+public class CartController extends BaseController {
 
     @Autowired
     ICartService cartService;
@@ -26,8 +27,8 @@ public class CartController {
      * 添加购物车
      */
     @PostMapping("/add")
-    public Result add(@RequestBody CartParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result add(@RequestBody CartParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         cartService.add(param);
         return Result.success();
     }
@@ -37,8 +38,8 @@ public class CartController {
      * 购物车商品减或移除
      */
     @PostMapping(value = "/remove")
-    public Result remove(@RequestBody CartParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result remove(@RequestBody CartParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         cartService.delete(param);
         return Result.success();
     }
@@ -48,8 +49,8 @@ public class CartController {
      *
      */
     @PostMapping(value = "/list")
-    public Result list(@RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
+    public Result list() throws Exception {
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(cartService.listByUser(username));
     }
 

+ 10 - 10
src/main/java/com/fdkankan/ucenter/controller/FolderController.java

@@ -42,8 +42,8 @@ public class FolderController extends BaseController {
      * parentId   上层文件夹id
      */
     @PostMapping("/save")
-    public Result save(@RequestBody FolderParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result save(@RequestBody FolderParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         folderService.add(param);
         return Result.success();
@@ -53,8 +53,8 @@ public class FolderController extends BaseController {
      * 修改文件夹
      */
     @PostMapping("/update")
-    public Result update(@RequestBody FolderParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result update(@RequestBody FolderParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         folderService.updateByParam(param,username);
         return Result.success();
@@ -64,8 +64,8 @@ public class FolderController extends BaseController {
      * 删除文件夹
      */
     @PostMapping("/delete")
-    public Result delete(@RequestBody FolderParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result delete(@RequestBody FolderParam param){
+        String username = JwtUtil.getUsername(getToken());
         folderService.delete(param.getId(),username);
         return Result.success();
     }
@@ -75,8 +75,8 @@ public class FolderController extends BaseController {
      * type   文件夹类型,0我的场景,1协作场景
      */
     @PostMapping("/findListTree")
-    public Result findListTree(@RequestBody FolderParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result findListTree(@RequestBody FolderParam param){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(folderService.findListTree(param.getType(),username));
     }
 
@@ -84,8 +84,8 @@ public class FolderController extends BaseController {
      * 移动文件夹或场景
      */
     @PostMapping("/move")
-    public Result move(@RequestBody FolderParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result move(@RequestBody FolderParam param){
+        String username = JwtUtil.getUsername(getToken());
         folderService.move(param,username);
         return Result.success();
     }

+ 8 - 7
src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.UserIncrement;
 import com.fdkankan.ucenter.service.IIncrementTypeService;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/ucenter/user/increment")
-public class IncrementController {
+public class IncrementController extends BaseController {
 
     @Autowired
     IUserIncrementService userIncrementService;
@@ -32,8 +33,8 @@ public class IncrementController {
     }
 
     @PostMapping("/findIncrementList")
-    public Result findIncrementList(@RequestBody IncrementParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result findIncrementList(@RequestBody IncrementParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         return Result.success(userIncrementService.pageList(param));
     }
 
@@ -41,8 +42,8 @@ public class IncrementController {
      * 绑定权益包
      */
     @PostMapping("/bindCamera")
-    public Result bindCamera(@RequestBody IncrementParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result bindCamera(@RequestBody IncrementParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         userIncrementService.bindCamera(param);
         return Result.success();
     }
@@ -50,8 +51,8 @@ public class IncrementController {
      * 解绑权益包
      */
     @PostMapping("/unbindCamera")
-    public Result unbindCamera(@RequestBody IncrementParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result unbindCamera(@RequestBody IncrementParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         userIncrementService.unbindCamera(param);
         return Result.success();
     }

+ 8 - 7
src/main/java/com/fdkankan/ucenter/controller/LoginController.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.impl.LoginService;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/ucenter/sso/user")
-public class LoginController {
+public class LoginController extends BaseController {
 
     @Autowired
     LoginService loginService;
@@ -66,8 +67,8 @@ public class LoginController {
      * 登出
      */
     @PostMapping("/logout")
-    public Result logout(@RequestHeader String token){
-        loginService.logout(token);
+    public Result logout(){
+        loginService.logout(getToken());
         return Result.success();
     }
 
@@ -125,8 +126,8 @@ public class LoginController {
      * 检验token是否过期
      */
     @PostMapping(value = "/checkToken")
-    public Result checkToken(@RequestHeader String token){
-        loginService.loginCheck(token);
+    public Result checkToken(){
+        loginService.loginCheck(getToken());
         return Result.success();
     }
 
@@ -134,8 +135,8 @@ public class LoginController {
      * 检验验证码是否有效
      */
     @PostMapping(value = "/checkSms")
-    public Result checkSms(@RequestBody RegisterParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result checkSms(@RequestBody RegisterParam param){
+        String username = JwtUtil.getUsername(getToken());
         loginService.checkSms(param.getMsgAuthCode(),username,false);
         return Result.success();
     }

+ 12 - 11
src/main/java/com/fdkankan/ucenter/controller/OrderController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IOrderService;
 import com.fdkankan.ucenter.vo.request.DownNumParam;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/ucenter/user/order")
-public class OrderController {
+public class OrderController extends BaseController {
 
     @Autowired
     IOrderService orderService;
@@ -25,8 +26,8 @@ public class OrderController {
      * 获取用户订单
      */
     @PostMapping("/list")
-    public Result list(@RequestBody OrderParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result list(@RequestBody OrderParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.pageList(param));
     }
@@ -53,8 +54,8 @@ public class OrderController {
      * 确认订单
      */
     @PostMapping("/placeOrder")
-    public Result placeOrder(@RequestBody PlaceOrderParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result placeOrder(@RequestBody PlaceOrderParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.placeOrder(param));
     }
@@ -71,8 +72,8 @@ public class OrderController {
      * 获取增值权益或场景下载价格
      */
     @PostMapping("/getIncrementOrDownloadPrice")
-    public Result getIncrementOrDownloadPrice(@RequestBody OrderParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result getIncrementOrDownloadPrice(@RequestBody OrderParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.getIncrementOrDownloadPrice(param));
     }
@@ -81,8 +82,8 @@ public class OrderController {
      * 下载场景提交订单
      */
     @PostMapping("/downloadOrder")
-    public Result downloadOrder(@RequestBody DownNumParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result downloadOrder(@RequestBody DownNumParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.downloadOrder(param));
     }
@@ -91,8 +92,8 @@ public class OrderController {
      * 增值权益提交订单
      */
     @PostMapping("/incrementOrder")
-    public Result incrementOrder(@RequestBody DownNumParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result incrementOrder(@RequestBody DownNumParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.incrementOrder(param));
     }

+ 14 - 14
src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -52,32 +52,32 @@ public class SceneController extends BaseController {
     ISceneService sceneService;
 
     @PostMapping("/findSceneNumber")
-    public Result findSceneNumber(@RequestHeader String token){
-        return Result.success(sceneProService.findSceneNumber(token));
+    public Result findSceneNumber(){
+        return Result.success(sceneProService.findSceneNumber(getToken()));
     }
 
     @PostMapping("/getOldSceneList")
-    public Result getOldSceneList(@RequestBody SceneParam param,@RequestHeader String token){
-        User user = userService.getByToken(token);
+    public Result getOldSceneList(@RequestBody SceneParam param){
+        User user = userService.getByToken(getToken());
         param.setUserId(user.getId());
         return Result.success(sceneService.pageList(param));
     }
     @PostMapping(value = "/list")
-    public Result getScenes(@RequestBody RequestScene param, @RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
+    public Result getScenes(@RequestBody RequestScene param) throws Exception {
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(sceneProService.getScenes(username, param));
 
     }
 
     @PostMapping("/newList")
-    public Result newList(@RequestBody SceneParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result newList(@RequestBody SceneParam param){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(sceneProService.newList(param,username));
     }
 
     @PostMapping("/getOnlySceneList")
-    public Result getOnlySceneList(@RequestBody SceneParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result getOnlySceneList(@RequestBody SceneParam param){
+        String username = JwtUtil.getUsername(getToken());
         param.setHasFolder(0);
         JSONObject jsonObject = sceneProService.newList(param, username);
         JSONObject pageInfo = jsonObject.getJSONObject("pageInfo");
@@ -100,8 +100,8 @@ public class SceneController extends BaseController {
     }
 
     @PostMapping("/copyScene")
-    public Result copyScene(@RequestBody SceneParam param,@RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
+    public Result copyScene(@RequestBody SceneParam param) throws Exception {
+        String username = JwtUtil.getUsername(getToken());
         sceneProService.copyScene(param.getSceneNum(),username);
         return Result.success();
     }
@@ -124,8 +124,8 @@ public class SceneController extends BaseController {
      * @return
      */
     @PostMapping("/downloadScene")
-    public Result downloadScene(@RequestBody SceneParam param,@RequestHeader String token) throws Exception{
-        String username = JwtUtil.getUsername(token);
+    public Result downloadScene(@RequestBody SceneParam param) throws Exception{
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(downService.down(param.getSceneNum(),username));
     }
 

+ 12 - 11
src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 import com.dtflys.forest.annotation.Post;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.SceneCooperation;
 import com.fdkankan.ucenter.service.ISceneCooperationService;
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/ucenter/user/scene/cooperation")
-public class SceneCooperationController {
+public class SceneCooperationController extends BaseController {
 
     @Autowired
     ISceneCooperationService sceneCooperationService;
@@ -23,14 +24,14 @@ public class SceneCooperationController {
     }
 
     @PostMapping("/cooperationSceneListNew")
-    public Result cooperationSceneListNew(@RequestBody SceneParam param,@RequestHeader  String token){
-        String username = JwtUtil.getUsername(token);
+    public Result cooperationSceneListNew(@RequestBody SceneParam param){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(sceneCooperationService.cooperationSceneListNew(param,username));
     }
 
     @PostMapping("/cooperationSceneList")
-    public Result cooperationSceneList(@RequestBody SceneParam param,@RequestHeader  String token){
-        String username = JwtUtil.getUsername(token);
+    public Result cooperationSceneList(@RequestBody SceneParam param){
+        String username = JwtUtil.getUsername(getToken());
         if(username == null){
             return Result.success();
         }
@@ -38,8 +39,8 @@ public class SceneCooperationController {
     }
 
     @PostMapping("/onlyCooperationSceneList")
-    public Result onlyCooperationSceneList(@RequestBody SceneParam param,@RequestHeader  String token){
-        String username = JwtUtil.getUsername(token);
+    public Result onlyCooperationSceneList(@RequestBody SceneParam param){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(sceneCooperationService.cooperationSceneListNew(param,username));
     }
 
@@ -50,8 +51,8 @@ public class SceneCooperationController {
      * resourceIds      场景资源id集合,逗号隔开
      */
     @PostMapping("/save")
-    public Result save(@RequestBody SceneCooperationParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result save(@RequestBody SceneCooperationParam param){
+        String username = JwtUtil.getUsername(getToken());
         sceneCooperationService.saveCooperation(param,username);
         return Result.success();
     }
@@ -60,8 +61,8 @@ public class SceneCooperationController {
      * sceneNum         场景码
      */
     @PostMapping("/delete")
-    public Result delete(@RequestBody SceneCooperationParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result delete(@RequestBody SceneCooperationParam param){
+        String username = JwtUtil.getUsername(getToken());
         sceneCooperationService.deleteCooperation(param,username);
         return Result.success();
     }

+ 20 - 19
src/main/java/com/fdkankan/ucenter/controller/UserController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.service.impl.LoginService;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/ucenter/user")
-public class UserController {
+public class UserController extends BaseController {
 
     @Autowired
     private IUserService userService;
@@ -34,8 +35,8 @@ public class UserController {
      * 获取用户信息
      */
     @RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
-    public Result getUserInfo( @RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
+    public Result getUserInfo() {
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(userService.getUserInfo(username));
     }
 
@@ -53,8 +54,8 @@ public class UserController {
      * imgdata 图片的base64码
      */
     @RequestMapping(value = "/uploadHead", method = RequestMethod.POST)
-    public Result uploadHead(@RequestBody JSONObject jsonObject, @RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
+    public Result uploadHead(@RequestBody JSONObject jsonObject) throws Exception {
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(userService.uploadHead(jsonObject.getString("imgdata"),username));
     }
 
@@ -68,8 +69,8 @@ public class UserController {
      * shipMobile       收货人手机
      */
     @RequestMapping(value = "/insertAddress", method = RequestMethod.POST)
-    public Result insertAddress(@RequestBody ShipAddressParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result insertAddress(@RequestBody ShipAddressParam param){
+        String username = JwtUtil.getUsername(getToken());
         userService.insertAddress(param,username);
         return Result.success();
     }
@@ -87,8 +88,8 @@ public class UserController {
      */
     @RequestMapping(value = "/updateAddress", method = RequestMethod.POST)
 
-    public Result updateAddress(@RequestBody ShipAddressParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result updateAddress(@RequestBody ShipAddressParam param){
+        String username = JwtUtil.getUsername(getToken());
         userService.updateAddress(param,username);
         return Result.success();
     }
@@ -106,8 +107,8 @@ public class UserController {
      * email        邮箱地址
      */
     @RequestMapping(value = "/updateEmail", method = RequestMethod.POST)
-    public Result updateEmail(@RequestBody UserParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result updateEmail(@RequestBody UserParam param){
+        String username = JwtUtil.getUsername(getToken());
         userService.updateEmail(param.getEmail(),username);
         return Result.success();
     }
@@ -116,8 +117,8 @@ public class UserController {
      * 获取用户默认收货信息
      */
     @RequestMapping(value = "/getReceiverInfo", method = RequestMethod.POST)
-    public Result getReceiverInfo(@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result getReceiverInfo(){
+        String username = JwtUtil.getUsername(getToken());
         return  Result.success(userService.getReceiverInfo(username));
     }
 
@@ -125,8 +126,8 @@ public class UserController {
      * 获取用户收货信息列表
      */
     @RequestMapping(value = "/getReceiverList", method = RequestMethod.POST)
-    public Result getReceiverList(@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result getReceiverList(){
+        String username = JwtUtil.getUsername(getToken());
         return Result.success(userService.getReceiverList(username));
     }
 
@@ -135,8 +136,8 @@ public class UserController {
      * nickName     用户昵称
      */
     @RequestMapping(value = "/updateNickName", method = RequestMethod.POST)
-    public Result updateNickName(@RequestBody UserParam param,@RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result updateNickName(@RequestBody UserParam param){
+        String username = JwtUtil.getUsername(getToken());
         userService.updateNickName(param.getNickName(),username);
         return Result.success();
     }
@@ -147,8 +148,8 @@ public class UserController {
      * isNotice     isNotice
      */
     @RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
-    public Result updateUserDetail(@RequestBody UserParam param, @RequestHeader String token){
-        String username = JwtUtil.getUsername(token);
+    public Result updateUserDetail(@RequestBody UserParam param){
+        String username = JwtUtil.getUsername(getToken());
         userService.updateUserDetail(param,username);
         return Result.success();
     }

+ 10 - 9
src/main/java/com/fdkankan/ucenter/controller/VirtualOrderController.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.controller;
 
 import com.dtflys.forest.annotation.Post;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IDownloadOrderService;
 import com.fdkankan.ucenter.service.IExpansionOrderService;
@@ -23,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/ucenter/user/virtualOrder")
-public class VirtualOrderController {
+public class VirtualOrderController extends BaseController {
 
     @Autowired
     IIncrementOrderService incrementOrderService;
@@ -39,8 +40,8 @@ public class VirtualOrderController {
      * 获取会员权益记录
      */
     @PostMapping("/incrementOrderList")
-    public Result incrementOrderList(@RequestBody IncrementOrderParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result incrementOrderList(@RequestBody IncrementOrderParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         return Result.success(incrementOrderService.pageList(param));
     }
 
@@ -48,8 +49,8 @@ public class VirtualOrderController {
      * 获取用户下载订单
      */
     @PostMapping("/downloadOrderList")
-    public Result downloadOrderList(@RequestBody IncrementOrderParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result downloadOrderList(@RequestBody IncrementOrderParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         return Result.success(downloadOrderService.pageList(param));
     }
 
@@ -57,8 +58,8 @@ public class VirtualOrderController {
      * 获取用户充值记录
      */
     @PostMapping("/chargeList")
-    public Result chargeList(@RequestBody VirtualOrderParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result chargeList(@RequestBody VirtualOrderParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         return Result.success(virtualOrderService.pageList(param));
     }
 
@@ -66,8 +67,8 @@ public class VirtualOrderController {
      * 获取用户扩容记录
      */
     @PostMapping("/expansionList")
-    public Result expansionList(@RequestBody VirtualOrderParam param, @RequestHeader String token){
-        param.setUserName(JwtUtil.getUsername(token));
+    public Result expansionList(@RequestBody VirtualOrderParam param){
+        param.setUserName(JwtUtil.getUsername(getToken()));
         return Result.success(expansionOrderService.pageList(param));
     }
 

+ 5 - 5
src/main/java/com/fdkankan/ucenter/controller/api/MangeApiController.java

@@ -1,5 +1,7 @@
 package com.fdkankan.ucenter.controller.api;
 
+import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.ResultData;
 import com.fdkankan.ucenter.service.ISceneProService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,16 +9,14 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/ucenter/_manage")
-public class MangeApiController {
+public class MangeApiController extends BaseController {
 
     @Autowired
     ISceneProService sceneProService;
 
     @GetMapping("/_copy_scene")
-    public ResultData copyScene(@RequestParam(required = false) String num,
-                                @RequestHeader String sign) throws Exception {
-
-        if(!sign.equals("m_a_n_a_g_e")){
+    public ResultData copyScene(@RequestParam(required = false) String num) throws Exception {
+        if(!"m_a_n_a_g_e".equals(getSign())){
             return ResultData.error(-1,"无权过问");
         }
         sceneProService.copySceneNoCheck(num);

+ 6 - 6
src/main/java/com/fdkankan/ucenter/controller/api/VoidController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.controller.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IScenePlusVoidService;
 import com.fdkankan.ucenter.vo.request.SceneParam;
@@ -16,7 +17,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/ucenter/void")
-public class VoidController {
+public class VoidController extends BaseController {
 
     @Autowired
     IScenePlusVoidService scenePlusVoidService;
@@ -28,10 +29,9 @@ public class VoidController {
      */
     @GetMapping("/scene/status")
     public Result setStatus(@RequestParam(required = false) String  num,
-                            @RequestParam(required = false) Integer type,
-                            @RequestHeader String token){
+                            @RequestParam(required = false) Integer type){
 
-        scenePlusVoidService.setStatus(num,type,token);
+        scenePlusVoidService.setStatus(num,type,getToken());
         return Result.success();
     }
 
@@ -39,8 +39,8 @@ public class VoidController {
      * 只需获取v4场景数据,无需文件夹
      */
     @PostMapping("/scene/list")
-    public Result sceneList(@RequestBody SceneParam param, @RequestHeader String token){
-        List<ScenePlusVo> scenePlusVos = scenePlusVoidService.scenePageList(param, token);
+    public Result sceneList(@RequestBody SceneParam param){
+        List<ScenePlusVo> scenePlusVos = scenePlusVoidService.scenePageList(param,getToken() );
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("list",scenePlusVos);
         return Result.success(jsonObject);

+ 4 - 3
src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller.app;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.impl.AppService;
 import com.fdkankan.ucenter.service.impl.LoginService;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/ucenter/sso/app")
-public class AppController {
+public class AppController extends BaseController {
 
     @Autowired
     private AppService appService;
@@ -77,8 +78,8 @@ public class AppController {
      * 登出
      */
     @RequestMapping(value = "/logout", method = RequestMethod.POST)
-    public Result logout(@RequestHeader String token) {
-        appService.logout(token);
+    public Result logout() {
+        appService.logout(getToken());
         return Result.success();
     }
 

+ 2 - 2
src/main/java/com/fdkankan/ucenter/controller/app/InvoiceController.java

@@ -93,8 +93,8 @@ public class InvoiceController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/open", method = RequestMethod.POST)
-    public Result open(@RequestBody InvoiceParam param, @RequestHeader String token) throws Exception {
-        return Result.success(invoiceService.openInvoice( param,token));
+    public Result open(@RequestBody InvoiceParam param) throws Exception {
+        return Result.success(invoiceService.openInvoice( param,getToken()));
     }
 
 }

+ 1 - 3
src/main/java/com/fdkankan/ucenter/pay/factory/impl/down/PaypalDownload.java

@@ -52,9 +52,7 @@ public class PaypalDownload implements PayEntity {
         String orderSn = downloadOrderEntity.getOrderSn();
         orderSn += "_download";
         String body = subject;
-        return payOrderService.payPalPay(orderSn, subject, body, downloadOrderEntity.getAmount(), downloadOrderEntity.getAmount(),
-                successUrl,
-                cancelUrl);
+        return payOrderService.payPalPay(orderSn, subject, body, downloadOrderEntity.getAmount(), downloadOrderEntity.getAmount(), successUrl, cancelUrl);
     }
 
     @Override