Merge remote-tracking branch 'origin/master'

hx-admin/pom.xml

@@ -67,7 +67,8 @@
                 </configuration>
             </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+<!--        <finalName>${project.artifactId}</finalName>-->
+        <finalName>hx-xmhjc-web</finalName>
     </build>
 
 </project>

hx-admin/src/main/resources/application-dev.yml

@@ -5,14 +5,6 @@ spring:
       strict: true
       primary: base
       datasource:
-#        base:
-        #          url: jdbc:mysql://121.37.194.75:30102/bytesailing_base1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-        #          username: xmhjc
-        #          password: 2j^q9*DF
-        #        common:
-        #          url: jdbc:mysql://121.37.194.75:30102/bytesailing_common1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-        #          username: xmhjc
-        #          password: 2j^q9*DF
         base:
           url: jdbc:mysql://121.37.194.75:30102/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: xmhjc

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

@@ -6,24 +6,20 @@ spring:
       primary: base
       datasource:
         base:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://172.17.0.4:3306/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 5fWD*oa^nso@kmKa
-        common:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: 5fWD*oa^nso@kmKa
+          password: PdKKy%vZ)2mGykg
 
   # redis 配置
   redis:
     # 地址
     host: 127.0.0.1
     # 端口，默认为6379
-    port: 31347
+    port: 5000
     # 数据库索引
     database: 1
     # 密码
-    password: w3G_11h4YjrsO_6P5Oi
+    password: Z?(?wpxfUke)1im
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -38,6 +34,8 @@ spring:
         max-wait: -1ms
 
 server:
+  # 服务器的HTTP端口，默认为8080
+  port: 1000
   servlet:
     context-path: /prod-api
 
@@ -47,7 +45,7 @@ mail:
   abroadUrlPrefix:
 
 hx:
-  httpUrl: http://139.159.251.109:81/prod-api/
+  httpUrl: http://haijiacheng.com/prod-api/
 
 # token配置
 token:

hx-admin/src/main/resources/application-test.yml

@@ -6,13 +6,9 @@ spring:
       primary: base
       datasource:
         base:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: 5fWD*oa^nso@kmKa
-        common:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: 5fWD*oa^nso@kmKa
+          url: jdbc:mysql://121.37.194.75:30102/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: xmhjc
+          password: 2j^q9*DF
 
   # redis 配置
   redis:

hx-admin/src/main/resources/application.yml

@@ -60,9 +60,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 100MB
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 200MB
   main:
     allow-circular-references: true
 
@@ -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
+  region: ap-shanghai
+  uploadMethod: back
+  #secretId
+  ak: AKIDmPqHhzAHM9sSwFd4dHpIm9MNBnMnIk7T
+  #secretKey
+  sk: XBjFf1Lc1VM3b1IRtHPKIRZhyCYqDf1G
+  endPoint: cos.ap-shanghai.myqcloud.com
+  url: https://xmhjc-1322241475.cos.ap-shanghai.myqcloud.com/
+  bucketName: xmhjc-1322241475