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-prod.yaml

@@ -38,10 +38,10 @@ blade:
     ##开启前必须先补 password(与 spring.data.redis 一致)，否则 Redisson 无密码连接会被拒绝，
     ##影响的是全部依赖该模板的服务；收票全票池等同步定时任务依赖它做多副本 single-flight
     enabled: false
-    #password:
     ##将docker脚本部署的redis服务映射为宿主机ip
     ##生产环境推荐使用阿里云高可用redis服务并设置密码
     address: redis://172.16.203.228:6379
+    password: ${spring.data.redis.password:}
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     prod:
@@ -61,7 +61,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
@@ -95,6 +105,10 @@ 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:
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
   bfi:
     # 业财融合（BFI）应用及接口配置，敏感值通过环境变量注入
     baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}
@@ -136,3 +150,12 @@ baidu:
 powerjob:
   worker:
     server-address: 172.16.203.228:7700
+
+# IAM账号与组织同步配置
+iam:
+  sync:
+    account-list-url: http://172.16.204.83:38000/gwzh/IAM/IAM_IDM_ACCOUNT_LIST
+    org-list-url: http://172.16.204.83:38000/gwzh/IAM/IAM_IDM_ORG_LIST
+    authorization: ${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}
+    profile-authorization: ${IAM_SSO_PROFILE_AUTHORIZATION:YjNlZmU0ODEwMzJiNGJhZTpkYzQ5NDY1NmQ4MzE0NThjODI5MzlmNzA2ZjliNDY3MQ==}
+    page-size: 50