Merge remote-tracking branch 'origin/master' into feature/payment-apply-bfi-sync

# Conflicts:
#	blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java
#	blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
#	blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
#	blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
#	blade-service/blade-transport/pom.xml
#	blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/PaymentApplicationWrapper.java
#	blade-service/blade-transport/src/main/resources/application-dev.yml
#	blade-third-party-api/pom.xml
#	doc/nacos/blade-dev.yaml
#	doc/nacos/blade-prod.yaml
#	doc/nacos/third-party-api.yaml
#	pom.xml

doc/nacos/blade-dev.yaml

@@ -32,16 +32,16 @@ spring:
 blade:
   #分布式锁配置
   lock:
-    # blade.lock.enabled=true 才会装配 RedisLockClient；收票全票池同步等定时任务依赖它做 single-flight
-    enabled: true
+    enabled: false
     address: redis://127.0.0.1:6379
   #多团队协作服务配置
   loadbalancer:
     #开启配置
     enabled: true
-    #负载均衡优先调用的ip段
+    #负载均衡优先调用的ip段（含本机局域网段，避免只剩 169.254.* 时误路由）
     prior-ip-pattern:
-      - 192.168.0.*
+      - 192.168.*.*
+      - 172.16.*.*
       - 127.0.0.1
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
@@ -88,7 +88,17 @@ thirdParty:
     baseUrl: http://127.0.0.1:8080
   oa:
     # OA开放接口地址
-    baseUrl: http://127.0.0.1:8080
+    baseUrl: http://172.16.204.83:38000
+    queryCompanyPageUrl: /gwzh/OA/OA_GET_COMPANY_LIST
+    queryDepartmentPageUrl: /gwzh/OA/OA_GET_DEPARTMENT_LIST
+    queryPersonPageUrl: /gwzh/OA/OA_GET_USER_LIST
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}
+  lbs:
+    # LBS 网关地址（车辆实时定位）
+    baseUrl: http://172.16.204.83:38000
+    locateUrl: /gwzh/LBS/LBS_LOCATE
+    trackUrl: /gwzh/LBS/LBS_TRACK
+    authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}}
   track:
     # 轨迹开放接口地址
     baseUrl: http://127.0.0.1:8080
@@ -110,6 +120,7 @@ thirdParty:
     processExecuteUrl: ${MK_PROCESS_EXECUTE_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/execute}
     processDeleteUrl: ${MK_PROCESS_DELETE_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/delete}
     getCurrentNodesUrl: ${MK_CURRENT_NODES_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getCurNodesInfo}
+    getProcessInfoUrl: ${MK_PROCESS_INFO_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getProcessInfo}
     getNodeHandlersUrl: ${MK_NODE_HANDLERS_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getNodeHandlerInfos}
     getManualNodeUrl: ${MK_MANUAL_NODE_URL:/openapi/sys-lbpm/sysLbpmTemplate/openSupport/getManualNode}
     pushOrgDeptUrl: ${MK_PUSH_ORG_DEPT_URL:/openapi/sys-org/v2/push/orgDept}
@@ -122,6 +133,11 @@ thirdParty:
     downloadFileUrl: ${MK_DOWNLOAD_FILE_URL:/openapi/sys-attach/fileStream/download}
     queryApprovalListUrl: ${MK_QUERY_APPROVAL_LIST_URL:/openapi/lbpm-approval/lbpmApproval/portal/list}
     queryProcessListUrl: ${MK_QUERY_PROCESS_LIST_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/list}
+  wechat:
+    mini:
+      # 微信小程序（手机号一键登录 / openid）
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
   bfi:
     # 业财融合（BFI）应用及接口配置，敏感值通过环境变量注入
     baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}
@@ -161,15 +177,6 @@ baidu:
     token-refresh-advance: 1m
 
 
-#MinIO文件存储配置
-file:
-  storage:
-    minio:
-      endpoint: http://8.148.239.157:9000
-      access-key-id: transport
-      access-key-secret: transport
-      bucket-name: transport
-
 powerjob:
   worker:
     enabled: false