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
@@ -1,2 +1,23 @@
-# blade-transport 开发环境配置
-# 数据源等公共配置已在 Nacos 的 blade-dev.yaml 中统一管理
+#服务器端口
+server:
+  port: 8110
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+  cloud:
+    nacos:
+      discovery:
+        # 本机多网卡时避免注册 169.254.* 导致网关 Host is down
+        ip: ${NACOS_DISCOVERY_IP:127.0.0.1}
+
+# LBS 车辆实时定位（Authorization 与 OA 人员接口一致）
+thirdParty:
+  lbs:
+    baseUrl: ${LBS_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:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}}