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
2026-09-24 03:15:30 +08:00
parent 0d1c6cee64 f0732765cf
commit cae284483e
235 changed files with 15516 additions and 2569 deletions
@@ -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
@@ -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
@@ -22,6 +22,8 @@ spring:
      discovery:
        # 禁用云命名空间解析,防止和云平台环境变量冲突
        isUseCloudNamespaceParsing: false
+        # 本机多网卡开发时建议固定 127.0.0.1，可用环境变量 NACOS_DISCOVERY_IP 覆盖
+        ip: ${NACOS_DISCOVERY_IP:}
      config:
        # 禁用云命名空间解析,防止和云平台环境变量冲突
        isUseCloudNamespaceParsing: false
@@ -197,6 +199,9 @@ blade:
        - /wechat/**
      #开启错误日志入库
      error-log: true
+    #增删改操作日志自动入库（blade_log_api）
+    operation:
+      enabled: true
  #xss配置
  xss:
    enabled: true
@@ -213,6 +218,19 @@ blade:
    #接口放行
    skip-url:
      - /test/**
+      # 退出登录：允许无令牌/令牌失效时也能调用（服务端对无用户直接返回成功）
+      - /oauth/logout/**
+      - /blade-auth/oauth/logout/**
+      - /blade-transport/customer-archive/public/**
+      - /customer-archive/public/**
+      - /blade-transport/mk-process/public/**
+      - /mk-process/public/**
+      - /blade-openapi/openApi/mk/process/commonCallback
+      - /openApi/mk/process/commonCallback
+      - /feign/client/businessProcess/getCurrentNodes
+      - /feign/client/businessProcess/getProcessInfo
+      - /feign/client/customerArchive/syncProcessNode
+      - /feign/client/mkProcess/**
    #授权认证配置
    auth:
      - method: ALL
@@ -27,6 +27,28 @@
    "filters": [],
    "uri": "lb://blade-transport"
  },
+  {
+    "id": "blade-user-alias-route",
+    "order": 0,
+    "predicates": [
+      {
+        "name": "Path",
+        "args": {
+          "pattern": "/blade-user/**"
+        }
+      }
+    ],
+    "filters": [
+      {
+        "name": "RewritePath",
+        "args": {
+          "regexp": "/blade-user/(?<segment>.*)",
+          "replacement": "/user/$\\{segment}"
+        }
+      }
+    ],
+    "uri": "lb://blade-system"
+  },
  {
    "id": "example-route",
    "order": 0,
@@ -10,13 +10,28 @@ thirdParty:
    baseUrl: ${WPS_BASE_URL:http://127.0.0.1:8080}
  oa:
    # OA开放接口地址
-    baseUrl: ${OA_BASE_URL:http://127.0.0.1:8080}
+    baseUrl: ${OA_BASE_URL:http://172.16.204.83:38000}
+    queryCompanyPageUrl: ${OA_QUERY_COMPANY_PAGE_URL:/gwzh/OA/OA_GET_COMPANY_LIST}
+    queryDepartmentPageUrl: ${OA_QUERY_DEPARTMENT_PAGE_URL:/gwzh/OA/OA_GET_DEPARTMENT_LIST}
+    queryPersonPageUrl: ${OA_QUERY_PERSON_PAGE_URL:/gwzh/OA/OA_GET_USER_LIST}
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:}}
+  lbs:
+    # LBS 网关地址（车辆实时定位）
+    baseUrl: ${LBS_BASE_URL:${OA_BASE_URL:http://172.16.204.83:38000}}
+    locateUrl: ${LBS_LOCATE_URL:/gwzh/LBS/LBS_LOCATE}
+    trackUrl: ${LBS_TRACK_URL:/gwzh/LBS/LBS_TRACK}
+    authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:}}}
  track:
    # 轨迹开放接口地址
    baseUrl: ${TRACK_BASE_URL:http://127.0.0.1:8080}
  mk:
    # MK开放接口地址
    baseUrl: ${MK_BASE_URL:http://127.0.0.1:8080}
+  wechat:
+    mini:
+      # 微信小程序 AppId / AppSecret（Nacos 配置，勿提交真实 secret）
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
  bfi:
    # 业财融合（BFI）开放接口地址
    baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}