1

src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -102,6 +102,18 @@ public class BaseController {
         }
         return token;
     }
+
+    protected String getUserName(){
+        String token = request.getHeader("token");
+        if(StringUtils.isEmpty(token)){
+            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+        }
+        String username = JwtUtil.getUsername(token);
+        if(StringUtils.isEmpty(username)){
+            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+        }
+        return username;
+    }
     protected Long getUserId(){
         String token = request.getHeader("token");
         if(StringUtils.isEmpty(token)){

src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -54,8 +54,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/deadlineNumber")
     public Result deadlineNumber(){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(cameraDetailService.deadlineNumber(username));
+        return Result.success(cameraDetailService.deadlineNumber(getUserName()));
     }
 
     /**
@@ -63,8 +62,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/listNew")
     public Result listNew(@RequestBody CameraParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         return Result.success(cameraService.pageList(param));
     }
 
@@ -73,8 +71,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/deadline")
     public Result deadline(){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(cameraService.deadline(username));
+        return Result.success(cameraService.deadline(getUserName()));
     }
 
     /**
@@ -82,8 +79,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/unbind")
     public Result unbind(@RequestBody JSONObject jsonObject){
-        String username = JwtUtil.getUsername(getToken());
-        cameraService.unbind(jsonObject.getLong("cameraId"),jsonObject.getString("ids"),username);
+        cameraService.unbind(jsonObject.getLong("cameraId"),jsonObject.getString("ids"),getUserName());
         return Result.success();
     }
 
@@ -92,8 +88,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(@RequestBody JSONObject jsonObject){
-        String username = JwtUtil.getUsername(getToken());
-        cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),username);
+        cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),getUserName());
         return Result.success();
     }
 
@@ -102,8 +97,7 @@ public class CameraController extends BaseController {
      */
     @PostMapping("/saveCooperationUser")
     public Result saveCooperationUser(@RequestBody JSONObject jsonObject){
-        String username = JwtUtil.getUsername(getToken());
-        if(jsonObject.getString("userName").equals(username)){
+        if(jsonObject.getString("userName").equals(getUserName())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3025, LoginConstant.FAILURE_MSG_3025);
         }
         cameraService.saveCooperationUser(jsonObject.getString("ids"),

src/main/java/com/fdkankan/ucenter/controller/CartController.java

@@ -28,7 +28,7 @@ public class CartController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(@RequestBody CartParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         cartService.add(param);
         return Result.success();
     }
@@ -39,7 +39,7 @@ public class CartController extends BaseController {
      */
     @PostMapping(value = "/remove")
     public Result remove(@RequestBody CartParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         cartService.delete(param);
         return Result.success();
     }
@@ -50,8 +50,7 @@ public class CartController extends BaseController {
      */
     @PostMapping(value = "/list")
     public Result list() throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(cartService.listByUser(username));
+        return Result.success(cartService.listByUser(getUserName()));
     }
 
     /**

src/main/java/com/fdkankan/ucenter/controller/FolderController.java

@@ -43,8 +43,7 @@ public class FolderController extends BaseController {
      */
     @PostMapping("/save")
     public Result save(@RequestBody FolderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         folderService.add(param);
         return Result.success();
     }
@@ -54,9 +53,8 @@ public class FolderController extends BaseController {
      */
     @PostMapping("/update")
     public Result update(@RequestBody FolderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
-        folderService.updateByParam(param,username);
+        param.setUserName(getUserName());
+        folderService.updateByParam(param);
         return Result.success();
     }
 
@@ -65,8 +63,7 @@ public class FolderController extends BaseController {
      */
     @PostMapping("/delete")
     public Result delete(@RequestBody FolderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        folderService.delete(param.getId(),username);
+        folderService.delete(param.getId(),getUserName());
         return Result.success();
     }
 
@@ -76,8 +73,7 @@ public class FolderController extends BaseController {
      */
     @PostMapping("/findListTree")
     public Result findListTree(@RequestBody FolderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(folderService.findListTree(param.getFolderIds(),param.getType(),username));
+        return Result.success(folderService.findListTree(param.getFolderIds(),param.getType(),getUserName()));
     }
 
     /**
@@ -85,8 +81,7 @@ public class FolderController extends BaseController {
      */
     @PostMapping("/move")
     public Result move(@RequestBody FolderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        folderService.move(param,username);
+        folderService.move(param,getUserName());
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -43,7 +43,7 @@ public class IncrementController extends BaseController {
 
     @PostMapping("/findIncrementList")
     public Result findIncrementList(@RequestBody IncrementParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         return Result.success(userIncrementService.pageList(param));
     }
 
@@ -52,7 +52,7 @@ public class IncrementController extends BaseController {
      */
     @PostMapping("/bindCamera")
     public Result bindCamera(@RequestBody IncrementParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         userIncrementService.bindCamera(param);
         return Result.success();
     }
@@ -61,7 +61,7 @@ public class IncrementController extends BaseController {
      */
     @PostMapping("/unbindCamera")
     public Result unbindCamera(@RequestBody IncrementParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         userIncrementService.unbindCamera(param);
         return Result.success();
     }

src/main/java/com/fdkankan/ucenter/controller/LoginController.java

@@ -137,8 +137,7 @@ public class LoginController extends BaseController {
      */
     @PostMapping(value = "/checkSms")
     public Result checkSms(@RequestBody RegisterParam param){
-        String username = JwtUtil.getUsername(getToken());
-        loginService.checkSms(param.getMsgAuthCode(),username,false);
+        loginService.checkSms(param.getMsgAuthCode(),getUserName(),false);
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/controller/OrderController.java

@@ -32,8 +32,7 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/list")
     public Result list(@RequestBody OrderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         return Result.success(orderService.pageList(param));
     }
 
@@ -60,9 +59,8 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/placeOrder")
     public Result placeOrder(@RequestBody PlaceOrderParam param){
-        String username = JwtUtil.getUsername(getToken());
         param.setLang(getLang());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         return Result.success(orderService.placeOrder(param));
     }
 
@@ -79,8 +77,7 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/getIncrementOrDownloadPrice")
     public Result getIncrementOrDownloadPrice(@RequestBody OrderParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         return Result.success(orderService.getIncrementOrDownloadPrice(param));
     }
 
@@ -89,8 +86,7 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/downloadOrder")
     public Result downloadOrder(@RequestBody DownNumParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         param.setTimeZoneOff(getTimeZone());
         param.setAgentKey(getAgentKey());
         return Result.success(orderService.downloadOrder(param));
@@ -101,8 +97,7 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/incrementOrder")
     public Result incrementOrder(@RequestBody DownNumParam param){
-        String username = JwtUtil.getUsername(getToken());
-        param.setUserName(username);
+        param.setUserName(getUserName());
         param.setTimeZoneOff(getTimeZone());
         param.setAgentKey(getAgentKey());
         return Result.success(orderService.incrementOrder(param));

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -84,22 +84,19 @@ public class SceneController extends BaseController {
 
     @PostMapping(value = "/list")
     public Result getScenes(@RequestBody RequestScene param) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(sceneProService.getScenes(username, param));
+        return Result.success(sceneProService.getScenes(getUserName(), param));
 
     }
 
     @PostMapping("/newList")
     public Result newList(@RequestBody SceneParam param) {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(sceneProService.newList(param, username));
+        return Result.success(sceneProService.newList(param, getUserName()));
     }
 
     @PostMapping("/getOnlySceneList")
     public Result getOnlySceneList(@RequestBody SceneParam param) {
-        String username = JwtUtil.getUsername(getToken());
         param.setHasFolder(0);
-        JSONObject jsonObject = sceneProService.newList(param, username);
+        JSONObject jsonObject = sceneProService.newList(param, getUserName());
         JSONObject pageInfo = jsonObject.getJSONObject("pageInfo");
         pageInfo.put("endRow", 0);
         pageInfo.put("firstPage", param.getPageNum());
@@ -121,8 +118,7 @@ public class SceneController extends BaseController {
 
     @PostMapping("/copyScene")
     public Result copyScene(@RequestBody SceneParam param) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        sceneProService.copyScene(param.getSceneNum(), username);
+        sceneProService.copyScene(param.getSceneNum(), getUserName());
         return Result.success();
     }
 
@@ -148,8 +144,7 @@ public class SceneController extends BaseController {
      */
     @PostMapping("/downloadScene")
     public Result downloadScene(@RequestBody SceneParam param) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.down(param.getSceneNum(), username, param.getIsObj()));
+        return Result.success(downService.down(param.getSceneNum(), getUserName(), param.getIsObj()));
     }
 
     /**
@@ -160,7 +155,7 @@ public class SceneController extends BaseController {
      */
     @PostMapping("/downloadProcess")
     public Result downloadProcess(@RequestBody SceneParam param) throws Exception {
-        User user = userService.getByUserName(JwtUtil.getUsername(this.getToken()));
+        User user = getUser();
         DownloadProcessVo downloadProcessVo = downService.downloadProcess(user.getId(), param.getSceneNum(), param.getIsObj());
         if (downloadProcessVo.getStatus() == DownloadStatusEnum.DOWNLOAD_FAILED_CODE) {
             return Result.failure("下载失败！");
@@ -175,8 +170,7 @@ public class SceneController extends BaseController {
      */
     @GetMapping("/checkDownLoadE57")
     public Result checkDownLoadE57(@RequestParam(required = false) String num) {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.checkDownLoadE57(num, username));
+        return Result.success(downService.checkDownLoadE57(num, getUserName()));
     }
 
     /**
@@ -185,8 +179,7 @@ public class SceneController extends BaseController {
      */
     @GetMapping("/downSceneE57")
     public Result downSceneE57(@RequestParam(required = false) String num) {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.downE57(num, username));
+        return Result.success(downService.downE57(num, getUserName()));
     }
 
     /**
@@ -195,8 +188,7 @@ public class SceneController extends BaseController {
      */
     @GetMapping("/downloadProcessE57")
     public Result downloadProcessE57(@RequestParam(required = false) String num) {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.downloadProcessE57(num, username));
+        return Result.success(downService.downloadProcessE57(num, getUserName()));
     }
 
 

src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java

@@ -26,23 +26,17 @@ public class SceneCooperationController extends BaseController {
 
     @PostMapping("/cooperationSceneListNew")
     public Result cooperationSceneListNew(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(sceneCooperationService.cooperationSceneListNew(param,username));
+        return Result.success(sceneCooperationService.cooperationSceneListNew(param,getUserName()));
     }
 
     @PostMapping("/cooperationSceneList")
     public Result cooperationSceneList(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
-        if(username == null){
-            return Result.success();
-        }
-        return Result.success(sceneCooperationService.cooperationSceneListNew(param,username));
+        return Result.success(sceneCooperationService.cooperationSceneListNew(param,getUserName()));
     }
 
     @PostMapping("/onlyCooperationSceneList")
     public Result onlyCooperationSceneList(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(sceneCooperationService.cooperationSceneListNew(param,username));
+        return Result.success(sceneCooperationService.cooperationSceneListNew(param,getUserName()));
     }
 
     /**
@@ -53,32 +47,29 @@ public class SceneCooperationController extends BaseController {
      */
     @PostMapping("/save")
     public Result save(@RequestBody SceneCooperationParam param){
-        String username = JwtUtil.getUsername(getToken());
         if(StringUtils.isNotBlank(getLang())){
             param.setLang(getLang());
         }
-        sceneCooperationService.saveCooperation(param,username);
+        sceneCooperationService.saveCooperation(param,getUserName());
         return Result.success();
     }
 
     @PostMapping("/saveBatch")
     public Result saveBatch(@RequestBody SceneCooperationParam param){
-        String username = JwtUtil.getUsername(getToken());
         if(StringUtils.isNotBlank(getLang())){
             param.setLang(getLang());
         }
         param.setTimeZone(getTimeZone());
-        return Result.success(sceneCooperationService.saveBatchCooperation(param,username));
+        return Result.success(sceneCooperationService.saveBatchCooperation(param,getUserName()));
     }
 
     @PostMapping("/saveCamera")
     public Result saveCamera(@RequestBody SceneCooperationParam param){
-        String username = JwtUtil.getUsername(getToken());
         if(StringUtils.isNotBlank(getLang())){
             param.setLang(getLang());
         }
         param.setTimeZone(getTimeZone());
-        return Result.success(sceneCooperationService.saveCamera(param,username));
+        return Result.success(sceneCooperationService.saveCamera(param,getUserName()));
     }
 
 
@@ -89,8 +80,7 @@ public class SceneCooperationController extends BaseController {
      */
     @PostMapping("/delete")
     public Result delete(@RequestBody SceneCooperationParam param){
-        String username = JwtUtil.getUsername(getToken());
-        sceneCooperationService.deleteCooperation(param,username);
+        sceneCooperationService.deleteCooperation(param,getUserName());
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -35,131 +35,5 @@ import java.util.*;
 @Slf4j
 @RequestMapping("/ucenter/test")
 public class TestController extends BaseController {
-    @Autowired
-    private IFolderSceneService folderSceneService;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    ISceneProService sceneProService;
-    @Autowired
-    IScenePlusService scenePlusService;
-    @Autowired
-    IScenePlusExtService scenePlusExtService;
-    @Autowired
-    ISceneProReService sceneProReService;
-    @Autowired
-    IUserIncrementService userIncrementService;
-
-    @RequestMapping("/_updateViewCount_test")
-    public Result updateViewCount() throws Exception {
-        List<SceneProRe> sceneProRes = sceneProReService.getV4Num();
-        for (SceneProRe sceneProRe : sceneProRes) {
-            ScenePlus scenePlus = scenePlusService.getByNum(sceneProRe.getNum());
-            if(scenePlus != null){
-                ScenePlusExt ext = scenePlusExtService.getByPlusId(scenePlus.getId());
-                if(ext!= null && sceneProRe.getViewCount() != null){
-                    LambdaUpdateWrapper<ScenePlusExt> wrapper = new LambdaUpdateWrapper<>();
-                    wrapper.eq(ScenePlusExt::getId,ext.getId());
-                    wrapper.set(ScenePlusExt::getViewCount,sceneProRe.getViewCount());
-                    scenePlusExtService.update(wrapper);
-                }
-            }
-        }
-        return Result.success( );
-    }
-
-    @GetMapping("checkIncrement")
-    public Result checkIncrement() throws Exception {
-        List<UserIncrement> list = userIncrementService.list();
-        userIncrementService.lockScene(list);
-        return Result.success();
-    }
-
-
-        @RequestMapping("/sendMail")
-    public Result sendMail() throws Exception {
-        return Result.success( );
-    }
-    @Autowired
-    IMailTemplateService mailTemplateService;
-
-    @GetMapping("/sendMail1")
-    public Result sendMail1(@RequestParam(required = false)String userName) throws Exception {
-        //luomin@cgaii.com
-        Integer[] days ={-1,0,30};
-        for (Integer day : days) {
-            if(day == null || day<0){
-                mailTemplateService.sendPeExMail(userName,"");
-                continue;
-            }
-            if(day > 0){
-                mailTemplateService.sendPeNoExMail(userName,day,"");
-                continue;
-            }
-            mailTemplateService.sendPeTodayExMail(userName,"");
-        }
-        return Result.success( );
-    }
-
-    @GetMapping("/sendMail2")
-    public Result sendMail2(@RequestParam(required = false)String userName) throws Exception {
-        //luomin@cgaii.com
-        mailTemplateService.sendCodeMail(userName,"123456","en");
-        mailTemplateService.sendCodeMail(userName,"123456","zh");
-        return Result.success( );
-    }
-    @Autowired
-    SmsService smsService;
-    @GetMapping("/sendMail3")
-    public Result sendMail3(@RequestParam(required = false)String userName,
-                            @RequestParam(required = false)String templateParam,
-                            @RequestParam(required = false)String templateCode) throws Exception {
-        //luomin@cgaii.com
-        smsService.sendSms(userName, templateParam, templateCode);
-        return Result.success( );
-    }
-    @GetMapping("/test1")
-    public Result test1(@RequestParam(required = false)String userName) throws Exception {
-        //luomin@cgaii.com
-        String path = "/mnt/4Dkankan/scene/images/imagest-eur-09XfNdBCB";
-        if(path.contains("images")){
-            String panPath = path +"/panorama";
-            File file = new File(panPath);
-            if(file.exists()){
-                File[] files = file.listFiles();
-                if(files == null || files.length == 0){
-                    return Result.success( );
-                }
-                for (File file1 : files) {
-                    String linkPath =file1.getPath() + "/capture";
-                    log.info("delLink--filePath:{},exists:{}",linkPath,new File(linkPath).exists());
-                    org.apache.commons.io.FileUtils.deleteQuietly(new File(linkPath));
-                        //FileUtil.del(linkPath);
-                }
-            }
-        }
-        return Result.success( );
-    }
-
-    @Autowired
-    ICameraDetailService cameraDetailService;
-    @Autowired
-    IIncrementTypeService incrementTypeService;
-
-    @GetMapping("/checkSsCamera")
-    public Result checkSsCamera() throws Exception {
-        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(CameraDetail::getType,Arrays.asList(10,11));
-        List<CameraDetail> list = cameraDetailService.list(wrapper);
-        for (CameraDetail cameraDetail : list) {
-            Long cameraId = cameraDetail.getCameraId();
-            sceneProService.lockOrUnLockBySpace(cameraId);
-        }
-        return Result.success();
-    }
-
-    public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5(" \u0011\u0007"));
-    }
 
 }

src/main/java/com/fdkankan/ucenter/controller/UserController.java

@@ -37,8 +37,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
     public Result getUserInfo() {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(userService.getUserInfo(username));
+        return Result.success(userService.getUserInfo(getUserName()));
     }
 
     /**
@@ -56,8 +55,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/uploadHead", method = RequestMethod.POST)
     public Result uploadHead(@RequestBody JSONObject jsonObject) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(userService.uploadHead(jsonObject.getString("imgdata"),username));
+        return Result.success(userService.uploadHead(jsonObject.getString("imgdata"),getUserName()));
     }
 
     /**
@@ -71,8 +69,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/insertAddress", method = RequestMethod.POST)
     public Result insertAddress(@RequestBody ShipAddressParam param){
-        String username = JwtUtil.getUsername(getToken());
-        userService.insertAddress(param,username);
+        userService.insertAddress(param,getUserName());
         return Result.success();
     }
 
@@ -90,8 +87,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/updateAddress", method = RequestMethod.POST)
 
     public Result updateAddress(@RequestBody ShipAddressParam param){
-        String username = JwtUtil.getUsername(getToken());
-        userService.updateAddress(param,username);
+        userService.updateAddress(param,getUserName());
         return Result.success();
     }
 
@@ -109,8 +105,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/updateEmail", method = RequestMethod.POST)
     public Result updateEmail(@RequestBody UserParam param){
-        String username = JwtUtil.getUsername(getToken());
-        userService.updateEmail(param.getEmail(),username);
+        userService.updateEmail(param.getEmail(),getUserName());
         return Result.success();
     }
 
@@ -119,8 +114,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/getReceiverInfo", method = RequestMethod.POST)
     public Result getReceiverInfo(){
-        String username = JwtUtil.getUsername(getToken());
-        return  Result.success(userService.getReceiverInfo(username));
+        return  Result.success(userService.getReceiverInfo(getUserName()));
     }
 
     /**
@@ -128,8 +122,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/getReceiverList", method = RequestMethod.POST)
     public Result getReceiverList(){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(userService.getReceiverList(username));
+        return Result.success(userService.getReceiverList(getUserName()));
     }
 
     /**
@@ -138,8 +131,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/updateNickName", method = RequestMethod.POST)
     public Result updateNickName(@RequestBody UserParam param){
-        String username = JwtUtil.getUsername(getToken());
-        userService.updateNickName(param.getNickName(),username);
+        userService.updateNickName(param.getNickName(),getUserName());
         return Result.success();
     }
     /**
@@ -150,8 +142,7 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
     public Result updateUserDetail(@RequestBody UserParam param){
-        String username = JwtUtil.getUsername(getToken());
-        userService.updateUserDetail(param,username);
+        userService.updateUserDetail(param,getUserName());
         return Result.success();
     }
 }

src/main/java/com/fdkankan/ucenter/controller/VirtualOrderController.java

@@ -41,7 +41,7 @@ public class VirtualOrderController extends BaseController {
      */
     @PostMapping("/incrementOrderList")
     public Result incrementOrderList(@RequestBody IncrementOrderParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         return Result.success(incrementOrderService.pageList(param));
     }
 
@@ -50,7 +50,7 @@ public class VirtualOrderController extends BaseController {
      */
     @PostMapping("/downloadOrderList")
     public Result downloadOrderList(@RequestBody IncrementOrderParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         return Result.success(downloadOrderService.pageList(param));
     }
 
@@ -59,7 +59,7 @@ public class VirtualOrderController extends BaseController {
      */
     @PostMapping("/chargeList")
     public Result chargeList(@RequestBody VirtualOrderParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         return Result.success(virtualOrderService.pageList(param));
     }
 
@@ -68,7 +68,7 @@ public class VirtualOrderController extends BaseController {
      */
     @PostMapping("/expansionList")
     public Result expansionList(@RequestBody VirtualOrderParam param){
-        param.setUserName(JwtUtil.getUsername(getToken()));
+        param.setUserName(getUserName());
         return Result.success(expansionOrderService.pageList(param));
     }
 

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -53,7 +53,7 @@ public class FdUserCameraController extends BaseController {
         String userName = param.getString("userName");
         String platform = param.getString("platform");
         if(StringUtils.isEmpty(userName)){
-            userName = JwtUtil.getUsername(getToken());
+            userName = getUserName();
         }
         Camera cameraEntity = cameraService.getBySnCode(snCode);
         if(ObjectUtils.isEmpty(cameraEntity)){

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserSceneController.java

@@ -44,8 +44,7 @@ public class FdUserSceneController extends BaseController {
      */
     @RequestMapping(value = "/detailList", method = RequestMethod.POST)
     public Result getSceneDetailList(@RequestBody FdRequestSceneParam param) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        if(StringUtils.isEmpty(username)){
+        if(StringUtils.isEmpty(getUserName())){
             throw new BusinessException(-1,"用户未登录，或token不合法！");
         }
         List<ResponseScene> sceneDetailList = new ArrayList<>();

src/main/java/com/fdkankan/ucenter/service/IFolderService.java

@@ -22,7 +22,7 @@ public interface IFolderService extends IService<Folder> {
 
     void add(FolderParam param);
 
-    void updateByParam(FolderParam param, String username);
+    void updateByParam(FolderParam param);
 
     void delete(Long id, String username);
 

src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

@@ -64,7 +64,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
     }
 
     @Override
-    public void updateByParam(FolderParam param, String username) {
+    public void updateByParam(FolderParam param) {
         User user = userService.getByUserName(param.getUserName());
         if(StringUtils.isEmpty(param.getName()) || param.getId() == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);