From ca58709726447982fba70bc79452f45eb1a1aed7 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Fri, 31 Jul 2026 11:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 9 +- auth/src/main/resources/application.yml | 8 +- .../src/main/resources/application.yml | 7 +- file/src/main/resources/application.yml | 7 +- firstleg/src/main/resources/application.yml | 7 +- gateway/src/main/resources/application-cn.yml | 87 +------------------ gateway/src/main/resources/application.yml | 80 ++++++++++++++++- iam/src/main/resources/application.yml | 7 +- .../src/main/resources/application.yml | 2 + order/src/main/resources/application.yml | 7 +- pom.xml | 4 +- print/src/main/resources/application.yml | 7 +- warehouse/src/main/resources/application.yml | 7 +- 13 files changed, 100 insertions(+), 139 deletions(-) diff --git a/audit-service/src/main/resources/application.yml b/audit-service/src/main/resources/application.yml index 0244bf667..9cc97711a 100644 --- a/audit-service/src/main/resources/application.yml +++ b/audit-service/src/main/resources/application.yml @@ -2,6 +2,8 @@ server: port: ${AUDIT_PORT:9700} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: audit-service config: @@ -20,12 +22,5 @@ spring: namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - # 本地 IDEA 启动默认连接本机 MySQL；生产环境请通过 AUDIT_DB_* 环境变量覆盖。 - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${AUDIT_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_audit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${AUDIT_DB_USERNAME:root} - password: ${AUDIT_DB_PASSWORD:123456} - baiyue.audit.enabled: false management.endpoints.web.exposure.include: health,info,prometheus diff --git a/auth/src/main/resources/application.yml b/auth/src/main/resources/application.yml index 162844ec6..d213306c2 100644 --- a/auth/src/main/resources/application.yml +++ b/auth/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${AUTH_PORT:9100} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: auth-service config: @@ -25,12 +27,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${AUTH_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_auth?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${AUTH_DB_USERNAME:root} - password: ${AUTH_DB_PASSWORD:123456} - baiyue.security: jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start} internal-service-token: ${INTERNAL_SERVICE_TOKEN:change-me-to-an-internal-token-at-least-32-bytes-long} diff --git a/event-bridge-service/src/main/resources/application.yml b/event-bridge-service/src/main/resources/application.yml index 03dd17a36..426ff4409 100644 --- a/event-bridge-service/src/main/resources/application.yml +++ b/event-bridge-service/src/main/resources/application.yml @@ -2,17 +2,14 @@ server: port: ${EVENT_BRIDGE_PORT:9300} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: event-bridge-service config: import: - optional:nacos:baiyue-common.yml?group=BAIYUE&refreshEnabled=true - optional:nacos:${spring.application.name}.yml?group=BAIYUE&refreshEnabled=true - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${EVENT_BRIDGE_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_event_bridge?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true} - username: ${EVENT_BRIDGE_DB_USERNAME:root} - password: ${EVENT_BRIDGE_DB_PASSWORD:123456} cloud: nacos: server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} diff --git a/file/src/main/resources/application.yml b/file/src/main/resources/application.yml index 834f1fb1d..47aaa70f1 100644 --- a/file/src/main/resources/application.yml +++ b/file/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${FILE_PORT:9206} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: file-service config: @@ -18,11 +20,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${FILE_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_file?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${FILE_DB_USERNAME:root} - password: ${FILE_DB_PASSWORD:123456} servlet: multipart: max-file-size: 5MB diff --git a/firstleg/src/main/resources/application.yml b/firstleg/src/main/resources/application.yml index f7fc61ca3..ab66d9035 100644 --- a/firstleg/src/main/resources/application.yml +++ b/firstleg/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${FIRSTLEG_PORT:9202} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: firstleg-service config: @@ -18,11 +20,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${FIRSTLEG_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_firstleg?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${FIRSTLEG_DB_USERNAME:root} - password: ${FIRSTLEG_DB_PASSWORD:123456} baiyue: security: jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start} diff --git a/gateway/src/main/resources/application-cn.yml b/gateway/src/main/resources/application-cn.yml index 7c7928c0a..d958fc845 100644 --- a/gateway/src/main/resources/application-cn.yml +++ b/gateway/src/main/resources/application-cn.yml @@ -2,94 +2,9 @@ spring: config: activate: on-profile: cn - cloud: - gateway: - discovery: - locator: - enabled: false - routes: - - id: auth-service - uri: lb://auth-service - predicates: [Path=/api/auth/**] - - id: iam-service - uri: lb://iam-service - predicates: ["Path=/api/iam/**,/api/platform/v1/iam/**,/api/merchant/v1/iam/**"] - - id: order-service - uri: lb://order-service - predicates: ["Path=/api/merchant/v1/orders/**,/api/platform/v1/orders/**"] - - id: firstleg-service - uri: lb://firstleg-service - predicates: ["Path=/api/merchant/v1/first-leg/**,/api/platform/v1/first-leg/**"] - - id: warehouse-service - uri: lb://warehouse-service - predicates: ["Path=/api/merchant/v1/warehouses/**,/api/merchant/v1/partners/**,/api/platform/v1/warehouses/**,/api/platform/v1/warehouse-admin/**"] - - id: file-service - uri: lb://file-service - predicates: ["Path=/api/merchant/v1/files/**,/api/platform/v1/files/**"] - - id: print-service - uri: lb://print-service - predicates: ["Path=/api/merchant/v1/print/**,/api/platform/v1/print/**"] - - id: auth-openapi - uri: lb://auth-service - predicates: [Path=/auth-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: iam-openapi - uri: lb://iam-service - predicates: [Path=/iam-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: order-openapi - uri: lb://order-service - predicates: [Path=/order-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: firstleg-openapi - uri: lb://firstleg-service - predicates: [Path=/firstleg-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: warehouse-openapi - uri: lb://warehouse-service - predicates: [Path=/warehouse-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: file-openapi - uri: lb://file-service - predicates: [Path=/file-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: print-openapi - uri: lb://print-service - predicates: [Path=/print-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: audit-openapi - uri: lb://audit-service - predicates: [Path=/audit-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: integration-openapi - uri: lb://integration-service - predicates: [Path=/integration-service/v3/api-docs/**] - filters: [StripPrefix=1] - - id: event-bridge-openapi - uri: lb://event-bridge-service - predicates: [Path=/event-bridge-service/v3/api-docs/**] - filters: [StripPrefix=1] baiyue: deployment: region-code: ${REGION_CODE:CN} - cell: ${DEPLOYMENT_CELL:prod-cn} + cell: ${DEPLOYMENT_CELL:cn} data-residency: ${DATA_RESIDENCY:CN} - -springdoc: - swagger-ui: - urls: - - { name: auth-platform, url: /auth-service/v3/api-docs/platform } - - { name: iam-platform, url: /iam-service/v3/api-docs/platform } - - { name: iam-merchant, url: /iam-service/v3/api-docs/merchant } - - { name: order-platform, url: /order-service/v3/api-docs/platform } - - { name: order-merchant, url: /order-service/v3/api-docs/merchant } - - { name: firstleg-platform, url: /firstleg-service/v3/api-docs/platform } - - { name: warehouse-merchant, url: /warehouse-service/v3/api-docs/merchant } - - { name: warehouse-platform, url: /warehouse-service/v3/api-docs/platform } - - { name: file-platform, url: /file-service/v3/api-docs/platform } - - { name: file-merchant, url: /file-service/v3/api-docs/merchant } - - { name: print-platform, url: /print-service/v3/api-docs/platform } - - { name: audit, url: /audit-service/v3/api-docs } - - { name: integration, url: /integration-service/v3/api-docs } - - { name: event-bridge, url: /event-bridge-service/v3/api-docs } diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index 03e74896f..4b24942a9 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -3,7 +3,10 @@ server: spring: profiles: - default: cn + active: ${SPRING_PROFILES_ACTIVE:dev} + group: + dev: cn + test: cn application: name: gateway autoconfigure: @@ -35,7 +38,8 @@ spring: gateway: discovery: locator: - enabled: true + # 使用显式路由，避免将注册中心中的内部服务自动暴露到公网。 + enabled: false lower-case-service-id: true routes: - id: auth-service @@ -53,7 +57,7 @@ spring: - id: warehouse-service uri: lb://warehouse-service predicates: - - Path=/api/merchant/v1/warehouses/**,/api/platform/v1/warehouses/**,/api/platform/v1/warehouse-admin/** + - Path=/api/merchant/v1/warehouses/**,/api/merchant/v1/partners/**,/api/platform/v1/warehouses/**,/api/platform/v1/warehouse-admin/**,/api/platform/v1/partners/**,/api/platform/v1/express-companies/** - id: file-service uri: lb://file-service predicates: @@ -66,6 +70,67 @@ spring: uri: lb://firstleg-service predicates: - Path=/api/merchant/v1/first-leg/**,/api/platform/v1/first-leg/** + # Swagger 文档聚合路由。 + - id: auth-openapi + uri: lb://auth-service + predicates: + - Path=/auth-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: iam-openapi + uri: lb://iam-service + predicates: + - Path=/iam-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: order-openapi + uri: lb://order-service + predicates: + - Path=/order-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: firstleg-openapi + uri: lb://firstleg-service + predicates: + - Path=/firstleg-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: warehouse-openapi + uri: lb://warehouse-service + predicates: + - Path=/warehouse-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: file-openapi + uri: lb://file-service + predicates: + - Path=/file-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: print-openapi + uri: lb://print-service + predicates: + - Path=/print-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: audit-openapi + uri: lb://audit-service + predicates: + - Path=/audit-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: integration-openapi + uri: lb://integration-service + predicates: + - Path=/integration-service/v3/api-docs/** + filters: + - StripPrefix=1 + - id: event-bridge-openapi + uri: lb://event-bridge-service + predicates: + - Path=/event-bridge-service/v3/api-docs/** + filters: + - StripPrefix=1 baiyue: cors: allowed-origins: ${CORS_ALLOWED_ORIGINS:http://localhost:5173,http://localhost:5174,http://127.0.0.1:5173,http://127.0.0.1:5174} @@ -93,6 +158,9 @@ baiyue: - /file-service/v3/api-docs/** - /print-service/v3/api-docs/** - /firstleg-service/v3/api-docs/** + - /audit-service/v3/api-docs/** + - /integration-service/v3/api-docs/** + - /event-bridge-service/v3/api-docs/** management: endpoints: @@ -131,3 +199,9 @@ springdoc: url: /print-service/v3/api-docs/platform - name: firstleg-platform url: /firstleg-service/v3/api-docs/platform + - name: audit + url: /audit-service/v3/api-docs + - name: integration + url: /integration-service/v3/api-docs + - name: event-bridge + url: /event-bridge-service/v3/api-docs diff --git a/iam/src/main/resources/application.yml b/iam/src/main/resources/application.yml index 03228f214..7006edfe7 100644 --- a/iam/src/main/resources/application.yml +++ b/iam/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${IAM_PORT:9201} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: iam-service config: @@ -19,11 +21,6 @@ spring: namespace: ${NACOS_NAMESPACE:public} config: namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${IAM_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_iam?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${IAM_DB_USERNAME:root} - password: ${IAM_DB_PASSWORD:123456} baiyue: clients: auth: diff --git a/integration-service/src/main/resources/application.yml b/integration-service/src/main/resources/application.yml index 6416a8b68..60cb6f509 100644 --- a/integration-service/src/main/resources/application.yml +++ b/integration-service/src/main/resources/application.yml @@ -2,6 +2,8 @@ server: port: ${INTEGRATION_PORT:9210} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: integration-service autoconfigure: diff --git a/order/src/main/resources/application.yml b/order/src/main/resources/application.yml index a7bf7069a..850794351 100644 --- a/order/src/main/resources/application.yml +++ b/order/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${ORDER_PORT:9204} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: order-service config: @@ -18,11 +20,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${ORDER_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_order?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${ORDER_DB_USERNAME:root} - password: ${ORDER_DB_PASSWORD:123456} management.endpoints.web.exposure.include: health,info,prometheus baiyue: diff --git a/pom.xml b/pom.xml index 8c2e4fb38..01ba974a2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ baiyue-firstleg-platform 1.0.0-SNAPSHOT pom - 百悦头程平台 - 百悦物流国内头程业务微服务平台 + 柏悦头程平台 + 柏悦悦物流国内头程业务微服务平台 platform-bom diff --git a/print/src/main/resources/application.yml b/print/src/main/resources/application.yml index ff1997f9d..f97b78029 100644 --- a/print/src/main/resources/application.yml +++ b/print/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${PRINT_PORT:9207} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: print-service config: @@ -18,11 +20,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${PRINT_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_print?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${PRINT_DB_USERNAME:root} - password: ${PRINT_DB_PASSWORD:123456} baiyue: security: jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start} diff --git a/warehouse/src/main/resources/application.yml b/warehouse/src/main/resources/application.yml index 8bffff78a..ec3531b85 100644 --- a/warehouse/src/main/resources/application.yml +++ b/warehouse/src/main/resources/application.yml @@ -1,6 +1,8 @@ server: port: ${WAREHOUSE_PORT:9205} spring: + profiles: + active: ${SPRING_PROFILES_ACTIVE:dev} application: name: warehouse-service config: @@ -18,11 +20,6 @@ spring: group: ${NACOS_GROUP:BAIYUE} namespace: ${NACOS_NAMESPACE:public} config.namespace: ${NACOS_NAMESPACE:public} - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${WAREHOUSE_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_warehouse?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true} - username: ${WAREHOUSE_DB_USERNAME:root} - password: ${WAREHOUSE_DB_PASSWORD:123456} baiyue: security: jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start}