Merge remote-tracking branch 'refs/remotes/origin/dev-mall' into release_20260829

# Conflicts:
#	src/main/java/com/budwk/app/sys/controller/v4/SysV4MsgController.java
#	src/main/resources/views/platform/zhghh5/sys/home/msg.js

src/main/resources/application-dev.yaml

@@ -8,6 +8,14 @@ server:
   port: 8080
   host: 0.0.0.0
 
+spdb:
+  bab7:
+    url: http://localhost:8888/supplierOpenApi/pointOrder/queryOrderInfo
+
+sm4cbc:
+  keyHex: 00112233445566778899aabbccddeeff
+  ivHex: 0102030405060708090a0b0c0d0e0f10
+
 jetty:
   contextPath: /
   threadpool:
@@ -21,7 +29,7 @@ jetty:
     #结合ftp使用,或用nginx代理ftp路径
   #staticPath: /Users/wizzer/temp/files
   #开发模式静态资源
-  staticPathLocal: E:/projects/zhgh_cug_v4/src/main/resources/static
+  staticPathLocal: E:/DevOpsCode/zhgh_cug_v4/src/main/resources/static
 
 security:
   tokenName: saToken
@@ -71,9 +79,9 @@ redis:
   #nodes=192.168.6.31:6377,192.168.6.31:6378,192.168.6.28:6377,192.168.6.28:6378,192.168.6.34:6377,192.168.6.34:6378
 
 jdbc:
-  url: jdbc:mysql://192.168.21.215:3306/zhgh_cug_v4?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://127.0.0.1:3306/zhgh_cug_v4?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
   username: root
-  password: root
+  password: Root@123456
   validationQuery: select 1
   maxActive: 1000
   testWhileIdle: true
@@ -87,7 +95,7 @@ xsssql:
 beetl:
   RESOURCE:
     #本地路径,开发时设置本地路径,便于调试
-    rootLocal: E:/projects/zhgh_cug_v4/src/main/resources/views/
+    rootLocal: E:/DevOpsCode/zhgh_cug_v4/src/main/resources/views/
     root: views/
   DELIMITER_STATEMENT_START: "<!--#"
   DELIMITER_STATEMENT_END: "#-->"
@@ -160,9 +168,9 @@ quartz:
         class: com.budwk.app.task.conn.NutConnectionProvider
 
 minio:
-  accessKey: minioadmin
-  secretKey: minioadmin
-  endPoint: http://192.168.21.214:9000
+  accessKey: o1MwuzixNqAXh5zqEfMH
+  secretKey: RVnZum91JmGO79qtzWy2gKMBsF6OxAaibGrr7ets
+  endPoint: http://localhost:9000
   bucket: njupt
 
 data-center: