Merge branch 'branch-nt-2023-3-17' into master-nt

eladmin-system/src/main/resources/config/application-fx.yml

@@ -5,14 +5,14 @@ spring:
   mvc:
     static-path-pattern: /image/**
   resources:
-    static-locations: file:/data/fqgz/image/,file:/data/fqgz/image/
+    static-locations: file:/mnt/sdc/fqgz/image/,file:/mnt/sdc/fqgz/image/
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://127.0.0.1:3306/xzgzc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+      url: jdbc:log4jdbc:mysql://192.168.0.44:3306/fxgzc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
       username: root
-      password: xzgzc123!Q
+      password: fx123AA!@#
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -57,7 +57,7 @@ spring:
   redis:
     #数据库索引
     database: 0
-    host: 58.218.195.83
+    host: 127.0.0.1
     port: 6379
     password: 123qysd!@#
     #连接超时时间
@@ -154,21 +154,21 @@ file:
 
 app:
   background:
-    picture: https://www.xzgzc.cn/image/logo/default.png
+    picture: https://www.xzfxgzc.cn/image/logo/default.png
   image:
-    url: https://www.xzgzc.cn/image/
+    url: https://www.xzfxgzc.cn/image/
   upload:
-    path: /data/fqgz/image/
+    path: /mnt/sdc/fqgz/image/
   host:
-    domain: https://www.xzgzc.cn
+    domain: https://www.xzfxgzc.cn
   push:
     port: 8082
   minio:
     accesskey: admin
-    secretkey: xzgzc!@aa
-    url: http://127.0.0.1:9000
+    secretkey: fxgzc123@!p
+    url: http://192.168.0.44:9000
     bucketName: fqgz
-    preview: https://www.xzgzc.cn
+    preview: https://www.xzfxgzc.cn
 tencent:
   account:
     secretId: AKIDO7duvhh3xb0C9G5i38xcGftrbBWvZCxY
@@ -182,13 +182,13 @@ tencent:
     secret: pzFuoHgzUWHKw01XT0H7FIMDMf0a58JsTP31gE1hpP5T5uY1RfyAGftROvAiMery
     keyLicence: gDsQvwRTlBm4/gdPKXaG6iKnjbpF9irGFpAGVP5yIw3MKZKybnnOGoHs+5cOV2W2z4dyUmiu1yXuUGKuvtwaWRDPoaPvCMFShdy7oEY61Zc0N/0uCvU2qXP+l/ULp2fnnOXJxLRb+Ldsnj2V9LuBgOnyvFyVQ/HPh90ood2X1F0bunPOAIzXmffDLgeO6ZlCF6nLN0cEBkm7m80p6hp25NqdfxfN9n2E+j6rBJe2NLKMazbd+HRaFvWs5PPpR2FowvQPYXiYI8xDMCxhE94waN4E3/BuCY1blf1vxH60DlAB21Z8dP38kwTUXejm0ybvUHu4iyFMCjkPy+XuvslJGw==
   ttlsig:
-    sdkappid: 1400743315
-    key: 3b8f5b1a04511a8e9f40a90b61bc8312452226416c5e533e81cbbf52e9b0e351
+    sdkappid: 1400795826
+    key: 80bf6652c34bdfdb0daa4e216398ef99aa75560bc60eab65b6f5519c99ac98f5
 
 baidu:
   account:
-    apiKey: QwaEoWO1NS6deCRqmDP52VTQ
-    secretKey: 2B4lINdHzsxkFsAkCbjZn7nH9cA8KNA8
+    apiKey: D1184gGxns9SaNnhSAo1Lb8r
+    secretKey: DIoHXW8WTHKkwzXpd6l4uC6TP7IHYR8l
 
 xxl:
   job:
@@ -196,7 +196,7 @@ xxl:
     admin:
       addresses: http://127.0.0.1:8080/xxl-job-admin
     executor:
-      appname: eladmindev-xxl-job-executor
+      appname: fx-xxl-job-executor
       address:
       ip:
       port: 9999
@@ -220,17 +220,17 @@ axq:
     readTimeout: 30000
     isSSL: true
   request:
-#    platID: DEB3BF5241B83381E05312016B0A7013
-#    cfcaURL: https://cs.anxinsign.com/FEP/
-#    channel: prod
-#    jksPath: anxinqian-fx.jks
-#    jksPWD: xzaxq123
-    platID: D998E5EBBF4C2D95E05312016B0A7677
-    cfcaURL: https://210.74.42.33:9443/FEP/
-    channel: test
-    jksPath: anxinsign-test.jks
-    jksPWD: 123456
+    platID: F159310662CEB43FE053345B210A1C4F
+    cfcaURL: https://cs.anxinsign.com/FEP/
+    channel: prod
+    jksPath: anxinsign-fxgzc.jks
+    jksPWD: 111111
+#    platID: D998E5EBBF4C2D95E05312016B0A7677
+#    cfcaURL: https://210.74.42.33:9443/FEP/
+#    channel: test
+#    jksPath: anxinsign-test.jks
+#    jksPWD: 123456
 hongruan:
   appid: 6F5JVsCCeSEbBSLSXWVwPki71yK5Y4Jf7oUjA4Y3mLtu
   sdkkey: 5qKM4a9oNSXNhXdwd7Ycrvnxdw2JXjcyeccYmb4zND7S
-  libpath: /data/fqgz/eladmin/lib/so
+  libpath: /mnt/sdc/fqgz/eladmin/lib/so