dengsixing 10 kuukautta sitten
vanhempi
commit
c3d949c1bc
22 muutettua tiedostoa jossa 303 lisäystä ja 71 poistoa
  1. 6 0
      pom.xml
  2. 9 3
      src/main/java/com/fdkankan/feign/TietaEntityClient.java
  3. 8 0
      src/main/java/com/fdkankan/scene/controller/SceneController.java
  4. 35 7
      src/main/java/com/fdkankan/scene/controller/TIetaEditController.java
  5. 49 0
      src/main/java/com/fdkankan/scene/entity/SystemSecret.java
  6. 4 4
      src/main/java/com/fdkankan/scene/generator/AutoGenerate.java
  7. 5 4
      src/main/java/com/fdkankan/scene/httpclient/CustomHttpClient.java
  8. 18 0
      src/main/java/com/fdkankan/scene/mapper/SystemSecretMapper.java
  9. 16 0
      src/main/java/com/fdkankan/scene/service/SystemSecretService.java
  10. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneDrawServiceImpl.java
  11. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneEditControlsServiceImpl.java
  12. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoExtServiceImpl.java
  13. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java
  14. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneFileMappingServiceImpl.java
  15. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java
  16. 2 0
      src/main/java/com/fdkankan/scene/service/impl/SceneViewLogServiceImpl.java
  17. 22 0
      src/main/java/com/fdkankan/scene/service/impl/SystemSecretServiceImpl.java
  18. 28 14
      src/main/resources/application-dev.yml
  19. 28 13
      src/main/resources/application-preprod.yml
  20. 28 13
      src/main/resources/application-prod.yml
  21. 28 13
      src/main/resources/application-test.yml
  22. 5 0
      src/main/resources/mapper/scene.generator/SystemSecretMapper.xml

+ 6 - 0
pom.xml

@@ -104,6 +104,12 @@
             <version>3.4.3.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>4.2.0</version>
+        </dependency>
+
         <!-- mybatis-plus逆向工程依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>

+ 9 - 3
src/main/java/com/fdkankan/feign/TietaEntityClient.java

@@ -1,15 +1,21 @@
 package com.fdkankan.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.Header;
+import feign.HeaderMap;
+import feign.Headers;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
-@FeignClient(name = "chinatower-res-entity-service")
+import java.util.Map;
+
+@FeignClient(name = "chinatower-res-entity-service", url = "${gateway.url}")
 public interface TietaEntityClient {
 
-    @PostMapping("/station/page/lower/resource/{stationCode}")
-    JSONObject getStationResource(@PathVariable("stationCode") String stationCode);
+    @PostMapping("/CHINATOWER-RES-ENTITY-SERVICE/station/page/lower/resource/{stationCode}")
+    JSONObject getStationResource(@HeaderMap Map<String, String> header, @PathVariable("stationCode") String stationCode);
 
 }

+ 8 - 0
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -12,6 +12,7 @@ import com.fdkankan.scene.httpclient.CustomHttpClient;
 import com.fdkankan.scene.service.SceneEditInfoService;
 import com.fdkankan.scene.service.SceneFileMappingService;
 import com.fdkankan.scene.service.SceneService;
+import com.fdkankan.scene.service.SystemSecretService;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,5 +93,12 @@ public class SceneController extends BaseController{
         return ResultData.ok(stringStringMap);
     }
 
+    @Autowired
+    private SystemSecretService systemSecretService;
+
+    @GetMapping("/test")
+    public ResultData test(){
+        return ResultData.ok(systemSecretService.list());
+    }
 }
 

+ 35 - 7
src/main/java/com/fdkankan/scene/controller/TIetaEditController.java

@@ -2,48 +2,76 @@ package com.fdkankan.scene.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.ThreeDESUtil;
 import com.fdkankan.feign.TietaEntityClient;
 import com.fdkankan.scene.annotation.InitEditInfo;
 import com.fdkankan.scene.bean.ResultData;
+import com.fdkankan.scene.entity.SystemSecret;
+import com.fdkankan.scene.httpclient.CustomHttpClient;
 import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.*;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.net.InetAddress;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
  * 场景编辑管理
  */
-@Log4j2
 @RestController
 @RequestMapping("/service/scene/edit")
 public class TIetaEditController extends BaseController{
 
     @Resource
     private TietaEntityClient tietaEntityClient;
+    @Autowired
+    private SystemSecretService systemSecretService;
+    @Value("${gateway.key:6#dPz>3F}")
+	private String gatewayKey;
+    @Value("${tieta.checkToken.syscode}")
+	private String syscode;
+    @Autowired
+    private CustomHttpClient customHttpClient;
+    @Value("${gateway.url}")
+    private String gatewayUrl;
 
     @GetMapping("getStationResource")
     public ResultData getStationResource(String stationCode){
-        JSONObject stationResource = tietaEntityClient.getStationResource(stationCode);
+
+        List<SystemSecret> list = systemSecretService.list(new LambdaQueryWrapper<SystemSecret>().orderByDesc(SystemSecret::getUpdatedat));
+
+        String APPID = syscode;
+        String APPUUID = UUID.randomUUID().toString();
+        String secret = ThreeDESUtil.decode(list.get(0).getAppsecret(), gatewayKey);
+        String APPUUIDCRPT = ThreeDESUtil.encode(APPUUID, secret);
+        String ACCESSIPADDR = InetAddress.getLoopbackAddress().getHostAddress();
+        Map<String, String> headers = new HashMap<>();
+        headers.put("APPID",APPID);
+        headers.put("APPUUID",APPUUID);
+        headers.put("APPUUIDCRPT",APPUUIDCRPT);
+        headers.put("ACCESSIPADDR",ACCESSIPADDR);
+
+        String url = gatewayUrl + "/CHINATOWER-RES-ENTITY-SERVICE/station/page/lower/resource/" + stationCode;
+        JSONObject stationResource = customHttpClient.post(headers, url);
+//        JSONObject stationResource = tietaEntityClient.getStationResource(headers, stationCode);
         Integer resultCode = stationResource.getInteger("resultCode");
         if(resultCode == null || resultCode != 0){
             throw new BusinessException(-1, String.format("资源平台返回失败,resultCode:%d, resultMsg:%s", resultCode, stationResource.getString("resultMsg")));
         }
         JSONArray jsonArray = stationResource.getJSONArray("data");
         List<Map<String, Object>> collect = jsonArray.stream().map(v -> {
-            LinkedHashMap<String, Object> resource = (LinkedHashMap) v;
+            JSONObject resource = (JSONObject) v;
             Map<String, Object> map = new HashMap<>();
             map.put("ENTITY_ID", resource.get("ENTITY_ID"));
             map.put("ENTITY_NAME", resource.get("ENTITY_NAME"));

+ 49 - 0
src/main/java/com/fdkankan/scene/entity/SystemSecret.java

@@ -0,0 +1,49 @@
+package com.fdkankan.scene.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 系统秘钥表
+ * </p>
+ *
+ * @author
+ * @since 2024-11-29
+ */
+@Getter
+@Setter
+@TableName("system_secret")
+public class SystemSecret implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField(value = "uuid")
+    private String uuid;
+
+    @TableField(value = "appid")
+    private String appid;
+
+    @TableField("appsecret")
+    private String appsecret;
+
+    @TableField("appsecretold")
+    private String appsecretold;
+
+    @TableField(value = "updatetime")
+    private String updatetime;
+
+    @TableField("createdat")
+    private Date createdat;
+
+    @TableField("updatedat")
+    private Date updatedat;
+
+
+}

+ 4 - 4
src/main/java/com/fdkankan/scene/generator/AutoGenerate.java

@@ -21,7 +21,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"scene.generator", getTables(new String[]{
-                "t_scene_edit_info","t_scene_edit_info_ext","t_scene_edit_controls"
+                "system_secret"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -49,9 +49,9 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        DataSourceConfig.Builder datasourceConfig = new DataSourceConfig.Builder("jdbc:postgresql://10.180.145.98:5432/chinatower_vr",
+        DataSourceConfig.Builder datasourceConfig = new DataSourceConfig.Builder("jdbc:postgresql://10.180.145.98:5432/chinatower_3d",
                 "res_vr", "qawsed@123.");
-        datasourceConfig.schema("res_vr");
+        datasourceConfig.schema("chinatower_3d");
         FastAutoGenerator.create(datasourceConfig)
                 .globalConfig(builder -> {
                     builder.author("")               //作者
@@ -75,7 +75,7 @@ public class AutoGenerate {
                 })
                 .strategyConfig(builder -> {
                     builder.addInclude(tables)
-                            .addTablePrefix("t_")
+//                            .addTablePrefix("t_")
 
                             .serviceBuilder()
                             .formatServiceFileName("%sService")

+ 5 - 4
src/main/java/com/fdkankan/scene/httpclient/CustomHttpClient.java

@@ -2,19 +2,20 @@ package com.fdkankan.scene.httpclient;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.annotation.GetRequest;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
-import com.dtflys.forest.annotation.Var;
+import com.dtflys.forest.annotation.*;
 import com.dtflys.forest.extensions.DownloadFile;
 
 import java.io.InputStream;
+import java.util.Map;
 
 public interface CustomHttpClient {
 
     @Post(url = "{url}", connectTimeout = 30000,  readTimeout = 30000, maxRetryInterval = 3)
     JSONObject postJson(@Var("url") String url, @JSONBody Object object);
 
+    @Post(url = "{url}", connectTimeout = 30000,  readTimeout = 30000, maxRetryInterval = 3)
+    JSONObject post(@Header Map<String, String> headers, @Var("url") String url);
+
     /**
      * 返回类型用InputStream,用流的方式读取文件内容
      */

+ 18 - 0
src/main/java/com/fdkankan/scene/mapper/SystemSecretMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SystemSecret;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 系统秘钥表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-11-29
+ */
+@Mapper
+public interface SystemSecretMapper extends BaseMapper<SystemSecret> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/scene/service/SystemSecretService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.SystemSecret;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统秘钥表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-11-29
+ */
+public interface SystemSecretService extends IService<SystemSecret> {
+
+}

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneDrawServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.UploadFilePath;
@@ -24,6 +25,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@DS("vr")
 @Service
 public class SceneDrawServiceImpl implements ISceneDrawService {
 

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneEditControlsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.scene.entity.SceneEditControls;
 import com.fdkankan.scene.mapper.SceneEditControlsMapper;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
  * @since 2024-10-09
  */
 @Service
+@DS("vr")
 public class SceneEditControlsServiceImpl extends ServiceImpl<SceneEditControlsMapper, SceneEditControls> implements SceneEditControlsService {
 
     @Override

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoExtServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
  * @author
  * @since 2024-10-09
  */
+@DS("vr")
 @Service
 public class SceneEditInfoExtServiceImpl extends ServiceImpl<SceneEditInfoExtMapper, SceneEditInfoExt> implements SceneEditInfoExtService {
     @Autowired

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
  * @author
  * @since 2024-10-09
  */
+@DS("vr")
 @Service
 public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, SceneEditInfo> implements SceneEditInfoService {
 //    @Value("${fyun.host}")

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneFileMappingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.scene.entity.SceneFileMapping;
 import com.fdkankan.scene.mapper.SceneFileMappingMapper;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @author dsx
  * @since 2024-06-26
  */
+@DS("vr")
 @Service
 public class SceneFileMappingServiceImpl extends ServiceImpl<SceneFileMappingMapper, SceneFileMapping> implements SceneFileMappingService {
 

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
@@ -48,6 +49,7 @@ import java.util.Objects;
  * @author dsx
  * @since 2024-06-26
  */
+@DS("vr")
 @Slf4j
 @Service
 public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements SceneService {

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneViewLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.SceneViewLog;
 import com.fdkankan.scene.mapper.SceneViewLogMapper;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
  * @author
  * @since 2024-09-27
  */
+@DS("vr")
 @Service
 public class SceneViewLogServiceImpl extends ServiceImpl<SceneViewLogMapper, SceneViewLog> implements SceneViewLogService {
 

+ 22 - 0
src/main/java/com/fdkankan/scene/service/impl/SystemSecretServiceImpl.java

@@ -0,0 +1,22 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fdkankan.scene.entity.SystemSecret;
+import com.fdkankan.scene.mapper.SystemSecretMapper;
+import com.fdkankan.scene.service.SystemSecretService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统秘钥表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-11-29
+ */
+@DS("3d")
+@Service
+public class SystemSecretServiceImpl extends ServiceImpl<SystemSecretMapper, SystemSecret> implements SystemSecretService {
+
+}

+ 28 - 14
src/main/resources/application-dev.yml

@@ -8,20 +8,34 @@ spring:
         server-addr: 10.180.22.20:8848
         access-key: 856fc5859800857975ecb986b2d61363
   datasource:
-    url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
-    username: res_vr
-    password: qawsed@123.
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      maximum-pool-size: 20 #连接池最大连接数
-      minimum-idle: 5 #连接池最小连接数
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
-      login-timeout: 60000
-      pool-name: MyHikariCP
-      connection-test-query: SELECT 1 FROM DUAL
-
+    dynamic:
+      primary: vr
+      strict: false
+      datasource:
+        vr:
+          url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
+          username: res_vr
+          password:  qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
+        3d:
+          url: jdbc:postgresql://10.180.145.98:5432/chinatower_3d?currentSchema=chinatower_3d
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   configuration:

+ 28 - 13
src/main/resources/application-preprod.yml

@@ -8,19 +8,34 @@ spring:
         server-addr: 10.34.6.52:8848
         access-key: 9b006c7f8ee0ef3766c1ac36678819ca
   datasource:
-    url: jdbc:postgresql://10.161.32.224:5432/chinatower_vr
-    username: RES_VR
-    password: Changeme#123
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      maximum-pool-size: 20 #连接池最大连接数
-      minimum-idle: 5 #连接池最小连接数
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
-      login-timeout: 60000
-      pool-name: MyHikariCP
-      connection-test-query: SELECT 1 FROM DUAL
+    dynamic:
+      primary: vr
+      strict: false
+      datasource:
+        vr:
+          url: jdbc:postgresql://10.161.32.224:5432/chinatower_vr
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
+        3d:
+          url: jdbc:postgresql://10.161.32.224:5432/chinatower_3d?currentSchema=chinatower_3d
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml

+ 28 - 13
src/main/resources/application-prod.yml

@@ -8,19 +8,34 @@ spring:
         server-addr: 192.168.53.243:8848
         access-key: 6f8976ed25f072371e21f12fe19cc32e
   datasource:
-    url: jdbc:postgresql://10.159.32.145:5432/chinatower_vr
-    username: RES_VR
-    password: Changeme#123
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      maximum-pool-size: 20 #连接池最大连接数
-      minimum-idle: 5 #连接池最小连接数
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
-      login-timeout: 60000
-      pool-name: MyHikariCP
-      connection-test-query: SELECT 1 FROM DUAL
+    dynamic:
+      primary: vr
+      strict: false
+      datasource:
+        vr:
+          url: jdbc:postgresql://10.159.32.145:5432/chinatower_vr
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
+        3d:
+          url: jdbc:postgresql://10.159.32.145:5432/chinatower_3d?currentSchema=chinatower_3d
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml

+ 28 - 13
src/main/resources/application-test.yml

@@ -8,19 +8,34 @@ spring:
         server-addr: 10.190.26.194:8848
         access-key: 84f0bbec3a6e3ebf0c694462febce169
   datasource:
-    url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
-    username: res_vr
-    password: qawsed@123.
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      maximum-pool-size: 20 #连接池最大连接数
-      minimum-idle: 5 #连接池最小连接数
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
-      login-timeout: 60000
-      pool-name: MyHikariCP
-      connection-test-query: SELECT 1 FROM DUAL
+    dynamic:
+      primary: vr
+      strict: false
+      datasource:
+        vr:
+          url: jdbc:postgresql://10.180.145.98:5432/chinatower_vr
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
+        3d:
+          url: jdbc:postgresql://10.180.145.98:5432/chinatower_3d?currentSchema=chinatower_3d
+          username: res_vr
+          password: qawsed@123.
+          driver-class-name: org.postgresql.Driver
+          hikari:
+            maximum-pool-size: 20 #连接池最大连接数
+            minimum-idle: 5 #连接池最小连接数
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+            connection-test-query: SELECT 1 FROM DUAL
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml

+ 5 - 0
src/main/resources/mapper/scene.generator/SystemSecretMapper.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.scene.generator.mapper.SystemSecretMapper">
+
+</mapper>