diff --git a/consul/config/data-service.json b/consul/config/data-service.json index 24faf96..9bdc3fc 100644 --- a/consul/config/data-service.json +++ b/consul/config/data-service.json @@ -2,7 +2,7 @@ "service": { "address": "data-service", "check": { - "http": "http://aktools:8080/api/public/stock_bid_ask_em?symbol=000001", + "http": "http://aktools:8000/api/public/stock_bid_ask_em?symbol=000001", "interval": "10s", "timeout": "5s" }, diff --git a/consul/config/whoami.json b/consul/config/whoami.json index a4b24df..ed690e5 100644 --- a/consul/config/whoami.json +++ b/consul/config/whoami.json @@ -2,7 +2,11 @@ "service": { "name": "whoami", "port": 80, - "tags": ["traefik.enable=true", "traefik.http.routers.whoami.rule=Host(`whoami.localhost`)", "traefik.http.routers.whoami.entrypoints=web"], + "meta": { + "traefik_enable": "true", + "traefik_http_routers_whoami_rule": "PathPrefix(`/whoami`)", + "traefik_http_routers_whoami_entrypoints": "web" + }, "check": { "http": "http://whoami:80", "interval": "10s" diff --git a/docker-compose.yml b/docker-compose.yml index b8b41a0..9fe88b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,90 +38,85 @@ services: build: ./services/data-service container_name: ari-data-service restart: always - depends_on: - consul: - condition: service_healthy - expose: - - "8000" + ports: + - "8000:8000" # Traefik dashboard networks: - microservice-network 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 - expose: - - "80" # 可选,Traefik 可以自动发现,不暴露到宿主机