b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
刘泉佳
2026-09-24 03:15:30 +08:00
parent 0d1c6cee64 f0732765cf
commit cae284483e
235 changed files with 15516 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/nacos/third-party-api.yaml
+16 -1
View File
@@ -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}