Merge branch 'test'

README.md

@@ -40,4 +40,11 @@
 1.批量协作
 2.协作商品详情
 http://120.25.146.52:3090/project/228/interface/api/cat_2077
-~~~~
+~~~~
+
+
+~~~~
+1，/ucenter/user/scene/newList  个人中心场景列表接口
+    通过token获取用户数据，无法越过token获取其他数据，用户Id强校验
+~~~~
+

pom.xml

@@ -141,7 +141,11 @@
             <version>1.18.20</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-sign</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/fdkankan/ucenter/annotation/CheckInnerApiPermit.java

@@ -1,14 +0,0 @@
-package com.fdkankan.ucenter.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface CheckInnerApiPermit {
-    String description() default "";
-}

src/main/java/com/fdkankan/ucenter/annotation/VerifySign.java

@@ -0,0 +1,26 @@
+package com.fdkankan.ucenter.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 验签注解
+ * 被此注解标记的方法需要进行签名验证
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface VerifySign {
+    /**
+     * 是否启用验签，默认true
+     */
+    boolean enabled() default true;
+
+    /**
+     * 签名参数名，默认"sign"
+     */
+    String signParam() default "sign";
+    /**
+     * appId参数名，默认"appId"
+     */
+    String appId() default "appId";
+}

src/main/java/com/fdkankan/ucenter/aop/SignVerifyAspect.java

@@ -0,0 +1,101 @@
+package com.fdkankan.ucenter.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.sign.RsaUtils;
+import com.fdkankan.sign.SignUtils;
+import com.fdkankan.ucenter.annotation.VerifySign;
+import com.fdkankan.ucenter.common.constants.ResultCode;
+import com.fdkankan.ucenter.entity.AppSecret;
+import com.fdkankan.ucenter.exception.BusinessException;
+import com.fdkankan.ucenter.service.IAppSecretService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Aspect
+@Component
+@Slf4j
+public class SignVerifyAspect {
+
+    @Autowired
+    IAppSecretService appSecretService;
+    @Autowired
+    RedisUtil redisUtil;
+
+    @Around("@annotation(verifySign)")
+    public Object verifySign(ProceedingJoinPoint joinPoint, VerifySign verifySign) throws Throwable {
+        if (!verifySign.enabled()) {
+            return joinPoint.proceed();
+        }
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String header = request.getHeader("X-UA");
+        if(StringUtils.isNotBlank(header)){
+            return joinPoint.proceed();
+        }
+        String sign = request.getHeader(verifySign.signParam().toLowerCase());
+        String appId = request.getHeader(verifySign.appId().toLowerCase());
+
+        if(StringUtils.isBlank(sign) || StringUtils.isBlank(appId)){
+            log.info("verifySign--requestPath:{},sign:{},appId:{}",request.getRequestURL(),sign,appId);
+            throw new BusinessException(ResultCode.SIGN_ERROR);
+        }
+        AppSecret byAppId = null;
+        if(redisUtil.hasKey("ucenter:sign:appid:"+appId)){
+            byAppId = JSONObject.parseObject(redisUtil.get("ucenter:sign:appid:"+appId),AppSecret.class);
+        }else {
+            byAppId = appSecretService.getByAppId(appId);
+        }
+        if(byAppId == null){
+            log.info("verifySign--requestPath:{},sign:{},appId:{}",request.getRequestURL(),sign,appId);
+            throw new BusinessException(ResultCode.SIGN_ERROR);
+        }
+        if(!SignUtils.checkSign(sign,appId,byAppId.getPrivateKey())){
+            log.info("verifySign-checkSign-error-requestPath:{},sign:{},appId:{}",request.getRequestURL(),sign,appId);
+            throw new BusinessException(ResultCode.SIGN_ERROR);
+        }
+        if(!redisUtil.hasKey("ucenter:sign:appid:"+appId)){
+            redisUtil.set("ucenter:sign:appid:"+appId, JSONObject.toJSONString(byAppId),60 *60 *2);
+        }
+        return joinPoint.proceed();
+    }
+
+
+    public static Boolean checkSign(String sign,String appIdValue,String privateKey) {
+        try {
+            if(StringUtils.isBlank(sign)){
+                return false;
+            }
+            String deTxt = RsaUtils.decipher(sign, privateKey);
+            if(StringUtils.isBlank(deTxt)){
+                return false;
+            }
+            org.json.JSONObject jsonObject = new org.json.JSONObject(deTxt);
+            String appId = jsonObject.getString("appId");
+            Long timestamp = jsonObject.getLong("timestamp");
+            if(StringUtils.isBlank(appId) || timestamp == null){
+                return false;
+            }
+            if(!appId.equals(appIdValue)){
+                return false;
+            }
+            Long time = new Date().getTime();
+            //app获取时间存在误差，前后五分钟失败
+            if(Math.abs(time -timestamp) >1000 * 60 *5){
+                return false;
+            }
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
+}

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/common/constants/ResultCode.java

@@ -19,6 +19,7 @@ public enum ResultCode {
     USER_NOT_LOGIN(3004, "用户未登录"),
     PARAM_MISS(3001, "参数缺失"),
 
+    SIGN_ERROR(99991, "签名错误"),
 
     ;
     private Integer code;

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -42,6 +42,12 @@ public class WebAppConfig implements WebMvcConfigurer {
 						"/**/getIncrementType/**",
 						"/**/system/**"
 				);
+		registry.addInterceptor(ucenterInterceptor).addPathPatterns("/**/user/scene/**")
+				.excludePathPatterns(
+						"/fd/**/user/scene/**",
+						"/**/getArPathByNum/**"
+				);
+		registry.addInterceptor(ucenterInterceptor).addPathPatterns("/**/device/**");
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")
 				.excludePathPatterns(

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/DeviceSceneController.java

@@ -1,8 +1,14 @@
 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.common.constants.ResultCode;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.exception.BusinessException;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
 import com.fdkankan.ucenter.service.IScenePlusService;
 import com.fdkankan.ucenter.service.ISceneProService;
 import com.fdkankan.ucenter.service.impl.AppSceneService;
@@ -28,6 +34,8 @@ public class DeviceSceneController extends BaseController {
 
     @Autowired
     ISceneProService sceneProService;
+    @Autowired
+    ICameraService cameraService;
 
 
     /**
@@ -41,6 +49,15 @@ public class DeviceSceneController extends BaseController {
         if(StringUtils.isNotBlank(param.getSearchKey())){
             param.setSceneName(param.getSearchKey());
         }
+        String username = JwtUtil.getUsername(getToken());
+        if(StringUtils.isBlank(username)){
+            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+        }
+        Camera camera = cameraService.getBySnCode(username);
+        if(camera == null){
+            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+        }
+        param.setCameraId(camera.getId());
         JSONObject data = sceneProService.newList(param, null);
         JSONObject pageInfo = data.getJSONObject("pageInfo");
         pageInfo.put("sceneNum",pageInfo.getInteger("total"));

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

@@ -107,9 +107,10 @@ public class LoginController extends BaseController {
      */
     @PostMapping("/register")
     public Result register(@RequestBody RegisterParam param) throws Exception {
-        if(param.getMsgAuthCode().equals(registerValidCode)){
+        if(registerValidCode.equals(param.getMsgAuthCode())){
             param.setClear("YES");
         }
+        param.setAgentKey(getAgentKey());
         loginService.register(param);
         return Result.success();
     }
@@ -136,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();
     }
 
@@ -155,7 +155,7 @@ public class LoginController extends BaseController {
      * @param user
      * @return
      */
-    @RequestMapping(value = "/findMsgAuthCode", method = RequestMethod.POST)
+   // @RequestMapping(value = "/findMsgAuthCode", method = RequestMethod.POST)
     public Result findMsgAuthCode(@RequestBody LoginParam user) {
 
         String redisKey = RedisKeyUtil.PREFIX_MSG_AUTH_CODE +user.getPhoneNum();
@@ -169,5 +169,6 @@ public class LoginController extends BaseController {
 
         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

@@ -45,7 +45,7 @@ import java.util.UUID;
  * 场景表 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-07-04
  */
 @RestController
@@ -71,42 +71,40 @@ public class SceneController extends BaseController {
     TakeLookService takeLookService;
 
     @PostMapping("/findSceneNumber")
-    public Result findSceneNumber(){
+    public Result findSceneNumber() {
         return Result.success(sceneProService.findSceneNumber(getToken()));
     }
 
     @PostMapping("/getOldSceneList")
-    public Result getOldSceneList(@RequestBody SceneParam param){
+    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) 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));
+    public Result newList(@RequestBody SceneParam param) {
+        return Result.success(sceneProService.newList(param, getUserName()));
     }
 
     @PostMapping("/getOnlySceneList")
-    public Result getOnlySceneList(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
+    public Result getOnlySceneList(@RequestBody SceneParam param) {
         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());
-        pageInfo.put("hasNextPage",false);
-        pageInfo.put("isLastPage",0);
-        pageInfo.put("size",pageInfo.get("total"));
+        pageInfo.put("endRow", 0);
+        pageInfo.put("firstPage", param.getPageNum());
+        pageInfo.put("hasNextPage", false);
+        pageInfo.put("isLastPage", 0);
+        pageInfo.put("size", pageInfo.get("total"));
         Integer pages = pageInfo.getInteger("total") / param.getPageSize();
-        pageInfo.put("pages",pageInfo.getInteger("total") % param.getPageSize() == 0 ? pages : pages + 1);
+        pageInfo.put("pages", pageInfo.getInteger("total") % param.getPageSize() == 0 ? pages : pages + 1);
         return Result.success(pageInfo);
     }
 
@@ -120,13 +118,13 @@ 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();
     }
+
     @PostMapping("/delete")
     public Result delete(@RequestBody SceneParam param) throws Exception {
-        sceneProService.delete(param.getSceneNum(),getUserId(),param.getPlatform());
+        sceneProService.delete(param.getSceneNum(), getUserId(), param.getPlatform());
         return Result.success();
     }
 
@@ -135,29 +133,31 @@ public class SceneController extends BaseController {
      */
     @PostMapping("/checkDownload")
     public Result checkDownload(@RequestBody SceneParam param) throws Exception {
-        return Result.success( downService.checkDownLoad(param.getSceneNum(),param.getIsObj()) );
+        return Result.success(downService.checkDownLoad(param.getSceneNum(), param.getIsObj()));
     }
+
     /**
      * 校验该场景有无下载资格
+     *
      * @param param
      * @return
      */
     @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()));
+    public Result downloadScene(@RequestBody SceneParam param) throws Exception {
+        return Result.success(downService.down(param.getSceneNum(), getUserName(), param.getIsObj()));
     }
 
     /**
      * 获取下载进度
+     *
      * @param param
      * @return
      */
     @PostMapping("/downloadProcess")
-    public Result downloadProcess(@RequestBody SceneParam param) throws Exception{
-        User user = userService.getByUserName(JwtUtil.getUsername(this.getToken()));
-        DownloadProcessVo downloadProcessVo = downService.downloadProcess(user.getId(), param.getSceneNum(),param.getIsObj());
-        if(downloadProcessVo.getStatus() == DownloadStatusEnum.DOWNLOAD_FAILED_CODE){
+    public Result downloadProcess(@RequestBody SceneParam param) throws Exception {
+        User user = getUser();
+        DownloadProcessVo downloadProcessVo = downService.downloadProcess(user.getId(), param.getSceneNum(), param.getIsObj());
+        if (downloadProcessVo.getStatus() == DownloadStatusEnum.DOWNLOAD_FAILED_CODE) {
             return Result.failure("下载失败！");
         }
         return Result.success(downloadProcessVo);
@@ -169,9 +169,8 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/checkDownLoadE57")
-    public Result checkDownLoadE57(@RequestParam(required = false) String num){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.checkDownLoadE57(num,username));
+    public Result checkDownLoadE57(@RequestParam(required = false) String num) {
+        return Result.success(downService.checkDownLoadE57(num, getUserName()));
     }
 
     /**
@@ -179,9 +178,8 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/downSceneE57")
-    public Result downSceneE57(@RequestParam(required = false) String num){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.downE57(num,username));
+    public Result downSceneE57(@RequestParam(required = false) String num) {
+        return Result.success(downService.downE57(num, getUserName()));
     }
 
     /**
@@ -189,46 +187,41 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/downloadProcessE57")
-    public Result downloadProcessE57(@RequestParam(required = false) String num){
-        String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.downloadProcessE57(num,username));
+    public Result downloadProcessE57(@RequestParam(required = false) String num) {
+        return Result.success(downService.downloadProcessE57(num, getUserName()));
     }
 
 
     /**
-     *
      * 场景升级V4接口
      */
     @GetMapping("/upgradeToV4")
-    public Result upgradeToV4(String num) throws Exception{
+    public Result upgradeToV4(String num) throws Exception {
         return sceneUpgradeToV4Service.upgrade(num);
     }
 
 
     /**
-     *
      * 场景升级进度查询接口
      */
     @GetMapping("/getUpgradeToV4Progress")
-    public Result getUpgradeToV4Progress(String num) throws Exception{
+    public Result getUpgradeToV4Progress(String num) throws Exception {
         return sceneUpgradeToV4Service.getUpgradeToV4Progress(num);
     }
 
     /**
-     *
      * 分页查询存在houseType文件的场景
      */
     @PostMapping("/pageSceneWithHouseType")
-    public Result pageSceneWithHouseType(@RequestBody RequestScene param){
-        return scenePlusService.pageSceneWithHouseType(param,this.getToken());
+    public Result pageSceneWithHouseType(@RequestBody RequestScene param) {
+        return scenePlusService.pageSceneWithHouseType(param, this.getToken());
     }
 
     /**
-     *
      * 根据场景码返回ar路径
      */
     @GetMapping("/getArPathByNum")
-    public Result getArPathByNum(@RequestParam(value = "num") String num){
+    public Result getArPathByNum(@RequestParam(value = "num") String num) {
         return scenePlusService.getArPathByNum(num);
     }
 
@@ -237,21 +230,21 @@ public class SceneController extends BaseController {
      * 发起带看获取带看房间号
      */
     @GetMapping("/getTakeLookRoomId")
-    public Result getTakeLookRoomId(@RequestParam(value = "num") String num){
+    public Result getTakeLookRoomId(@RequestParam(value = "num") String num) {
         ScenePlus scenePlus = scenePlusService.getByNum(num);
-        if(scenePlus  == null){
+        if (scenePlus == null) {
             throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400002, ResultCodeMsg.FAILURE_MSG_400002);
         }
-        if(scenePlus.getSceneStatus() != -2){
+        if (scenePlus.getSceneStatus() != -2) {
             throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400009, ResultCodeMsg.FAILURE_MSG_400009);
         }
         FdRoomVo fdRoomVo = takeLookService.getRoomIdByNum(num, scenePlus.getTitle(), getToken());
-        takeLookService.openRoom(fdRoomVo.getRoomId(),getToken());
+        takeLookService.openRoom(fdRoomVo.getRoomId(), getToken());
         return Result.success(fdRoomVo);
     }
 
     @GetMapping("/removePortrait")
-    public Result removePortrait(@RequestParam(value = "num") String num){
+    public Result removePortrait(@RequestParam(value = "num") String num) {
         sceneProService.removePortrait(num);
         return Result.success();
     }
@@ -260,49 +253,50 @@ public class SceneController extends BaseController {
     FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     FdKKClient fdKKClient;
+
     @PostMapping("/uploadE57")
     public Result uploadE57(@RequestParam("file") MultipartFile file,
-                            @RequestParam(value = "isObj",required = false)Integer isObj,
-                            @RequestParam(value = "title",required = false)String title) {
+                            @RequestParam(value = "isObj", required = false) Integer isObj,
+                            @RequestParam(value = "title", required = false) String title) {
         String originalFilename = file.getOriginalFilename();
         String suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
-        if(!suffix.equals(".e57")){
+        if (!suffix.equals(".e57")) {
             throw new BusinessException(ResultCode.UPLOAD_ERROR2);
         }
         File targetFile = null;
         try {
-            String newFileName = UUID.randomUUID().toString().replace("-","");
-            String filePath = ConstantFilePath.MANAGE_PATH + "e57" + File.separator + newFileName +suffix;
+            String newFileName = UUID.randomUUID().toString().replace("-", "");
+            String filePath = ConstantFilePath.MANAGE_PATH + "e57" + File.separator + newFileName + suffix;
             targetFile = new File(filePath);
-            if(!targetFile.getParentFile().exists()){
+            if (!targetFile.getParentFile().exists()) {
                 targetFile.getParentFile().mkdirs();
             }
             file.transferTo(targetFile);
 
-            fYunFileServiceInterface.uploadFile(filePath,filePath.replace(ConstantFilePath.MANAGE_PATH,"ucenter/"));
+            fYunFileServiceInterface.uploadFile(filePath, filePath.replace(ConstantFilePath.MANAGE_PATH, "ucenter/"));
 
             UploadEditSceneParam editSceneParam = new UploadEditSceneParam();
             editSceneParam.setTitle(title);
             editSceneParam.setUserId(getUser().getId());
-            editSceneParam.setPath(filePath.replace(ConstantFilePath.MANAGE_PATH,"ucenter/"));
+            editSceneParam.setPath(filePath.replace(ConstantFilePath.MANAGE_PATH, "ucenter/"));
             editSceneParam.setIsObj(isObj);
             editSceneParam.setOtherType("E57_V4");
 
             JSONObject jsonObject = fdKKClient.reverseScene(editSceneParam);
             Integer code = jsonObject.getInteger("code");
-            if(code != 0){
-                log.info("调用失败-toFdCreateScene:{}",jsonObject);
+            if (code != 0) {
+                log.info("调用失败-toFdCreateScene:{}", jsonObject);
                 throw new BusinessException(ResultCode.UPLOAD_ERROR);
             }
-        }catch (Exception e){
-            log.info("调用失败-toFdCreateScene:",e);
+        } catch (Exception e) {
+            log.info("调用失败-toFdCreateScene:", e);
             throw new BusinessException(ResultCode.UPLOAD_ERROR);
-        }finally {
-            if(targetFile != null){
+        } finally {
+            if (targetFile != null) {
                 try {
                     FileUtil.del(targetFile);
-                }catch (Exception e){
-                    log.info("删除文件失败:{}",targetFile.getPath());
+                } catch (Exception e) {
+                    log.info("删除文件失败:{}", targetFile.getPath());
                 }
             }
         }
@@ -315,41 +309,41 @@ public class SceneController extends BaseController {
     FyunConfig fyunConfig;
 
     @PostMapping("/getUploadUrl")
-    public Result getUploadUrl( @RequestParam(value = "fileName",required = false)String fileName) {
-        String newFileName = UUID.randomUUID().toString().replace("-","");
+    public Result getUploadUrl(@RequestParam(value = "fileName", required = false) String fileName) {
+        String newFileName = UUID.randomUUID().toString().replace("-", "");
         String suffix = fileName.substring(fileName.lastIndexOf("."));
-        URL presignedUrl =  fyunConfig.getPresignedUrl("ucenter/e57/" + newFileName + suffix);
+        URL presignedUrl = fyunConfig.getPresignedUrl("ucenter/e57/" + newFileName + suffix);
         HashMap<String, Object> map = new HashMap<>();
-        map.put("newFileName",newFileName + suffix);
-        map.put("url",presignedUrl.toString());
+        map.put("newFileName", newFileName + suffix);
+        map.put("url", presignedUrl.toString());
         return Result.success(map);
     }
 
     @PostMapping("/relevanceE57")
-    public Result relevanceE57( @RequestParam(value = "isObj",required = false)Integer isObj,
-                                @RequestParam(value = "title",required = false)String title,
-                                @RequestParam(value = "newFileName",required = false)String newFileName ){
+    public Result relevanceE57(@RequestParam(value = "isObj", required = false) Integer isObj,
+                               @RequestParam(value = "title", required = false) String title,
+                               @RequestParam(value = "newFileName", required = false) String newFileName) {
 
 
-        if(StringUtils.isBlank(newFileName)){
+        if (StringUtils.isBlank(newFileName)) {
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
-        String ossPath = "ucenter/e57/"+newFileName;
-        if(!fYunFileServiceInterface.fileExist(ossPath)){
+        String ossPath = "ucenter/e57/" + newFileName;
+        if (!fYunFileServiceInterface.fileExist(ossPath)) {
             throw new BusinessException(ResultCode.UPLOAD_ERROR3);
         }
 
         UploadEditSceneParam editSceneParam = new UploadEditSceneParam();
         editSceneParam.setTitle(title);
         editSceneParam.setUserId(getUser().getId());
-        editSceneParam.setPath("ucenter/e57/"+newFileName);
+        editSceneParam.setPath("ucenter/e57/" + newFileName);
         editSceneParam.setIsObj(isObj);
         editSceneParam.setOtherType("E57_V4");
 
         JSONObject jsonObject = fdKKClient.reverseScene(editSceneParam);
         Integer code = jsonObject.getInteger("code");
-        if(code != 0){
-            log.info("调用失败-toFdCreateScene:{}",jsonObject);
+        if (code != 0) {
+            log.info("调用失败-toFdCreateScene:{}", jsonObject);
             throw new BusinessException(ResultCode.UPLOAD_ERROR);
         }
         return Result.success();

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

@@ -5,12 +5,14 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.sign.RsaUtils;
 import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.*;
 import com.fdkankan.ucenter.entity.*;
@@ -18,10 +20,7 @@ import com.fdkankan.ucenter.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-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.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
@@ -35,131 +34,31 @@ 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;
+    IAppSecretService appSecretService;
 
-    @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("/createPublicKeyAndPrivate/{size}")
+    public ResultData createPublicKeyAndPrivate(@PathVariable Integer size){
+        for (int i = 0 ; i <size;i++){
+            com.fdkankan.sign.RsaUtils.KeyPairInfo keyPair = com.fdkankan.sign.RsaUtils.getKeyPair();
+            String publicKey = keyPair.getPublicKey();
+            String privateKey = keyPair.getPrivateKey();
 
-    @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);
+            AppSecret appSecret = new AppSecret();
+            appSecret.setPublicKey(publicKey);
+            appSecret.setPrivateKey(privateKey);
+            appSecretService.save(appSecret);
         }
-        return Result.success();
+        return ResultData.ok();
     }
 
     public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5(" \u0011\u0007"));
-    }
+        String res = "kGrSGgjqIzNDU25JvSsQZAMTEyadJ8wC";
+        String password = Base64Converter.decode(Base64Converter.subText(res));
 
+        System.out.println(password);
+    }
 }

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/api/FusionController.java

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.controller.api;
 
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IFusionService;
@@ -23,6 +24,7 @@ public class FusionController extends BaseController {
      * 只需获取v4场景数据,无需文件夹
      */
     @PostMapping("/scene/list")
+    @VerifySign
     public Result sceneList(@RequestBody SceneParam param){
         String token = request.getHeader("token");
         return Result.success(fusionService.scenePageOnlyV4List(param,token));

src/main/java/com/fdkankan/ucenter/controller/api/LaserApiController.java

@@ -1,35 +0,0 @@
-package com.fdkankan.ucenter.controller.api;
-
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.service.ISceneProService;
-import com.fdkankan.ucenter.vo.request.SceneParam;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/ucenter/inner")
-public class LaserApiController {
-
-    @Autowired
-    ISceneProService sceneProService;
-
-    /**
-     *
-     * 激光场景生成obj文件
-     */
-    @PostMapping(value = "/generateObjFile")
-    public Result generateObjFile(@RequestBody SceneParam requestScene) throws Exception{
-        String num = requestScene.getSceneNum();
-        if (StringUtils.isEmpty(num)) {
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
-        }
-        sceneProService.generateObjFile(num);
-        return Result.success();
-    }
-}

src/main/java/com/fdkankan/ucenter/controller/api/LaserController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller.api;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.ResultData;
@@ -16,10 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -48,6 +46,7 @@ public class LaserController extends BaseController {
      * 根据手机号码获取 相机 sncode
      */
     @RequestMapping(value = "/getSnCodeByPhone",method = RequestMethod.GET)
+    @VerifySign
     public Result getSnCodeByUserName(@RequestParam(required = false)String phone,
                                       @RequestParam(required = false,defaultValue = "4")String sceneSource) throws Exception {
         if(StringUtils.isBlank(phone)){
@@ -101,6 +100,7 @@ public class LaserController extends BaseController {
      * 获取场景数据
      */
     @RequestMapping(value = "/getSceneByNum",method = RequestMethod.GET)
+    @VerifySign
     public Result getSceneByNum(@RequestParam(required = false)String num) throws Exception {
         ScenePro sceneProEntity = sceneProService.getByNum(num);
         LaserSceneVo vo = new LaserSceneVo();

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.controller.app;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.ResultData;
 import com.fdkankan.ucenter.constant.LoginConstant;
@@ -22,6 +23,7 @@ public class AppCameraController {
     private AppCameraService appCameraService;
 
     @PostMapping("/getCamerasForUser")
+    @VerifySign
     public Result getCamerasForUser(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
         Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
@@ -35,6 +37,7 @@ public class AppCameraController {
      * 绑定相机
      */
     @PostMapping("/bindCamera")
+    @VerifySign
     public Result bindCamera(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
         String snCode = param.get("snCode") == null ? null : param.getString("snCode");
@@ -45,6 +48,7 @@ public class AppCameraController {
      * 解绑相机
      */
     @PostMapping("/unbind")
+    @VerifySign
     public Result unbind(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
         String childName = param.get("childName") == null ? null : param.getString("childName");
@@ -55,6 +59,7 @@ public class AppCameraController {
      * 获取相机信息
      */
     @PostMapping("/getCameraInfo")
+    @VerifySign
     public Result getCameraInfo(@RequestBody JSONObject param ){
         String childName = param.get("childName") == null ? null : param.getString("childName");
         String childPassword = param.get("childPassword") == null ? null : param.getString("childPassword");
@@ -65,6 +70,7 @@ public class AppCameraController {
      * 用户相机信息上报 app 需要调用
      */
     @RequestMapping(value = "/uploadUserCameraInfo", method = RequestMethod.POST)
+    @VerifySign
     public Result uploadUserCameraInfo(@RequestBody Map<String,String> param) throws Exception {
         if (ObjectUtils.isEmpty(param) || !param.containsKey("snCode") || !param.containsKey("cameraVersion")
                 || !param.containsKey("appVersion")) {
@@ -81,6 +87,7 @@ public class AppCameraController {
     }
 
     @GetMapping("/checkCameraSpace")
+    @VerifySign
     public Result checkCameraSpace(@RequestParam(required = false) String snCode,
                                    @RequestParam(required = false) String unicode){
 

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.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.impl.AppService;
@@ -27,6 +28,7 @@ public class AppController extends BaseController {
      * password 密码
      */
     @PostMapping("/userLogin")
+    @VerifySign
     public Result userLogin(@RequestBody LoginParam param){
         return Result.success(appService.login(param));
     }
@@ -48,6 +50,7 @@ public class AppController extends BaseController {
      * appPassword  相机密码
      */
     @PostMapping("/login2")
+    @VerifySign
     public Result login2(@RequestBody AppLoginParam param){
         return Result.success(appService.login2(param));
     }
@@ -67,6 +70,7 @@ public class AppController extends BaseController {
      * @return
      */
     @PostMapping("/register")
+    @VerifySign
     public Result register(@RequestBody RegisterParam param){
         param.setConfirmPwd(param.getPassword());
         param.setClear("YES");
@@ -79,6 +83,7 @@ public class AppController extends BaseController {
      * 登出
      */
     @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    @VerifySign
     public Result logout() {
         appService.logout(getToken());
         return Result.success();
@@ -88,6 +93,7 @@ public class AppController extends BaseController {
      * app 获取随机昵称
      */
     @PostMapping("/getNickName")
+    @VerifySign
     public Result getNickName(){
         return Result.success(appService.getNickName());
     }
@@ -96,6 +102,7 @@ public class AppController extends BaseController {
      * 检测手机号码是否注册
      */
     @PostMapping("/checkUserName")
+    @VerifySign
     public Result checkUserName(@RequestBody AppLoginParam param){
         loginService.checkUser(param.getAppUserName(),false);
         return Result.success();
@@ -105,6 +112,7 @@ public class AppController extends BaseController {
      * 重置密码
      */
     @PostMapping("/resetPassword")
+    @VerifySign
     public Result resetPassword(@RequestBody RegisterParam param){
         param.setConfirmPwd(param.getPassword());
         param.setClear("YES");

src/main/java/com/fdkankan/ucenter/controller/app/AppSceneController.java

@@ -1,6 +1,8 @@
 package com.fdkankan.ucenter.controller.app;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.ISceneProService;
@@ -24,6 +26,7 @@ public class AppSceneController extends BaseController {
      * 获取云端场景
      */
     @PostMapping("/getAppAllSceneByPage")
+    @VerifySign
     public Result getAppAllSceneByPage(@RequestBody AppSceneParam param){
         if(param.getCameraType() == 4){
             param.setCameraType(1);
@@ -35,6 +38,7 @@ public class AppSceneController extends BaseController {
      * 获取场景计算状态
      */
     @PostMapping("/getSceneStatusByUnicode")
+    @VerifySign
     public Result getSceneStatusByUnicode(@RequestBody JSONObject param){
         String appUserName = param.get("appUserName") == null ? null : param.getString("appUserName");
         String appPassword = param.get("appPassword") == null ? null : param.getString("appPassword");
@@ -49,6 +53,7 @@ public class AppSceneController extends BaseController {
      * sceneNum             场景码
      */
     @PostMapping("/getScreencapVoice")
+    @VerifySign
     public Result getScreencapVoice(@RequestBody JSONObject param) throws Exception {
         String screencapMusic = param.get("screencapMusic") == null ? null : param.getString("screencapMusic");
         String originalFileName = param.get("originalFileName") == null ? null : param.getString("originalFileName");
@@ -61,6 +66,7 @@ public class AppSceneController extends BaseController {
      * 删除场景
      */
     @PostMapping("/deleteForCameraName")
+    @VerifySign
     public Result deleteForCameraName(@RequestBody JSONObject param){
         Long cameraId = param.get("cameraId") == null ? null : param.getLong("cameraId");
         String sceneNum = param.get("sceneNum") == null ? null : param.getString("sceneNum");

src/main/java/com/fdkankan/ucenter/controller/app/AppUserController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller.app;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.service.impl.AppService;
@@ -25,6 +26,7 @@ public class AppUserController {
      * cameraType   相机类型
      */
     @PostMapping("/getUserInfo")
+    @VerifySign
     public Result getUserInfo(@RequestBody JSONObject param){
         String phoneNum = param.get("phoneNum") == null ? null : param.getString("phoneNum");
         Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
@@ -40,6 +42,7 @@ public class AppUserController {
      * nickName  昵称
      */
     @PostMapping("/updateNickName")
+    @VerifySign
     public Result updateNickName(@RequestBody JSONObject param){
         String phoneNum = param.get("phoneNum") == null ? null : param.getString("phoneNum");
         String nickName = param.get("nickName") == null ? null : param.getString("nickName");
@@ -52,6 +55,7 @@ public class AppUserController {
      * head      头像
      */
     @PostMapping("/uploadHead")
+    @VerifySign
     public Result uploadHead(@RequestBody JSONObject param) throws Exception {
         String phoneNum = param.get("phoneNum") == null ? null : param.getString("phoneNum");
         String head = param.get("head") == null ? null : param.getString("head");

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -13,7 +13,8 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
-import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
+import com.fdkankan.sign.AesUtil;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
@@ -25,13 +26,13 @@ import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.service.impl.LoginService;
 import com.fdkankan.ucenter.service.impl.SceneApiService;
 import com.fdkankan.ucenter.util.DateUserUtil;
+import com.fdkankan.ucenter.vo.request.AppGoEditScenePage;
 import com.fdkankan.ucenter.vo.request.LoginParam;
 import com.fdkankan.ucenter.vo.request.RequestSceneStatistics;
 import com.fdkankan.ucenter.vo.response.LoginVo;
 import com.fdkankan.ucenter.vo.response.SceneInfoVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
 import java.io.File;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -39,7 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
+import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -103,15 +104,16 @@ public class SceneApiController extends BaseController {
 
 
     //app 使用跳转到编辑页面
-    @RequestMapping("/goEditScenePage")
-    public void goEditScenePage(HttpServletRequest request, HttpServletResponse response) throws Exception{
-        String phoneNum = request.getParameter("phoneNum");
-        String password = request.getParameter("password");
-        String sceneNum = request.getParameter("sceneNum");
-        String childName = request.getParameter("childName");
-        String lang = request.getParameter("lang");
-        String vlog = request.getParameter("vlog");
-        String pad = request.getParameter("pad");
+    @PostMapping("/goEditScenePage")
+    @VerifySign
+    public Result goEditScenePage(@RequestBody AppGoEditScenePage appGoEditScenePage) {
+        String phoneNum = appGoEditScenePage.getPhoneNum();
+        String password = appGoEditScenePage.getPassword();
+        String sceneNum = appGoEditScenePage.getSceneNum();
+        String childName = appGoEditScenePage.getChildName();
+        String lang = appGoEditScenePage.getLang();
+        String vlog = appGoEditScenePage.getVlog();
+        String pad = appGoEditScenePage.getPad();
         log.info("goEditScenePage---param--phoneNum:{},password:{},sceneNum:{},childName:{},lang:{},vlog:{},pad:{}",
                 phoneNum,password,sceneNum,childName,lang,vlog,pad);
 
@@ -144,7 +146,7 @@ public class SceneApiController extends BaseController {
                     BeanUtils.copyProperties(dbUser,user);
                 }
 
-                sendResponse(user,webSite, request,response,sceneNum,lang,vlog, pad);
+                return sendResponse(user,webSite, request,response,sceneNum,lang,vlog, pad);
             }
         }
 
@@ -175,15 +177,20 @@ public class SceneApiController extends BaseController {
             }
 
         }
-
-        if(!SecurityUtil.MD5(password).equals(ssoUser.getPassword())) {
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
+        String passwordCode = null;
+        try {
+            passwordCode = SecurityUtil.MD5(AesUtil.desEncrypt(password));
+        } catch (Exception e) {
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
+        }
+        if(!passwordCode.equals(ssoUser.getPassword())) {
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3015);
         }
-        sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog, pad);
+        return sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog, pad);
 
     }
 
-    private void sendResponse(UserVo user, String webSite, HttpServletRequest request,
+    private Result sendResponse(UserVo user, String webSite, HttpServletRequest request,
                               HttpServletResponse response, String sceneNum, String lang, String vlog, String pad) {
         String token = loginService.redisLogin(user.getUserName(),JSONObject.toJSONString(user),"user");
         //登录成功
@@ -213,20 +220,20 @@ public class SceneApiController extends BaseController {
 
             }
             log.info("goEditScenePage---response--website:{},redirect:{}", webSite,redirect);
-            response.sendRedirect(redirect);
+            return Result.success("操作成功",redirect);
         }catch (Exception e){
             e.printStackTrace();
         }
-
+        return Result.failure("获取跳转链接失败");
     }
 
     //app调用 跳转到官网消费页面
-    @RequestMapping("/goConsumptionPage")
-    public void goConsumptionPage(HttpServletRequest request, HttpServletResponse response) throws Exception{
-        String phoneNum = request.getParameter("phoneNum");
-        String password = request.getParameter("password");
-        String lang = request.getParameter("lang");
-        password = URLEncoder.encode(password,"UTF-8");
+    @PostMapping("/goConsumptionPage")
+    @VerifySign
+    public Result goConsumptionPage(@RequestBody AppGoEditScenePage appGoEditScenePage){
+        String phoneNum = appGoEditScenePage.getPhoneNum();
+        String password = appGoEditScenePage.getPassword();
+        String lang = appGoEditScenePage.getLang();
         log.info("phoneNum:{},password:{},lang:{}",phoneNum,password,lang);
 
         if(StringUtils.isEmpty(phoneNum) || StringUtils.isEmpty(password)){
@@ -241,13 +248,14 @@ public class SceneApiController extends BaseController {
         if(StringUtils.isBlank(mainUrl)){
             mainUrl = "http://"+request.getRemoteHost() +"/";
         }
-        response.sendRedirect(mainUrl+ "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
+        return Result.success("操作成功",mainUrl+ "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
     }
 
     /**
      * 查找123看房未使用过的场景吗
      * */
     @PostMapping("/finSkSceneNum")
+    @VerifySign
     public Result finSkSceneNum(){
         String num = scene3dNumService.generateSceneNum(null);
         return Result.success(num);
@@ -257,6 +265,7 @@ public class SceneApiController extends BaseController {
      * 查找八目未使用过的场景吗*
      * */
     @PostMapping("/finSceneNum")
+    @VerifySign
     public Result finSceneNum(){
         String num = scene3dNumService.generateSceneNum(null);
         return Result.success(num);
@@ -267,7 +276,7 @@ public class SceneApiController extends BaseController {
      * @param param
      * @return
      */
-    @PostMapping(value = "/statistics/findByTime")
+   // @PostMapping(value = "/statistics/findByTime")
     public Result findByTime(@RequestBody RequestSceneStatistics param){
 
         if(org.springframework.util.StringUtils.isEmpty(param.getSceneNum()) || param.getType() == null ||
@@ -390,6 +399,7 @@ public class SceneApiController extends BaseController {
      * 内部使用查询场景名称和场景码
      */
     @RequestMapping(value = "/getScenesBySnCode", method = RequestMethod.GET)
+    @VerifySign
     public Result getScenesBySnCode(String snCode) throws Exception{
         return sceneApiService.getScenesBySnCode(snCode,getToken());
     }
@@ -406,7 +416,7 @@ public class SceneApiController extends BaseController {
      * 场景浏览
      * @return
      */
-    @RequestMapping(value = "/loadAllScene", method = RequestMethod.POST)
+    //@RequestMapping(value = "/loadAllScene", method = RequestMethod.POST)
     public Result loadAllScene(@RequestBody JSONObject param) throws Exception {
         return Result.success(sceneApiService.loadAllScene(param));
     }
@@ -414,7 +424,7 @@ public class SceneApiController extends BaseController {
     /**
      * 增加场景下载次数
      */
-    @RequestMapping(value = "/addDownloadNum", method = RequestMethod.GET)
+    //@RequestMapping(value = "/addDownloadNum", method = RequestMethod.GET)
     public Result addDownloadNum(HttpServletRequest request) throws Exception{
         sceneApiService.addDownloadNum(request.getParameter("sceneNum"));
         return Result.success();
@@ -424,6 +434,7 @@ public class SceneApiController extends BaseController {
      * 获取编辑页面的资源下载路径
      */
     @RequestMapping(value = "/getEditDataUrl")
+    @VerifySign
     public Result getEditDataUrl(HttpServletRequest request) throws Exception{
         List<String> result = sceneApiService.getEditDataUrl(request.getParameter("num"));
         return Result.success(result);
@@ -433,6 +444,7 @@ public class SceneApiController extends BaseController {
      * 查询场景资源路径
      */
     @GetMapping("/querySceneDataSource")
+    @VerifySign
     public String querySceneDataSource(String num){
         return innerService.querySceneDataSource(num);
     }

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<>();
@@ -61,6 +60,9 @@ public class FdUserSceneController extends BaseController {
 
     @GetMapping("/getTokenByNum")
     public ResultData getTokenByNum(@RequestParam(required = false) String num ){
+        if(StringUtils.isEmpty(getUserName())){
+            throw new BusinessException(-1,"用户未登录，或token不合法！");
+        }
         if(StringUtils.isEmpty(num)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }

src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -1,31 +1,28 @@
 package com.fdkankan.ucenter.controller.inner;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.SecurityUtil;
-import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
+import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.sign.SignUtils;
+import com.fdkankan.ucenter.annotation.VerifySign;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.common.ResultData;
+import com.fdkankan.ucenter.common.constants.ResultCode;
 import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.AppSecret;
 import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.IAppSecretService;
 import com.fdkankan.ucenter.service.IInnerService;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.service.impl.LoginService;
-import com.fdkankan.ucenter.vo.request.CameraDetailParam;
-import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;
-import com.fdkankan.ucenter.vo.response.CameraVo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * <p>
  * 内部接口控制器
@@ -44,12 +41,14 @@ public class InnerController extends BaseController {
     IUserService userService;
     @Autowired
     LoginService loginService;
+    @Autowired
+    IAppSecretService appSecretService;
 
     /**
      * 根据场景码获取token
      */
-    @CheckInnerApiPermit
     @GetMapping("/_token")
+    @VerifySign
     public Result createTokenByNum(String num){
         return innerService.createTokenByNum(num);
     }
@@ -57,8 +56,8 @@ public class InnerController extends BaseController {
     /**
      * 查询场景资源路径
      */
-    @CheckInnerApiPermit
     @GetMapping("/querySceneDataSource")
+    @VerifySign
     public String querySceneDataSource(String num){
         return innerService.querySceneDataSource(num);
     }
@@ -66,8 +65,8 @@ public class InnerController extends BaseController {
     /**
      * 查询场景资源路径
      */
-    @CheckInnerApiPermit
     @GetMapping("/querySceneNum")
+    @VerifySign
     public Result querySceneNum(String path){
         if(ObjectUtils.isEmpty(path)){
             return Result.failure("请输入路径");
@@ -78,8 +77,8 @@ public class InnerController extends BaseController {
     /**
      * 查询场景资源路径
      */
-    @CheckInnerApiPermit
     @GetMapping("/getAllSceneDbInfo")
+    @VerifySign
     public Result getAllSceneDbInfo(String num){
         if(ObjectUtils.isEmpty(num)){
             return Result.failure("请输入场景码");
@@ -90,8 +89,8 @@ public class InnerController extends BaseController {
     /**
      * 查询场景资源路径
      */
-    @CheckInnerApiPermit
     @GetMapping("/downloadCapture")
+    @VerifySign
     public Result downloadCapture(String num){
         if(ObjectUtils.isEmpty(num)){
             return Result.failure("请输入场景号");
@@ -102,6 +101,7 @@ public class InnerController extends BaseController {
      * 根据场景码获取场景码版本 深时使用
      */
     @GetMapping("/_getSceneNumVersion")
+    @VerifySign
     public Result getSceneNumVersion(@RequestParam(required = false) String num){
         if(StringUtils.isBlank(num)){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
@@ -110,6 +110,7 @@ public class InnerController extends BaseController {
     }
 
     @GetMapping(value = "/getSnCode/{snCode}")
+    @VerifySign
     public Result getSnCode( @PathVariable String snCode) {
         if(StringUtils.isBlank(snCode)){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
@@ -118,11 +119,8 @@ public class InnerController extends BaseController {
     }
 
     @GetMapping("/getTokenByUserName/{userName}")
+    @VerifySign
     public Result getTokenByUserName(@PathVariable String userName){
-        Boolean flag = innerService.checkSign(getSign());
-        if(!flag){
-            throw new BusinessException(-1,"签名失败");
-        }
         User user = userService.getByUserName(userName);
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
@@ -131,10 +129,28 @@ public class InnerController extends BaseController {
     }
 
     @PostMapping(value = "/getSceneBySnCode")
+    @VerifySign
     public Result getSceneSnCode( @RequestBody SceneParam param) {
         if(StringUtils.isBlank(param.getSnCode())){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         return Result.success(innerService.getSceneBySnCode(param));
     }
+
+    @Autowired
+    RedisUtil redisUtil;
+    @GetMapping(value = "/pdsfsdfsrvateddsfeky/{appId}")
+    @VerifySign
+    public Result getPrivateKey(@PathVariable String appId){
+        AppSecret byAppId = null;
+        if(redisUtil.hasKey("ucenter:sign:appid:"+appId)){
+            byAppId = JSONObject.parseObject(redisUtil.get("ucenter:sign:appid:"+appId),AppSecret.class);
+        }else {
+            byAppId = appSecretService.getByAppId(appId);
+        }
+        if(!redisUtil.hasKey("ucenter:sign:appid:"+appId)){
+            redisUtil.set("ucenter:sign:appid:"+appId, JSONObject.toJSONString(byAppId),60 *60 *2);
+        }
+        return Result.success(byAppId);
+    }
 }

src/main/java/com/fdkankan/ucenter/entity/AppSecret.java

@@ -0,0 +1,54 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-07-08
+ */
+@Getter
+@Setter
+@TableName("t_app_secret")
+public class AppSecret implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("app_id")
+    private String appId;
+
+    @TableField("public_key")
+    private String publicKey;
+
+    @TableField("private_key")
+    private String privateKey;
+
+    @TableField("remark")
+    private String remark;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_scene_cooperation_count"
+                "t_app_secret"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/ucenter/httpClient/SignInterceptor.java

@@ -0,0 +1,40 @@
+package com.fdkankan.ucenter.httpClient;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.http.ForestRequest;
+import com.dtflys.forest.http.ForestResponse;
+import com.dtflys.forest.interceptor.Interceptor;
+import com.dtflys.forest.reflection.ForestMethod;
+import com.fdkankan.sign.RsaUtils;
+import com.fdkankan.ucenter.entity.AppSecret;
+import com.fdkankan.ucenter.service.IAppSecretService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.util.Date;
+
+/**
+ * @author Xiewj
+ * @date 2025/7/8
+ */
+@Component
+@Slf4j
+public class SignInterceptor implements Interceptor<JSONObject> {
+
+    @Value("${ucenter.sign.appid}")
+    public String appId;
+    @Value("${ucenter.sign.publickey}")
+    public String publicKey;
+    @Override
+    public void onInvokeMethod(ForestRequest request, ForestMethod method, Object[] args) {
+        JSONObject playload = new JSONObject();
+        playload.put("appId", appId);
+        playload.put("timestamp", new Date().getTime());
+        request.addHeader("appId",appId);
+        request.addHeader("sign", RsaUtils.encipher(playload.toJSONString(), publicKey));
+
+    }
+}

src/main/java/com/fdkankan/ucenter/httpClient/client/FdKKClient.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.httpClient.client;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.annotation.*;
+import com.fdkankan.ucenter.httpClient.SignInterceptor;
 import com.fdkankan.ucenter.httpClient.address.FdkkAddressSource;
 import com.fdkankan.ucenter.httpClient.param.UploadEditSceneParam;
 
@@ -16,6 +17,6 @@ public interface FdKKClient {
 
 
 
-    @Post("/api/scene/file/reverseScene")
+    @Post(value = "/api/scene/file/reverseScene",interceptor = SignInterceptor.class)
     JSONObject reverseScene( @JSONBody UploadEditSceneParam param);
 }

src/main/java/com/fdkankan/ucenter/httpClient/client/LaserClient.java

@@ -2,10 +2,12 @@ package com.fdkankan.ucenter.httpClient.client;
 
 import com.dtflys.forest.annotation.*;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.httpClient.SignInterceptor;
 import com.fdkankan.ucenter.httpClient.address.LaserAddressSource;
 import com.fdkankan.ucenter.httpClient.param.SSDownSceneParam;
 import com.fdkankan.ucenter.httpClient.param.SsBindParam;
 import com.fdkankan.ucenter.httpClient.vo.LaserSceneParam;
+import org.apache.poi.ss.formula.functions.Intercept;
 
 import java.util.List;
 import java.util.Map;
@@ -19,76 +21,76 @@ public interface LaserClient {
     /**
      * 根据用户获取激光相机数量
      */
-    @Post("/laser/4dage/getSceneNum")
-    Result getSceneNum(@Header("fdToken") String token,@JSONBody Map<String, Object> param);
+    @Post(value = "/laser/4dage/getSceneNum",interceptor = SignInterceptor.class)
+    Result getSceneNum(@Header("fdToken") String token, @JSONBody Map<String, Object> param);
     /**
      * 获取相机场景数
      * @param param
      */
-    @Post("/laser/4dage/scene/getSceneNumByCamera")
+    @Post(value = "/laser/4dage/scene/getSceneNumByCamera",interceptor = SignInterceptor.class)
     Result getSceneNumByCamera(@JSONBody Map<String, String> param);
     /**
      * 取消相机协作
      * @param param
      */
-    @Post("/laser/4dage/scene/cooperation/disable")
+    @Post(value = "/laser/4dage/scene/cooperation/disable",interceptor = SignInterceptor.class)
     Result cooperationDisable(@JSONBody List<Map<String, String> >param);
     /**
      * 添加相机协作
      * @param param
      */
-    @Post("/laser/4dage/scene/cooperation/cameraSave")
+    @Post(value = "/laser/4dage/scene/cooperation/cameraSave",interceptor = SignInterceptor.class)
     Result cooperationCameraSave(@JSONBody List<Map<String, String> >param);
 
-    @Get("/laser/init/${0}")
+    @Get(value = "/laser/init/${0}",interceptor = SignInterceptor.class)
     Result getSceneByNum(String num);
 
     /**
      * 新增场景
      */
-    @Post("/laser/init/{sceneNum}/saveOrEdit")
+    @Post(value = "/laser/init/{sceneNum}/saveOrEdit",interceptor = SignInterceptor.class)
     Result saveOrEdit(@Var("sceneNum") String sceneNum, @JSONBody  Map<String,Object> params);
     /**
      * 新增场景
      */
-    @Post("/laser/4dage/scene/getScenesBySnCode")
+    @Post(value = "/laser/4dage/scene/getScenesBySnCode",interceptor = SignInterceptor.class)
     Result getScenesBySnCode(@JSONBody Map<String, String> param, @Header("fdToken") String token) ;
 
     /**
      * 下载深时场景
      * status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
      */
-    @Post("/laser/4dage/downOfflineScene")
+    @Post(value = "/laser/4dage/downOfflineScene",interceptor = SignInterceptor.class)
     Result downOfflineScene(@JSONBody SSDownSceneParam param) ;
     /**
      * 检测深时场景是否需要重新生成
      *
      * status ：离线包状态是否需要重新生成 0未生成，1 不需要 2需要
      */
-    @Post("/laser/4dage/downOfflineSceneStatus")
+    @Post(value = "/laser/4dage/downOfflineSceneStatus",interceptor = SignInterceptor.class)
     Result downOfflineSceneStatus(@JSONBody SSDownSceneParam param) ;
 
     /**
      *解绑相机、绑定相机
      */
-    @Post("/laser/4dage/scene/camera/toBind")
+    @Post(value = "/laser/4dage/scene/camera/toBind",interceptor = SignInterceptor.class)
     Result toBind(@JSONBody SsBindParam param) ;
 
     /**
      * 修改场景状态
      */
-    @Post("/laser/4dage/scene/updateStatus")
+    @Post(value = "/laser/4dage/scene/updateStatus",interceptor = SignInterceptor.class)
     Result updateStatus( @JSONBody  Map<String,Object> params);
 
-    @Post("/laser/4dage/managerSceneList")
+    @Post(value = "/laser/4dage/managerSceneList",interceptor = SignInterceptor.class)
     Result sceneList(@JSONBody LaserSceneParam param);
 
-    @Post("/laser/4dage/scene/sceneStatusInfo/{sceneCode}")
+    @Post(value = "/laser/4dage/scene/sceneStatusInfo/{sceneCode}",interceptor = SignInterceptor.class)
     Result laserSceneInfo(@Var("sceneCode")String sceneCode);
 
-    @Post("/laser/4dage/downE57Status")
+    @Post(value = "/laser/4dage/downE57Status",interceptor = SignInterceptor.class)
     Result downE57Status(@JSONBody SSDownSceneParam param);
 
-    @Post("/laser/4dage/downE57")
+    @Post(value = "/laser/4dage/downE57",interceptor = SignInterceptor.class)
     Result downE57(@JSONBody SSDownSceneParam param);
 }

src/main/java/com/fdkankan/ucenter/interceptor/CheckInnerApiPermitAspect.java

@@ -1,48 +0,0 @@
-package com.fdkankan.ucenter.interceptor;
-
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.exception.BusinessException;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.log4j.Log4j2;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-@Log4j2
-@Aspect
-@Component
-@Order(101)
-public class CheckInnerApiPermitAspect {
-
-	@Value("${inner.customToken}")
-	private String customToken;
-
-	@Pointcut("@annotation(com.fdkankan.ucenter.annotation.CheckInnerApiPermit)")
-	public void checkCooperationPermit() {
-	}
-
-	/**
-	 * 前置通知 用于判断用户协作场景是否有协作权限
-	 *
-	 * @param joinPoint
-	 *            切点
-	 * @throws IOException
-	 */
-	@Before("checkCooperationPermit()")
-	public void doBefore(JoinPoint joinPoint) throws Exception {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String customToken = request.getHeader("custom-token");
-		if(StrUtil.isEmpty(customToken) || !customToken.equals(this.customToken)){
-			throw new BusinessException(ErrorCode.HAVE_NO_RIGHT);
-		}
-	}
-
-}

src/main/java/com/fdkankan/ucenter/mapper/IAppSecretMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.AppSecret;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-07-08
+ */
+@Mapper
+public interface IAppSecretMapper extends BaseMapper<AppSecret> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.AppSecret;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-07-08
+ */
+public interface IAppSecretService extends IService<AppSecret> {
+
+    AppSecret getByAppId(String appId);
+}

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/IInnerService.java

@@ -30,5 +30,4 @@ public interface IInnerService {
 
     Object getSceneBySnCode(SceneParam param);
 
-    Boolean checkSign(String sign);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class AppSceneService {
+public class AppSceneService extends BaseController {
     @Autowired
     IUserService userService;
     @Autowired
@@ -75,11 +76,11 @@ public class AppSceneService {
     private String ossHost;
 
     public PageInfo pageList(AppSceneParam param) {
-        if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum()) && param.getCameraId() == null){
+        if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        if(!StringUtils.isEmpty(param.getAppUserName()) && !StringUtils.isEmpty(param.getAppPassword())){
-            Camera camera = cameraService.getBySnCodeAndPassword(param.getAppUserName(), param.getAppPassword());
+        if(!StringUtils.isEmpty(param.getAppUserName())){
+            Camera camera = cameraService.getByChildName(param.getAppUserName());
             if(camera == null){
                 throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
             }
@@ -171,7 +172,7 @@ public class AppSceneService {
     }
 
     public HashMap<String, Object> getSceneStatusByUnicode(String appUserName, String appPassword, String unicode) {
-        if(StringUtils.isEmpty(appPassword) || StringUtils.isEmpty(appPassword) || StringUtils.isEmpty(unicode)){
+        if(StringUtils.isEmpty(appUserName) || StringUtils.isEmpty(appPassword) || StringUtils.isEmpty(unicode)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         Camera camera = cameraService.getBySnCodeAndPassword(appUserName, appPassword);

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

@@ -0,0 +1,27 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.ucenter.entity.AppSecret;
+import com.fdkankan.ucenter.mapper.IAppSecretMapper;
+import com.fdkankan.ucenter.service.IAppSecretService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-07-08
+ */
+@Service
+public class AppSecretServiceImpl extends ServiceImpl<IAppSecretMapper, AppSecret> implements IAppSecretService {
+
+    @Override
+    public AppSecret getByAppId(String appId) {
+        LambdaQueryWrapper<AppSecret> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSecret::getAppId,appId);
+        return this.getOne(wrapper);
+    }
+}

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

@@ -3,12 +3,14 @@ package com.fdkankan.ucenter.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.CameraConstant;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.RandomUtil;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.sign.AesUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.Camera;
@@ -52,7 +54,12 @@ public class AppService {
         if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        String passwordCode = SecurityUtil.MD5(param.getPassword());
+        String passwordCode = null;
+        try {
+            passwordCode = SecurityUtil.MD5(AesUtil.desEncrypt(param.getPassword()));
+        } catch (Exception e) {
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
+        }
         User user = userService.getByUserName(param.getPhoneNum());
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
@@ -84,7 +91,11 @@ public class AppService {
         BeanUtils.copyProperties(user,userVo);
         userVo.setCameraCount(count);
         userVo.setSceneCount(sceneProCount + scenePlusCount);
-        userVo.setPassword(SecurityUtil.MD5(user.getPassword()));
+        try {
+            userVo.setPassword(AesUtil.encrypt(SecurityUtil.MD5(user.getPassword())));
+        } catch (Exception e) {
+            throw new  BusinessException(ErrorCode.PASSWORD_ERROR);
+        }
         LoginVo vo = new LoginVo();
         vo.setToken(token);
         vo.setUser(userVo);

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

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.sign.AesUtil;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.service.*;
@@ -50,7 +51,11 @@ public class AppUserService {
         userVo.setExpansionTotal(expansionCount);
         userVo.setIncrementNum(incrementNum);
         userVo.setIncrementBindNum(incrementBindNum);
-        userVo.setPassword(SecurityUtil.MD5(userVo.getPassword()));
+        try {
+            userVo.setPassword(AesUtil.encrypt(SecurityUtil.MD5(userVo.getPassword())));
+        } catch (Exception e) {
+            userVo.setPassword(userVo.getPassword());
+        }
         return userVo;
     }
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -460,4 +461,21 @@ public class DownService implements IDownService {
         return downVo;
     }
 
+    public static void main(String[] args) {
+        /**
+         4dkankan@3dsixty.ch                          c1QRwa..11
+         4dkankan@widdim.com                          NbXL5dxQ@j~T
+         frederic.alcaraz@af3d.fr                     673KKrZN2uGWu
+         julien.cousin@nextiim.com                    a23B45C67
+         mzdjaffardjee@hotmail.fr                     Moufadal2004@
+
+         */
+        System.out.println(SecurityUtil.MD5("\u0017E%&\u0003\u0015ZZEE"));
+        System.out.println(SecurityUtil.MD5(":\u0016,8A\u0010\f%4\u001E\n" +
+                " "));
+        System.out.println(SecurityUtil.MD5("BCG??\u0006.:F\u00013#\u0001"));
+        System.out.println(SecurityUtil.MD5("\u0015FG6@A7BC"));
+        System.out.println(SecurityUtil.MD5("9\u001B\u0001\u0012\u0015\u0010\u0015\u0018FDD@4"));
+        System.out.println(SecurityUtil.MD5("@0?\u0015\u001A?\u0015\u001AEFG"));
+    }
 }

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);

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

@@ -16,7 +16,6 @@ import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO;
 import com.fdkankan.ucenter.vo.request.SceneParam;
-import com.fdkankan.ucenter.util.RsaUtils;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -161,7 +160,7 @@ public class InnerServiceImpl implements IInnerService {
         if (!ObjectUtils.isEmpty(scenePlusExt)) {
             return Result.success(scenePlusService.getById(scenePlusExt.getPlusId()).getNum());
         }
-        return null;
+        return Result.success();
     }
 
     @Override
@@ -224,44 +223,6 @@ public class InnerServiceImpl implements IInnerService {
         return cameraDetailService.getByCameraId(camera.getId());
     }
 
-    @Override
-    public Boolean checkSign(String sign) {
-        try {
-            if(StringUtils.isBlank(sign)){
-                return false;
-            }
-            String deTxt = RsaUtils.decipher(sign, RsaUtils.privateKey);
-            if(StringUtils.isBlank(deTxt)){
-                return false;
-            }
-            JSONObject jsonObject = JSONObject.parseObject(deTxt);
-            String appId = jsonObject.getString("appId");
-            Long timestamp = jsonObject.getLong("timestamp");
-            if(StringUtils.isBlank(appId) || timestamp == null){
-                return false;
-            }
-            if(!appId.equals("ucenter")){
-                return false;
-            }
-            Long time = new Date().getTime();
-            if(time -timestamp >1000 * 30){
-                return false;
-            }
-            return true;
-        }catch (Exception e){
-            log.info("checkSign-error:{}",sign,e);
-            return false;
-        }
-
-    }
-
-    public static void main(String[] args) {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("appId","ucenter");
-        jsonObject.put("timestamp",new Date().getTime());
-        System.out.println(jsonObject);
-    }
-
 
     @Override
     public Object getSceneBySnCode(SceneParam param) {

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

@@ -3,13 +3,10 @@ package com.fdkankan.ucenter.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.Base64Converter;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.common.util.NumberUtils;
-import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.common.util.*;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
+import com.fdkankan.sign.AesUtil;
 import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.MailUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
@@ -82,7 +79,12 @@ public class LoginService {
         }
         String password ;
         if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
-             password = param.getPassword();
+            try {
+                String desEncrypt = AesUtil.desEncrypt(param.getPassword());
+                password = desEncrypt;
+            }catch (Exception e){
+                throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
+            }
         }else {
             password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         }
@@ -165,7 +167,11 @@ public class LoginService {
         }
         String password ;
         if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
-            password = param.getPassword();
+            try {
+                password = AesUtil.desEncrypt(param.getPassword());
+            } catch (Exception e) {
+                throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
+            }
         }else {
             password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         }
@@ -279,7 +285,12 @@ public class LoginService {
         //对前端传的密码解密
         String password;
         if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
-            password = param.getPassword();
+            try {
+                String desEncrypt = AesUtil.desEncrypt(param.getPassword());
+                password = desEncrypt;
+            }catch (Exception e){
+                throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
+            }
         }else {
             password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         }
@@ -330,4 +341,8 @@ public class LoginService {
         param.setClear("YES");  //明文登录
         return login(param);
     }
+
+    public static void main(String[] args) throws Exception{
+        System.out.println(AesUtil.encrypt("Zkturing@2025!"));
+    }
 }

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

@@ -216,54 +216,58 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId) {
+        ThreadUtil.execute(() -> {
+            log.info("异步任务执行，当前线程：" + Thread.currentThread().getName());
+            List<SimpleSceneVo> voList = this.getSimpleSceneVo(cameraDetail);
+            if(voList .size() <=0){
+                return;
+            }
+            CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
 
-        List<SimpleSceneVo> voList = this.getSimpleSceneVo(cameraDetail);
-        if(voList .size() <=0){
-            return;
-        }
-        CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
+            Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);
+            Long usedSpace = 0L;
 
-        Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);
-        Long usedSpace = 0L;
+            //获取未被封存的场景容量
+            List<Long> spaceList = voList.stream().filter(entity -> entity.getPayStatus() == 1).map(SimpleSceneVo::getSpace).collect(Collectors.toList());
+            if("SP".equals(cameraDetail.getUnit())){
+                usedSpace = (long) spaceList.size();
+            }
+            if("GB".equals(cameraDetail.getUnit())){
+                for (Long aLong : spaceList) {
+                    usedSpace += aLong;
+                }
+            }
+            //计算时间倒序
+            List<SimpleSceneVo> sceneVos = voList.stream().sorted(Comparator.comparing(SimpleSceneVo::getCreateTime).reversed()).collect(Collectors.toList());
 
-        //获取未被封存的场景容量
-        List<Long> spaceList = voList.stream().filter(entity -> entity.getPayStatus() == 1).map(SimpleSceneVo::getSpace).collect(Collectors.toList());
-        if("SP".equals(cameraDetail.getUnit())){
-            usedSpace = (long) spaceList.size();
-        }
-        if("GB".equals(cameraDetail.getUnit())){
-            for (Long aLong : spaceList) {
-                usedSpace += aLong;
+            if(totalSpace == -1){  //  无限容量 全部解封
+                sceneVos =  sceneVos.stream().filter(e -> e.getPayStatus() !=1).collect(Collectors.toList());
+                lockOrUnLockScenes(sceneVos,1,cameraType);
+                return;
             }
-        }
-        //计算时间倒序
-        List<SimpleSceneVo> sceneVos = voList.stream().sorted(Comparator.comparing(SimpleSceneVo::getCreateTime).reversed()).collect(Collectors.toList());
 
-        if(totalSpace == -1){  //  无限容量 全部解封
-            sceneVos =  sceneVos.stream().filter(e -> e.getPayStatus() !=1).collect(Collectors.toList());
-            lockOrUnLockScenes(sceneVos,1,cameraType);
-            return;
-        }
+            //按计算完成时间由新到旧封存
+            //按计算完成时间由旧到新解封
+            //payStatus 1解封，-2封存
+            List<SimpleSceneVo> lockedIds = new ArrayList<>();
+            if(usedSpace > totalSpace){
+                sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() ==1).collect(Collectors.toList());
+                Long space = getSceneLockedIds(lockedIds, sceneVos, usedSpace - totalSpace,cameraDetail.getUnit());
+                log.info("lockOrUnLockBySpace---cameraId:{},totalSpace:{},useSpace{},space:{},payStatus:{}", cameraId,totalSpace,usedSpace,space,-2);
+                lockOrUnLockScenes(lockedIds,-2,cameraType);
+                return;
+            }
 
-        //按计算完成时间由新到旧封存
-        //按计算完成时间由旧到新解封
-        //payStatus 1解封，-2封存
-        List<SimpleSceneVo> lockedIds = new ArrayList<>();
-        if(usedSpace > totalSpace){
-            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() ==1).collect(Collectors.toList());
-            Long space = getSceneLockedIds(lockedIds, sceneVos, usedSpace - totalSpace,cameraDetail.getUnit());
-            log.info("lockOrUnLockBySpace---cameraId:{},totalSpace:{},useSpace{},space:{},payStatus:{}", cameraId,totalSpace,usedSpace,space,-2);
-            lockOrUnLockScenes(lockedIds,-2,cameraType);
-            return;
-        }
+            if(usedSpace < totalSpace){  //使用容量小于总容量，解封
+                sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
+                CollectionUtil.reverse(sceneVos);
+                Long space = getSceneUnLockedIds(lockedIds, sceneVos, totalSpace - usedSpace,cameraDetail.getUnit());
+                log.info("lockOrUnLockBySpace---cameraId:{},totalSpace:{},useSpace{},space:{},payStatus:{}", cameraId,totalSpace,usedSpace,space,1);
+                lockOrUnLockScenes(lockedIds,1,cameraType);
+            }
+        });
+        log.info("异步任务执行，当前线程：" + Thread.currentThread().getName()+"执行完毕");
 
-        if(usedSpace < totalSpace){  //使用容量小于总容量，解封
-            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
-            CollectionUtil.reverse(sceneVos);
-            Long space = getSceneUnLockedIds(lockedIds, sceneVos, totalSpace - usedSpace,cameraDetail.getUnit());
-            log.info("lockOrUnLockBySpace---cameraId:{},totalSpace:{},useSpace{},space:{},payStatus:{}", cameraId,totalSpace,usedSpace,space,1);
-            lockOrUnLockScenes(lockedIds,1,cameraType);
-        }
     }
 
     private void lockOrUnLockScenes(List<SimpleSceneVo> sceneVos, Integer payStatus,CameraType cameraType){

src/main/java/com/fdkankan/ucenter/vo/request/AppGoEditScenePage.java

@@ -0,0 +1,23 @@
+package com.fdkankan.ucenter.vo.request;
+
+import lombok.Data;
+
+@Data
+public class AppGoEditScenePage {
+    /**
+     *         String phoneNum = request.getParameter("phoneNum");
+     *         String password = request.getParameter("password");
+     *         String sceneNum = request.getParameter("sceneNum");
+     *         String childName = request.getParameter("childName");
+     *         String lang = request.getParameter("lang");
+     *         String vlog = request.getParameter("vlog");
+     *         String pad = request.getParameter("pad");
+     */
+    private String phoneNum;
+    private String password;
+    private String sceneNum;
+    private String childName;
+    private String lang;
+    private String vlog;
+    private String pad;
+}

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -35,7 +35,7 @@ public class SceneParam extends RequestBase {
     private String num;
 
     private String searchKey;
-    private Integer cameraId;
+    private Long cameraId;
     private Integer location;
     private String platform;
 }

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev-eur
+    active: dev
 server:
   port: 8082
   servlet:

src/main/resources/mapper/ucenter/AppSecretMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.ucenter.mapper.IAppSecretMapper">
+
+</mapper>