yzc 1 жил өмнө
parent
commit
59fdb27ee4

+ 69 - 69
hx-admin/src/main/resources/application-prod.yml

@@ -5,74 +5,74 @@ spring:
             strict: true
             primary: base
             datasource:
-                victoriatourist:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                common:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                oa:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                mes:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                wms:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                item:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                supply:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                base:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                iot:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                customer:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                purchase:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                account:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                sale:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                mail:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                kd100:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                ehsd:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                jxst:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
+              victoriatourist:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              common:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              oa:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              mes:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              wms:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              item:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              supply:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              base:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              iot:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              customer:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              purchase:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              account:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              sale:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              mail:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              kd100:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              ehsd:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
+              jxst:
+                url: jdbc:mysql://172.17.0.6:3306/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                username: root
+                password: tST3^UdjF$pd7Zo
 
     # redis 配置
     redis:
@@ -108,7 +108,7 @@ mail:
     #abroadUrlPrefix: http://159.138.54.234:8088/mailService/
 
 hx:
-    httpUrl: http://139.159.251.109:81/prod-api/
+  httpUrl: https://erp.bridge-style.cc/prod-api/
 
 # token配置
 token:

+ 11 - 5
hx-admin/src/main/resources/application.yml

@@ -158,8 +158,14 @@ xss:
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 obs:
-  ak: 9HNBVBHO7F3GLUCGTK5C
-  sk: ZowLEoMJrICA9tOyln0yWVm0xGSiupe0gnbsZimk
-  endPoint: obs.cn-south-1.myhuaweicloud.com
-  url: https://os.winfaster.cn/
-  bucketName: winfaster
+  #huawei / tencent
+  type: tencent
+  #前端直传front 后端上传back
+  uploadMethod: back
+  #secretId
+  ak: AKIDCDB5wvqnhePxHwZ1LTTI7kDe2LqAXmtq
+  #secretKey
+  sk: FLE3kLn3555yf5SefZKcnrqfLRPAoIet
+  endPoint: cos.ap-shanghai.myqcloud.com
+  url: https://ehsd-1324559991.cos.ap-shanghai.myqcloud.com/
+  bucketName: ehsd-1324559991