日本配置

src/main/java/com/fdkankan/site/controller/FdkkController.java

@@ -36,7 +36,7 @@ public class FdkkController {
 
     @PostMapping("/projectAddNum")
     public ResultData projectAddNum(@RequestBody ProjectNumAddParam param){
-        log.info("四维通知项目シーンの追加---{}",param);
+        log.info("四维通知项目シーンを追加---{}",param);
         try {
             if(StringUtils.isBlank(param.getNum()) || StringUtils.isBlank(param.getParentScene())
                     || StringUtils.isBlank(param.getProjectId()) || param.getSceneSource() == null){
@@ -61,15 +61,15 @@ public class FdkkController {
                     projectNum.setType(0); break;
             }
             projectNumService.save(projectNum);
-            log.info("四维通知项目シーンの追加成功");
+            log.info("四维通知项目シーンを追加成功");
         }catch (Exception e){
-            log.error("四维通知项目シーンの追加失败---{}",e.getMessage());
+            log.error("四维通知项目シーンを追加失败---{}",e.getMessage());
         }
         return ResultData.ok();
     }
     @PostMapping("/delScene")
     public ResultData delScene(@RequestBody ProjectNumAddParam param){
-        log.info("四维或者激光-通知シーンの削除---{}",param);
+        log.info("四维或者激光-通知シーンを削除---{}",param);
 
         return ResultData.ok();
     }

src/main/java/com/fdkankan/site/controller/UploadController.java

@@ -109,7 +109,7 @@ public class UploadController extends BaseController {
         projectBim.setBimName(bimName);
         projectBimService.save(projectBim);
         projectService.updateTime(projectId);
-        projectLogService.addLog(projectBim.getProjectId(),"BIMの追加:"+projectBim.getBimName(),getToken(),null);
+        projectLogService.addLog(projectBim.getProjectId(),"BIMファイルを追加:"+projectBim.getBimName(),getToken(),null);
 
         File localFile = null;
         try {

src/main/java/com/fdkankan/site/service/impl/MarkingServiceImpl.java

@@ -124,7 +124,7 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
             LambdaUpdateWrapper<Marking> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(Marking::getMarkingId, markingId);
             this.baseMapper.delete(wrapper);
-            projectLogService.addLog(marking.getProjectId(), "注釈の削除:" + marking.getMarkingTitle(), token, null);
+            projectLogService.addLog(marking.getProjectId(), "注釈を削除:" + marking.getMarkingTitle(), token, null);
         }
     }
 

src/main/java/com/fdkankan/site/service/impl/ProjectBimServiceImpl.java

@@ -61,6 +61,6 @@ public class ProjectBimServiceImpl extends ServiceImpl<IProjectBimMapper, Projec
             return;
         }
         this.remove(wrapper);
-        projectLogService.addLog(projectId,"プロジェクト削除->BIM削除:"+list.get(0).getBimName(),token,null);
+        projectLogService.addLog(projectId,"プロジェクトを削除→BIMファイルを削除:"+list.get(0).getBimName(),token,null);
     }
 }

src/main/java/com/fdkankan/site/service/impl/ProjectNumServiceImpl.java

@@ -136,7 +136,7 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
         }
         List<String> numList = list.stream().map(ProjectNum::getNum).collect(Collectors.toList());
         this.remove(wrapper);
-        projectLogService.addLog(projectId,"プロジェクト削除->シーン削除:",token,numList);
+        projectLogService.addLog(projectId,"プロジェクトを削除→シーンを削除:",token,numList);
     }
 
     @Override

src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -285,11 +285,11 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
 
         if(delNumList.size() >0){
             projectNumService.delByNumList(param.getProjectId(),delNumList);
-            projectLogService.addLog(param.getProjectId(),"シーンの削除",param.getToken(),delNumList);
+            projectLogService.addLog(param.getProjectId(),"シーンを削除",param.getToken(),delNumList);
         }
         if(addNumList.size() >0){
             projectNumService.addByNumList(param.getProjectId(),numType,addNumList);
-            projectLogService.addLog(param.getProjectId(),"シーンの追加",param.getToken(),addNumList);
+            projectLogService.addLog(param.getProjectId(),"シーンを追加",param.getToken(),addNumList);
         }
         this.updateTime(project.getProjectId());
     }
@@ -303,7 +303,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
 
         VUtils.isTure(StringUtils.isBlank(param.getNum())).throwMessage(ResultCode.PARAM_MISS);
         projectNumService.delByNumList(param.getProjectId(),Arrays.asList(param.getNum()));
-        projectLogService.addLog(param.getProjectId(),"シーンの削除",param.getToken(),Arrays.asList(param.getNum()));
+        projectLogService.addLog(param.getProjectId(),"シーンを削除",param.getToken(),Arrays.asList(param.getNum()));
         this.updateTime(project.getProjectId());
 
         List<Marking> markings = markingService.findByProjectIdAndNum(project.getProjectId(),param.getNum());
@@ -318,7 +318,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         ProjectBim bim = projectBimService.getById(bimId);
         if(bim != null){
             checkTokenPer(token, bim.getProjectId());
-            projectLogService.addLog(bim.getProjectId(),"BIMの削除:"+bim.getBimName(),token,null);
+            projectLogService.addLog(bim.getProjectId(),"BIMファイルを削除:"+bim.getBimName(),token,null);
             projectBimService.removeById(bimId);
             this.updateTime(bim.getProjectId());
         }
@@ -372,7 +372,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         checkTokenPer(token, bim.getProjectId());
         projectBimService.updateBimName(projectBim);
         this.updateTime(bim.getProjectId());
-        projectLogService.addLog(bim.getProjectId(),"BIM名の変更:"+projectBim.getBimName(),token,null);
+        projectLogService.addLog(bim.getProjectId(),"BIMファイル名を変更:"+projectBim.getBimName(),token,null);
 
     }
 
@@ -389,7 +389,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         }
         this.update(wrapper);
         this.updateTime(param.getProjectId());
-        projectLogService.addLog(param.getProjectId(),"BIM位置の同期",token,null);
+        projectLogService.addLog(param.getProjectId(),"BIM位置を同期",token,null);
 
     }
 

src/main/resources/application-jp-prod.yaml

@@ -2,9 +2,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/fd_smart_site?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://172.16.30.42:13306/fdkk_laser?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Tokyo
     username: root
-    password: D2719bd0cae1a005
+    password: ENC(KsTGnu5DhCgxUM1V4/Bb9euFjVt/D4/l)
     hikari:
       connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
       minimum-idle: 5                   # 最小连接数
@@ -15,10 +15,10 @@ spring:
       max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
       connection-test-query: SELECT 1   # 连接测试语句
   redis:
-    host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com   #官网正式环境
+    host: 172.16.30.42   #官网正式环境
     port: 6379
     timeout: 6000ms
-    password: 3oo19bgh0cae2406&
+    password: 4dage7y4s0h
     jedis:
       pool:
         max-active: 10  #连接池最大连接数（使用负值表示没有限制）
@@ -28,10 +28,10 @@ spring:
     lettuce:
       shutdown-timeout: 0ms
   rabbitmq:
-    host: 127.0.0.1
+    host: 172.16.30.42
     port: 5672
-    username: admin
-    password: admin1231
+    username: ENC(veB2dO7PB1SMWv9OS/q5hQ==)
+    password: ENC(b9zSqiXa0cxTU8zCWolN3fcO0IyEHIMy)
     virtual-host: 4dkankan
     connection-timeout: 0
     listener:
@@ -43,14 +43,14 @@ spring:
 4dkk:
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: https://www.4dkankan.com
+    basePath: https://www.4dkankan.jp
     #basePath: http://192.168.0.38/4dkankan_v2
   laserService:
     #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: https://laser.4dkankan.com/backend
+    basePath: https://mega.4dkankan.jp/backend
   bimService:
     #bim 服务
-    basePath: http://bim.4dkankan.com
+    basePath: https://bim-jp.4dkankan.jp
 logging:
   config: classpath:logback-spring.xml
   file:
@@ -60,12 +60,12 @@ logging:
 filestorage:
   active: oss
   oss:
-    endpoint: https://oss-cn-shenzhen.aliyuncs.com
-    internal-endpoint: https://oss-cn-shenzhen-internal.aliyuncs.com
-    access-key: LTAIUrvuHqj8pvry
-    access-key-secret: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    bucket: 4dkankan
+    endpoint: http://oss-ap-northeast-1.aliyuncs.com
+    internal-endpoint: https://oss-ap-northeast-1-internal.aliyuncs.com
+    access-key: ENC(U8UeO6r+PVmJ1Vj33SZxlyo7G53Bza8BBgKfoS+MqM1xrtYWW1Fv2g==)
+    access-key-secret: ENC(/VkyDP4a7U7KBUKT3mJ1KME2JUtsxEtucMmM7wavfLq9WztylWgSWQ==)
+    bucket: geosign-4dkk
     bucket-custom-domain:
-      4dkankan: https://4dkk.4dage.com/
+      geosign-4dkk: https://oss.4dkankan.jp
 queue:
   manage-collaborate-msg-notice: manage-collaborate-msg-notice