From 20d9eb9579df4547ef2fbebcc85b56f67c921c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D1=8C=D0=B5=D0=B2?= Date: Wed, 17 Jun 2026 09:06:04 +0300 Subject: [PATCH] =?UTF-8?q?chore(config):=20#51=20slots-service=20=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D1=82=20=D0=BA=20=D1=87=D1=83=D0=B6=D0=B8?= =?UTF-8?q?=D0=BC=20API=20=D1=81=D1=82=D1=80=D0=BE=D0=B3=D0=BE=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pcp-gateway-service: добавлен маршрут satellite-catalog (/api/pcp-satellite-catalog/** -> StripPrefix=2). - slots-service: settings.request-service/earth-grid-service/satellite-catalog-service переведены на ${pcp.services.gateway}/api/pcp- (код строит $base/, gateway снимает префикс). Прямые адреса сервисов больше не используются. --- config-repo/pcp-gateway-service.yaml | 9 +++++++++ config-repo/slots-service.yaml | 16 ++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/config-repo/pcp-gateway-service.yaml b/config-repo/pcp-gateway-service.yaml index 1637751..bbadf63 100644 --- a/config-repo/pcp-gateway-service.yaml +++ b/config-repo/pcp-gateway-service.yaml @@ -63,6 +63,15 @@ spring: - Path=/api/pcp-slots/** filters: - StripPrefix=2 + # Каталог КА: фронт сюда не ходит, но slots-service обращается к нему строго + # через gateway (settings.satellite-catalog-service -> /api/pcp-satellite-catalog). + # StripPrefix=2: /api/pcp-satellite-catalog/api/satellites -> бэкенд /api/satellites. + - id: satellite-catalog + uri: ${pcp.services.satellite-catalog} + predicates: + - Path=/api/pcp-satellite-catalog/** + filters: + - StripPrefix=2 # --- Станции: путь СОХРАНЯЕМ (в vite было без rewrite) — без StripPrefix. - id: stations uri: ${pcp.services.stations} diff --git a/config-repo/slots-service.yaml b/config-repo/slots-service.yaml index 8021e3f..bbb93e2 100644 --- a/config-repo/slots-service.yaml +++ b/config-repo/slots-service.yaml @@ -68,10 +68,12 @@ spring: codec: max-in-memory-size: 20MB +# Все обращения к другим сервисам — строго через gateway (StripPrefix снимает /api/pcp-). +# Напрямую по адресам сервисов slots-service не ходит. settings: - request-service: ${pcp.services.request} - earth-grid-service: ${pcp.services.request} - satellite-catalog-service: ${pcp.services.satellite-catalog} + request-service: ${pcp.services.gateway}/api/pcp-request + earth-grid-service: ${pcp.services.gateway}/api/pcp-request + satellite-catalog-service: ${pcp.services.gateway}/api/pcp-satellite-catalog app: kafka: @@ -127,10 +129,12 @@ spring: codec: max-in-memory-size: 20MB +# Все обращения к другим сервисам — строго через gateway (StripPrefix снимает /api/pcp-). +# Напрямую по адресам сервисов slots-service не ходит. settings: - request-service: ${pcp.services.request} - earth-grid-service: ${pcp.services.request} - satellite-catalog-service: ${pcp.services.satellite-catalog} + request-service: ${pcp.services.gateway}/api/pcp-request + earth-grid-service: ${pcp.services.gateway}/api/pcp-request + satellite-catalog-service: ${pcp.services.gateway}/api/pcp-satellite-catalog app: kafka: topics: