111

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -18,10 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.common.util.FileMd5Util;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.SnowflakeIdGenerator;
+import com.fdkankan.common.util.*;
 import com.fdkankan.contro.bean.SendCallAlgorithmDetail;
 import com.fdkankan.contro.common.Result;
 import com.fdkankan.contro.constant.RedisConstants;
@@ -124,6 +121,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${4dkk.fdService.basePath}")
     private String fdServiceUrl;
 
+    @Value("${user.password.key:0000000856753656}")
+    private String userPasswordKey;
+
+    @Value("${user.password.iv:pwel781esd6wglxm}")
+    private String userPasswordIv;
+
     @Autowired
     private RedisUtil redisUtil;
 
@@ -1535,7 +1538,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String unicode = jsonObject.getString("creator") + "_" + jsonObject.getString("uuidtime");
 
         ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
-                jsonObject.getString("pwd"), unicode, cameraType, dataSource, icon, cameraDetail.getUserId() , null, algorithm,
+                jsonObject.getString("pwd"), unicode, cameraType, dataSource, icon, user.getId() , null, algorithm,
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
@@ -2132,13 +2135,17 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                         params.put("ryId", customUserId);
                         params.put("ryNo", customUserName);
                         params.put("nickName", customUserName);
-                        params.put("password", customUserName);
+                        params.put("password", AesUtil.encryptCBC(customUserPwd, userPasswordKey, userPasswordIv, AesUtil.ALMODE_CBC_NOPADDING));
                         String url = fdServiceUrl.concat(URL_ADD_UCENTER_USER);
-
+                        ResultData post = myClient.post(url, params);
+                        if(post.getCode() != 0){
+                            throw new BusinessException(ErrorCode.SYSTEM_ERROR.code(), "注册用户失败");
+                        }
+                        user = userService.getByUserName(customUserName);
                     }
 
                     // 通知计算
-                    this.copyDataAndBuild(null, dataSource, "V4", null, customUserId);
+                    this.copyDataAndBuild(null, dataSource, "V4", user, customUserId);
                     log.info("通知计算成功");
 
                     scenePre.setStatus(3);

src/main/resources/bootstrap-local.yml

@@ -29,6 +29,10 @@ spring:
           - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

src/main/resources/bootstrap-pro.yml

@@ -37,6 +37,10 @@ spring:
           - data-id: common-logback-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

src/main/resources/bootstrap-test.yml

@@ -37,6 +37,10 @@ spring:
           - data-id: common-logback-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}