Merge remote-tracking branch 'origin/master'

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

@@ -6,84 +6,84 @@ spring:
             primary: base
             datasource:
                 victoriatourist:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 common:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 oa:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 mes:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 wms:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 item:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 supply:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 base:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 iot:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 customer:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 purchase:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 account:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 sale:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 mail:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 kd100:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 ehsd:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
                 jxst:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: fjhx2012mysql
-                    password: 3PN-Mzn#vnP&q6d
+                    url: jdbc:mysql://36.134.91.96:12333/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: root
+                    password: Fjhx@pwd123
 
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 36.134.91.96
         # 端口，默认为6379
-        port: 6379
+        port: 13444
         # 数据库索引
         database: 5
         # 密码
-        password: 123qwe!@#
+        password: Fjhx@pwd123
         # 连接超时时间
         timeout: 10s
         lettuce: