From 832c6c5a5962767901c639c52c8ae6835838b157 Mon Sep 17 00:00:00 2001
From: fanfpy <fanfpy@qq.com>
Date: Tue, 1 Jul 2025 14:52:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=AF=E7=94=A8docker=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E8=87=AA=E5=8A=A8=E6=9A=B4=E9=9C=B2=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=AA=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改traefik配置以自动暴露docker服务
取消注释docker-compose中的quant-service等微服务
更新data-service的路由规则语法
---
 consul/config/data-service.json |   2 +-
 docker-compose.yml              | 136 ++++++++++++++++----------------
 traefik/traefik.yml             |   2 +-
 3 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/consul/config/data-service.json b/consul/config/data-service.json
index 6513892..437bd59 100644
--- a/consul/config/data-service.json
+++ b/consul/config/data-service.json
@@ -9,7 +9,7 @@
     "id": "data-service-1",
     "meta": {
       "traefik_enable": "true",
-      "traefik_http_routers_data_service_rule": "PathPrefix(`/api/data`)"
+      "traefik_http_routers_data_service_rule": "PathPrefix('/api/data')"
     },
     "name": "data-service",
     "port": 8000
diff --git a/docker-compose.yml b/docker-compose.yml
index 78e9b58..f0d786d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,78 +48,78 @@ services:
     environment:
       - SERVICE_NAME=data-service
 
-  # quant-service:
-  #   build: ./services/quant-service
-  #   container_name: ari-quant-service
-  #   restart: always
-  #   depends_on:
-  #     consul:
-  #       condition: service_healthy
-  #   expose:
-  #     - "8001"
-  #   networks:
-  #     - microservice-network
-  #   environment:
-  #     - SERVICE_NAME=quant-service
+  quant-service:
+    build: ./services/quant-service
+    container_name: ari-quant-service
+    restart: always
+    depends_on:
+      consul:
+        condition: service_healthy
+    expose:
+      - "8001"
+    networks:
+      - microservice-network
+    environment:
+      - SERVICE_NAME=quant-service
 
-  # emotion-service:
-  #   build: ./services/emotion-service
-  #   container_name: ari-emotion-service
-  #   restart: always
-  #   depends_on:
-  #     consul:
-  #       condition: service_healthy
-  #   expose:
-  #     - "8002"
-  #   networks:
-  #     - microservice-network
-  #   environment:
-  #     - SERVICE_NAME=emotion-service
+  emotion-service:
+    build: ./services/emotion-service
+    container_name: ari-emotion-service
+    restart: always
+    depends_on:
+      consul:
+        condition: service_healthy
+    expose:
+      - "8002"
+    networks:
+      - microservice-network
+    environment:
+      - SERVICE_NAME=emotion-service
 
-  # recommend-service:
-  #   build: ./services/recommend-service
-  #   container_name: ari-recommend-service
-  #   restart: always
-  #   depends_on:
-  #     consul:
-  #       condition: service_healthy
-  #   expose:
-  #     - "8003"
-  #   networks:
-  #     - microservice-network
-  #   environment:
-  #     - SERVICE_NAME=recommend-service
+  recommend-service:
+    build: ./services/recommend-service
+    container_name: ari-recommend-service
+    restart: always
+    depends_on:
+      consul:
+        condition: service_healthy
+    expose:
+      - "8003"
+    networks:
+      - microservice-network
+    environment:
+      - SERVICE_NAME=recommend-service
 
-  # user-service:
-  #   build: ./services/user-service
-  #   container_name: ari-user-service
-  #   restart: always
-  #   depends_on:
-  #     consul:
-  #       condition: service_healthy
-  #   expose:
-  #     - "8004"
-  #   networks:
-  #     - microservice-network
-  #   environment:
-  #     - SERVICE_NAME=user-service
+  user-service:
+    build: ./services/user-service
+    container_name: ari-user-service
+    restart: always
+    depends_on:
+      consul:
+        condition: service_healthy
+    expose:
+      - "8004"
+    networks:
+      - microservice-network
+    environment:
+      - SERVICE_NAME=user-service
 
-  # frontend:
-  #   build: ./services/frontend
-  #   container_name: ari-frontend
-  #   restart: always
-  #   depends_on:
-  #     - data-service
-  #     - quant-service
-  #     - emotion-service
-  #     - recommend-service
-  #     - user-service
-  #   expose:
-  #     - "80"
-  #   networks:
-  #     - microservice-network
-  #   environment:
-  #     - SERVICE_NAME=frontend
+  frontend:
+    build: ./services/frontend
+    container_name: ari-frontend
+    restart: always
+    depends_on:
+      - data-service
+      - quant-service
+      - emotion-service
+      - recommend-service
+      - user-service
+    expose:
+      - "80"
+    networks:
+      - microservice-network
+    environment:
+      - SERVICE_NAME=frontend
 
   whoami:
     image: traefik/whoami
diff --git a/traefik/traefik.yml b/traefik/traefik.yml
index 684f462..5336a79 100644
--- a/traefik/traefik.yml
+++ b/traefik/traefik.yml
@@ -5,7 +5,7 @@ entryPoints:
 
 providers:
   docker:
-    exposedByDefault: false
+    exposedByDefault: true
 
   consulCatalog:
     endpoint: