xiewj před 7 měsíci
rodič
revize
3ac85a6a68

+ 18 - 15
src/main/resources/application-asw-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.31.47.163:13306/fd_smart_site?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: root
-    password: D2719bd0cae1a005
+    password: JK20220120%JIK
     hikari:
       connection-timeout: 30000         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生SQLException, 默认:30秒
       minimum-idle: 5                   # 最小连接数
@@ -15,10 +15,11 @@ spring:
       max-lifetime: 1800000             # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟 1800000ms
       connection-test-query: SELECT 1   # 连接测试语句
   redis:
-    host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com   #官网正式环境
+    host: 172.31.47.163
     port: 6379
     timeout: 6000ms
-    password: 3oo19bgh0cae2406&
+    password:
+    database: 0
     jedis:
       pool:
         max-active: 10  #连接池最大连接数(使用负值表示没有限制)
@@ -31,14 +32,16 @@ spring:
 4dkk:
   fdService:
     #官网生产环境:https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: https://www.4dkankan.com
-    #basePath: http://192.168.0.38/4dkankan_v2
+    basePath: https://testeur.4dkankan.com
+    port: 80
   laserService:
     #深时(激光)地址 生产环境:https://laser.4dkankan.com/
-    basePath: https://laser.4dkankan.com/backend
+    basePath: https://test-eurlaser.4dkankan.com
+    port: 80
   bimService:
     #bim 服务
-    basePath: http://bim.4dkankan.com
+    basePath: http://uat-eur-bim.4dkankan.com
+    port: 80
 logging:
   config: classpath:logback-spring.xml
   file:
@@ -46,12 +49,12 @@ logging:
   level:
     com.fdkankan: DEBUG
 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
+  active: aws
+  aws:
+    endpoint: http://eurs3.4dkankan.com
+    internal-endpoint: http://eurs3.4dkankan.com
+    access-key: AKIAWCV5QFZ3ZNELKYUY
+    access-key-secret: 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
     bucket: 4dkankan
     bucket-custom-domain:
-      4dkankan: https://4dkk.4dage.com/
+      4dkankan: https://eurs3.4dkankan.com

+ 15 - 17
src/main/resources/application-aws-test.yaml

@@ -2,9 +2,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource          # 数据源类型:HikariCP
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:13306/fd_smart_site?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://localhost:3306/fd_smart_site?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: root
-    password: ENC(e8emcMZgaRX3rCnNasm+0RKyq/Il0y4i)
+    password: JK20220120%JIK
     hikari:
       connection-timeout: 30000         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生SQLException, 默认:30秒
       minimum-idle: 5                   # 最小连接数
@@ -18,7 +18,7 @@ spring:
     host: 127.0.0.1
     port: 6379
     timeout: 6000ms
-    password:
+    password: redis123ROOT.
     database: 0
     jedis:
       pool:
@@ -32,31 +32,29 @@ spring:
 4dkk:
   fdService:
     #官网生产环境:https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test-jp.4dkankan.com
+    basePath: https://testeur.4dkankan.com
     port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
   laserService:
     #深时(激光)地址 生产环境:https://laser.4dkankan.com/
-    basePath: https://testlaser-jp.4dkankan.com/backend
+    basePath: https://test-eurlaser.4dkankan.com
     port: 80
   bimService:
     #bim 服务
-    basePath: http://test-bim-jp.4dkankan.com
+    basePath: http://uat-eur-bim.4dkankan.com
     port: 80
 logging:
   config: classpath:logback-spring.xml
   file:
-    path: /home/smart-site/logs
+    path: /home/backend/smart-site/logs
   level:
     com.fdkankan: DEBUG
 filestorage:
-  active: oss
-  oss:
-    endpoint: http://oss-ap-northeast-1.aliyuncs.com
-    internal-endpoint: http://oss-ap-northeast-1.aliyuncs.com
-    access-key: ENC(U8UeO6r+PVmJ1Vj33SZxlyo7G53Bza8BBgKfoS+MqM1xrtYWW1Fv2g==)
-    access-key-secret: ENC(/VkyDP4a7U7KBUKT3mJ1KME2JUtsxEtucMmM7wavfLq9WztylWgSWQ==)
-    bucket: geosign-4dkk
+  active: aws
+  aws:
+    endpoint: http://testeurs3.4dkankan.com
+    internal-endpoint: http://testeurs3.4dkankan.com
+    access-key: AKIAWCV5QFZ3ZNELKYUY
+    access-key-secret: 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
+    bucket: test-4dkankan
     bucket-custom-domain:
-      geosign-4dkk: https://oss.4dkankan.jp
+      test-4dkankan: https://testeurs3.4dkankan.com