fanfpy/AriStockAI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 重构服务注册与发现机制，使用Consul进行集中管理

Browse Source 
- 移除各服务的独立注册脚本，改为通过Consul配置文件集中管理
- 为所有服务添加健康检查端点
- 更新docker-compose配置，添加网络和健康检查依赖
- 修改data-service的启动命令和端口配置
- 禁用Consul的ACL以简化开发环境配置
This commit is contained in:
fanfpy 2025-06-22 22:35:51 +08:00
parent 806e444297
commit f19ce5992f
18 changed files with 205 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consul/config/consul.hcl
View File

@ -3,6 +3,6 @@ ui_config {
}
acl {
enabled = true
enabled = false
default_policy = "deny"
}

17
consul/config/data-service.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "data-service"
id = "data-service-1"
address = "data-service"
port = 8000
check {
http = "http://aktools:8080/quote_zh_a_hist?symbol=sh600000&period=daily&start_date=20220101&end_date=20220102"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.data-service.rule" = "PathPrefix(`/api/data`)"
}
}

17
consul/config/emotion-service.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "emotion-service"
id = "emotion-service-1"
address = "emotion-service"
port = 8002
check {
http = "http://emotion-service:8002/health"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.emotion-service.rule" = "PathPrefix(`/api/emotion`)"
}
}

17
consul/config/frontend.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "frontend"
id = "frontend-1"
address = "frontend"
port = 80
check {
http = "http://frontend:80/"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.frontend.rule" = "PathPrefix(`/`)"
}
}

17
consul/config/quant-service.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "quant-service"
id = "quant-service-1"
address = "quant-service"
port = 8001
check {
http = "http://quant-service:8001/health"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.quant-service.rule" = "PathPrefix(`/api/quant`)"
}
}

17
consul/config/recommend-service.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "recommend-service"
id = "recommend-service-1"
address = "recommend-service"
port = 8003
check {
http = "http://recommend-service:8003/health"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.recommend-service.rule" = "PathPrefix(`/api/recommend`)"
}
}

17
consul/config/user-service.hcl Normal file
View File

@ -0,0 +1,17 @@
service {
name = "user-service"
id = "user-service-1"
address = "user-service"
port = 8004
check {
http = "http://user-service:8004/health"
interval = "10s"
timeout = "5s"
}
meta = {
"traefik.enable" = "true"
"traefik.http.routers.user-service.rule" = "PathPrefix(`/api/user`)"
}
}

138
docker-compose.yml
View File

@ -1,78 +1,138 @@
version: '3.8'
networks:
microservice-network:
driver: bridge
services:
consul:
image: consul:1.15
container_name: ari-consul
restart: always
ports:
- "8500:8500" # Consul Web UI
- "8600:8600/udp" # DNS服务
volumes:
- ./consul/config:/consul/config
command: "consul agent -dev -config-dir=/consul/config -client=0.0.0.0"
networks:
- microservice-network
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8500/v1/status/leader"]
interval: 10s
timeout: 5s
retries: 3
traefik:
image: traefik:v2.9
command:
- --entrypoints.web.address=:80
- --providers.consulcatalog=true
- --providers.consulcatalog.endpoint.address=consul:8500
- --api.dashboard=true
container_name: ari-traefik
restart: always
depends_on:
consul:
condition: service_healthy
ports:
- "80:80"
- "80:80" # 主入口
- "8080:8080" # Dashboard
volumes:
- ./traefik/traefik.yml:/etc/traefik/traefik.yml
- /var/run/docker.sock:/var/run/docker.sock
- /var/run/docker.sock:/var/run/docker.sock:ro
command:
- --providers.consulcatalog=true
- --providers.consulcatalog.endpoint.address=consul:8500
- --providers.consulcatalog.exposedbydefault=false
- --api.dashboard=true
- --log.level=INFO
networks:
- microservice-network
labels:
- "traefik.enable=true"
- "traefik.http.routers.traefik-dashboard.rule=PathPrefix(`/dashboard`) || PathPrefix(`/api`)"
- "traefik.http.routers.traefik-dashboard.service=api@internal"
- "traefik.http.routers.traefik-dashboard.entrypoints=web"
data-service:
build: ./services/data-service
labels:
- "traefik.enable=true"
- "traefik.http.routers.data.rule=PathPrefix(`/api/data`)"
container_name: ari-data-service
restart: always
depends_on:
consul:
condition: service_healthy
expose:
- "8000"
networks:
- microservice-network
environment:
- SERVICE_NAME=data-service
quant-service:
build: ./services/quant-service
labels:
- "traefik.enable=true"
- "traefik.http.routers.quant.rule=PathPrefix(`/api/quant`)"
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
labels:
- "traefik.enable=true"
- "traefik.http.routers.emotion.rule=PathPrefix(`/api/emotion`)"
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
labels:
- "traefik.enable=true"
- "traefik.http.routers.recommend.rule=PathPrefix(`/api/recommend`)"
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
labels:
- "traefik.enable=true"
- "traefik.http.routers.user.rule=PathPrefix(`/api/user`)"
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
labels:
- "traefik.enable=true"
- "traefik.http.routers.frontend.rule=PathPrefix(`/`)"
container_name: ari-frontend
restart: always
depends_on:
- data-service
- quant-service
- emotion-service
- recommend-service
- user-service
expose:
- "80"
gitea-webhook:
build: ./gitea-webhook
ports:
- "5005:5005"
consul:
image: consul:1.15
ports:
- "8500:8500" # Consul Web UI
- "8600:8600/udp"
volumes:
- ./consul/config:/consul/config
command: "consul agent -dev -config-dir=/consul/config"
networks:
- microservice-network
environment:
- SERVICE_NAME=frontend

2
services/data-service/Dockerfile
View File

@ -4,4 +4,4 @@ WORKDIR /app
COPY requirements.txt .
RUN pip install -r requirements.txt
COPY . .
CMD ["sh", "-c", "aktools run --port 8001 & python register.py && wait"]
CMD ["python", "-m", "aktools", "--host", "0.0.0.0", "--port", "8000"]

19
services/data-service/app.py
View File

@ -1,19 +0,0 @@
from flask import Flask, jsonify
import threading
import subprocess
from register import register_to_consul
app = Flask(__name__)
@app.route("/health")
def health():
return jsonify({"status": "ok"}), 200
@app.route("/hello")
def hello():
return jsonify({"message": "Hello from service!"})
if __name__ == "__main__":
threading.Thread(target=register_to_consul).start()
subprocess.Popen(["aktools", "run", "--port", "8001"])
app.run(host="0.0.0.0", port=8000)

27
services/data-service/register.py
View File

@ -1,27 +0,0 @@
import time
import requests
def register_to_consul():
time.sleep(3) # 等待服务稳定再注册
service_name = "aktools-service" # AKTools 主服务
port = 8001 # AKTools 端口
payload = {
"Name": service_name,
"ID": f"{service_name}-1",
"Address": service_name, # 容器名作为地址
"Port": port,
"Check": {
"TCP": f"{service_name}:{port}",
"Interval": "10s"
}
}
try:
requests.put("http://consul:8500/v1/agent/service/register", json=payload)
print(f"[{service_name}] Registered to Consul")
except Exception as e:
print(f"❌ Consul register failed: {e}")
if __name__ == "__main__":
register_to_consul()

1
services/data-service/requirements.txt
View File

@ -1,2 +1 @@
flask
aktools

2
services/emotion-service/app.py
View File

@ -1,6 +1,5 @@
from flask import Flask, jsonify
import threading
from register import register_to_consul
app = Flask(__name__)
@ -13,5 +12,4 @@ def hello():
return jsonify({"message": "Hello from service!"})
if __name__ == "__main__":
threading.Thread(target=register_to_consul).start()
app.run(host="0.0.0.0", port=8002)

24
services/emotion-service/register.py
View File

@ -1,24 +0,0 @@
import time
import requests
def register_to_consul():
time.sleep(3) # 等待服务稳定再注册
service_name = "emotion-service" # 替换为 quant-service/emotion-service 等
port = 8002 # 替换为 8001, 8002 等
payload = {
"Name": service_name,
"ID": f"{service_name}-1",
"Address": service_name, # 容器名作为地址
"Port": port,
"Check": {
"HTTP": f"http://{service_name}:{port}/health",
"Interval": "10s"
}
}
try:
requests.put("http://consul:8500/v1/agent/service/register", json=payload)
print(f"[{service_name}] Registered to Consul")
except Exception as e:
print(f"❌ Consul register failed: {e}")

2
services/quant-service/app.py
View File

@ -1,6 +1,5 @@
from flask import Flask, jsonify
import threading
from register import register_to_consul
app = Flask(__name__)
@ -13,5 +12,4 @@ def hello():
return jsonify({"message": "Hello from service!"})
if __name__ == "__main__":
threading.Thread(target=register_to_consul).start()
app.run(host="0.0.0.0", port=8001)

24
services/quant-service/register.py
View File

@ -1,24 +0,0 @@
import time
import requests
def register_to_consul():
time.sleep(3) # 等待服务稳定再注册
service_name = "quant-service" # 替换为 quant-service/emotion-service 等
port = 8001 # 替换为 8001, 8002 等
payload = {
"Name": service_name,
"ID": f"{service_name}-1",
"Address": service_name, # 容器名作为地址
"Port": port,
"Check": {
"HTTP": f"http://{service_name}:{port}/health",
"Interval": "10s"
}
}
try:
requests.put("http://consul:8500/v1/agent/service/register", json=payload)
print(f"[{service_name}] Registered to Consul")
except Exception as e:
print(f"❌ Consul register failed: {e}")

1
services/recommend-service/Program.cs
View File

@ -4,4 +4,5 @@ using Microsoft.Extensions.Hosting;
var builder = WebApplication.CreateBuilder(args);
var app = builder.Build();
app.MapGet("/", () => new { service = "recommend-service", status = "ok" });
app.MapGet("/health", () => new { status = "ok" });
app.Run("http://0.0.0.0:8003");

1
services/user-service/Program.cs
View File

@ -4,4 +4,5 @@ using Microsoft.Extensions.Hosting;
var builder = WebApplication.CreateBuilder(args);
var app = builder.Build();
app.MapGet("/", () => new { service = "user-service", status = "ok" });
app.MapGet("/health", () => new { status = "ok" });
app.Run("http://0.0.0.0:8004");