Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test

2026-07-31 11:06:44 +08:00
parent 4cee256f22 ca58709726
commit a9abd07105
13 changed files with 100 additions and 139 deletions
@@ -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 }
@@ -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