diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 5d355fb..4e67be4 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,3 +1,21 @@ +# ============================================================ +# Virtual Path MES - 后端服务开发/生产编排 +# 与 docker-compose.yml(基础设施)叠加使用: +# docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build +# 生产再加 -f docker-compose.prod.yml +# ============================================================ + +x-common-env: &common-env + SPRING_PROFILES_ACTIVE: docker + MYSQL_HOST: mysql + MYSQL_PORT: 3306 + MYSQL_USERNAME: root + MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} + # 与 application.yml 的 ${REDIS_HOST:localhost} 对应(勿用 SPRING_REDIS_HOST) + REDIS_HOST: redis + REDIS_PORT: 6379 + JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} + services: influxdb: image: influxdb:2.7-alpine @@ -33,13 +51,7 @@ services: ports: - "8081:8081" environment: - SPRING_PROFILES_ACTIVE: docker - MYSQL_HOST: mysql - MYSQL_PORT: 3306 - MYSQL_USERNAME: root - MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} - SPRING_REDIS_HOST: redis - JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} + <<: *common-env depends_on: mysql: condition: service_healthy @@ -81,12 +93,7 @@ services: ports: - "8082:8082" environment: - MYSQL_HOST: mysql - MYSQL_PORT: 3306 - MYSQL_USERNAME: root - MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} - SPRING_REDIS_HOST: redis - JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} + <<: *common-env depends_on: mysql: condition: service_healthy @@ -104,13 +111,7 @@ services: ports: - "8083:8083" environment: - SPRING_PROFILES_ACTIVE: docker - MYSQL_HOST: mysql - MYSQL_PORT: 3306 - MYSQL_USERNAME: root - MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} - SPRING_REDIS_HOST: redis - JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} + <<: *common-env depends_on: mysql: condition: service_healthy @@ -128,20 +129,12 @@ services: ports: - "8084:8084" environment: - MYSQL_HOST: mysql - MYSQL_PORT: 3306 - MYSQL_USERNAME: root - MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} - SPRING_REDIS_HOST: redis - SPRING_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} + <<: *common-env depends_on: mysql: condition: service_healthy redis: condition: service_healthy - kafka: - condition: service_healthy networks: - mes-network @@ -154,20 +147,18 @@ services: ports: - "8085:8085" environment: - MYSQL_HOST: mysql - MYSQL_PORT: 3306 - MYSQL_USERNAME: root - MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123455} - SPRING_REDIS_HOST: redis - SPRING_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 + <<: *common-env + # 与 application.yml 的 ${KAFKA_BOOTSTRAP_SERVERS:localhost:9092} 对应 + KAFKA_BOOTSTRAP_SERVERS: kafka:9092 INFLUXDB_URL: http://influxdb:8086 INFLUXDB_TOKEN: ${INFLUXDB_TOKEN:-kUVlFGXR2YxkzRUzn9bW9dJazYkigOU6GyYlKLdGsF7ekBLLz9URVnOLMmFZViLy} - JWT_SECRET: ${JWT_SECRET:-MesDevOnlyJwtSecret-ChangeMe-InProd-2026} depends_on: mysql: condition: service_healthy redis: condition: service_healthy + kafka: + condition: service_healthy influxdb: condition: service_healthy networks: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 77d30c8..6bba079 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -26,6 +26,12 @@ services: REDIS_PORT: 6379 JWT_SECRET: ${JWT_SECRET:-} ZHIPU_API_KEY: ${ZHIPU_API_KEY:-} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8087/api/v1/health', timeout=3)"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 40s depends_on: mysql: condition: service_healthy @@ -41,7 +47,8 @@ services: dockerfile: Dockerfile args: VITE_API_BASE_URL: /api - VITE_AI_SERVICE_URL: /api/ai + # 相对 /ai(与 baseURL /api 拼接为 /api/ai/**;写 /api/ai 会双重前缀) + VITE_AI_SERVICE_URL: /ai container_name: mes-frontend restart: always ports: diff --git a/docker-compose.yml b/docker-compose.yml index b121e86..f30e4cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,8 +79,10 @@ services: environment: KAFKA_NODE_ID: 1 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_internal:PLAINTEXT - KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092,PLAINTEXT_internal://localhost:9093 - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092,PLAINTEXT_internal://localhost:9093 + KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092,PLAINTEXT_internal://0.0.0.0:9093 + # advertised 用容器服务名 kafka,容器内客户端才能正确连接 + # (之前用 localhost 导致 dashboard 连不上 broker) + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_internal://kafka:9093 KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 diff --git a/docs/DEPLOYMENT.md b/docs/DEPLOYMENT.md index fccc41c..d8ba83c 100644 --- a/docs/DEPLOYMENT.md +++ b/docs/DEPLOYMENT.md @@ -116,37 +116,53 @@ docker compose up -d depends_on: mysql: condition: service_healthy + redis: + condition: service_healthy networks: - mes-network - # 注意:AI 服务的 kafka bootstrap 在 config.yaml 硬编码为 localhost:9092, - # 若启用 Kafka 预测链路,需改为 kafka:9092(见 §5.1 注) mes-frontend: build: context: ./mes-frontend dockerfile: Dockerfile + args: + VITE_API_BASE_URL: /api + VITE_AI_SERVICE_URL: /api/ai container_name: mes-frontend restart: always ports: - "3000:3000" - environment: - VITE_API_BASE_URL: /api - VITE_AI_SERVICE_URL: /api/ai depends_on: - mes-gateway networks: - mes-network ``` -**注 1(AI 服务 Kafka)**:`mes-ai-service/config.yaml` 里 `kafka.bootstrap_servers: "localhost:9092"` 与 `redis.host: "localhost"` 为硬编码。数据库/Redis 连接已支持环境变量覆盖(`MYSQL_HOST`/`REDIS_HOST`,见 `conversation_store.py`/`redis_store.py`),但 **Kafka 未做环境变量覆盖**。若 AI 服务需要消费 Kafka 设备数据,需改 `config.yaml` 为 `${KAFKA_BOOTSTRAP_SERVERS}` 或直接改为 `kafka:9092`(compose 服务名)。不需要 Kafka 预测链路时忽略即可。 +**注 1(AI 服务连接)**:`mes-ai-service` 的数据库/Redis 连接已支持环境变量覆盖(`MYSQL_HOST`/`MYSQL_USERNAME`/`MYSQL_PASSWORD`/`MYSQL_DATABASE`/`REDIS_HOST`/`REDIS_PORT`,见 `conversation_store.py`/`redis_store.py`),compose 已注入。AI 服务不消费 Kafka(config.yaml 中 kafka 配置未在代码使用),无需 Kafka 环境变量。 **注 2(前端构建变量)**:Vite 的 `VITE_*` 变量在**构建时**注入,Dockerfile 里 `RUN npm run build` 读不到 compose 的 `environment`。正确做法: - 在 `mes-frontend/.env.production` 写入 `VITE_API_BASE_URL=/api`、`VITE_AI_SERVICE_URL=/api/ai`(随镜像打包),或 -- 在 compose `build.args` 传入 ARG 并在 Dockerfile 中 export +- 在 compose `build.args` 传入 ARG 并在 Dockerfile 中 export(当前 Dockerfile 已支持) + +**注 3(CORS)**:`mes-gateway/application-docker.yml` 的 `CORS_ALLOWED_ORIGINS` 已预设 localhost + `https://*.reality-blog.asia` + `https://virtual-path-mes.reality-blog.asia`。生产通过网关统一代理同源,前端请求一般不发跨域;若用独立域名直连网关,设置环境变量 `CORS_ALLOWED_ORIGINS: https://your.domain,https://*.your-domain.com`(逗号分隔多域,支持通配)。 + +### 5.2 AI 服务依赖(已按代码精简,CPU-only) + +AI 服务依赖已按 `src/` 实际 import 精简,**不含 torch/CUDA**(原 requirements 中的 chromadb/sentence-transformers/skl2onnx 从未被代码使用,已移除): + +- 运行时:`requirements.txt`(fastapi/uvicorn/numpy/pandas/scikit-learn/lightgbm/xgboost/onnxruntime/redis/pymysql/httpx/zhipuai 等,镜像仅 ~几百 MB) +- 知识库为 TF-IDF(numpy/scikit-learn),模型推理为 LightGBM/XGBoost/ONNX Runtime(CPU) +- 训练并导出 ONNX 为可选项(`train_models.py` 内 try/except 包裹,缺失时自动 fallback 保存 pkl):`pip install onnxmltools onnx` + +```bash +docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml build mes-ai-service +``` -**注 3(CORS)**:`mes-gateway/application-docker.yml` 的 `CORS_ALLOWED_ORIGINS` 默认仅 `localhost:3000,localhost:5173`。生产通过网关统一代理同源,前端请求不发跨域,一般无需改;若用独立域名直连网关,设置 `CORS_ALLOWED_ORIGINS: https://your.domain`。 +- 宿主机构建失败时,可改用宿主机直接运行:创建 `.venv` 后 `pip install -r requirements.txt`,再 `python -m src.main`(8087) +- 容器自带健康检查(`/api/v1/health`,无需鉴权);数据表启动时自动创建(`CREATE TABLE IF NOT EXISTS`),无需手工导 SQL +- MySQL/Redis 不可用时自动降级(对话历史缓存不可用,LLM/预测/分析不受影响);端口可用 `AI_PORT` 环境变量覆盖 -### 5.2 动态设备展示数据源【关键】 +### 5.3 动态设备展示数据源【关键】 本地链路依赖 **WPF 桌面模拟器**(`mes-device-simulator-wpf`,仅 Windows)。Linux 服务器需要 headless 模拟器。两个方案: @@ -159,7 +175,7 @@ docker compose up -d > 建议先走**方案 A**:写一个 Python 脚本模拟 10~20 台设备,直接调 dashboard HTTP 接口,最快看到 3D 孪生动起来。 -### 5.3 数据库初始化 +### 5.4 数据库初始化 首次部署需导入 SQL(`sql/init.sql` + 各 `V*.sql` 迁移,或从现有 MySQL 导出)。MySQL 容器启动后: @@ -226,8 +242,91 @@ docker compose down -v # 停止并清数据卷(慎用 ## 9. 待办(需代码改动,确认后实施) 1. ✅ **新增 `docker-compose.prod.yml`**:加入 mes-frontend + mes-ai-service(含 build ARG 与 WS 配置)——**已完成** -2. **新增 `scripts/device-simulator.py`**:headless 设备模拟器(方案 A,调 dashboard HTTP 接口)——**待实施** -3. **(可选)** AI 服务 `config.yaml` 的 Kafka/Redis 改为环境变量支持(当前 AI 未用 Kafka,Redis/MySQL 已支持 env 覆盖,暂无需改) -4. **(可选)** 为 .NET 网关补 Dockerfile(方案 B 才需要) +2. ✅ **AI 服务依赖精简**:移除从未使用的 chromadb/sentence-transformers/skl2onnx,单一 `requirements.txt`(无 torch/CUDA)——**已完成** +3. ✅ **统一环境变量**:compose `x-common-env` 锚点、6 个 Dockerfile 默认 `SPRING_PROFILES_ACTIVE=docker`、Redis/Kafka 变量名与代码一致——**已完成** +4. ✅ **CORS 多域/通配**:预设 `https://*.reality-blog.asia` + 隧道域名——**已完成** +5. ✅ **数据库迁移**:`sql/V14__add_device_type.sql`(幂等补 `device_type` 列)——**已完成** +6. ✅ **API 健壮性**:批量创建返回 created/skipped/errors 明细;SQL 语法异常友好提示——**已完成** +7. **新增 `scripts/device-simulator.py`**:headless 设备模拟器(方案 A,调 dashboard HTTP 接口)——**待实施** +8. **(可选)** 为 .NET 网关补 Dockerfile(方案 B 才需要) + +> 当前项目**可直接部署**;headless 设备模拟器(#7)是启用"动态设备展示"的关键,需要时请告知。 + +--- + +## 10. Nginx 与 Cloudflare Tunnel 说明 + +### 10.1 架构(前端容器 nginx 是唯一入口) + +``` +浏览器 ──https──▶ Cloudflare ──http(Tunnel)──▶ mes-frontend(nginx:3000) + ├── 静态资源 (dist) + ├── /api/** ──▶ mes-gateway:9090 + │ └─ 各微服务 / AI + └── /health (健康检查) +``` + +- **服务器不需要额外装 nginx**:`mes-frontend` 容器内置 `nginx:alpine`(配置见 `mes-frontend/nginx.conf`),已含: + - Vue history 路由 fallback(`try_files ... /index.html`) + - 静态资源 30 天缓存 + gzip + - `/api/` 反代到网关(含 WebSocket 升级,路径 `/api/ws/dashboard`) + - Cloudflare Flexible SSL 的 `X-Forwarded-Proto` 透传(后端据此判断协议) + - `client_max_body_size 20m`、`/health` 探活 + +**API 路径拼接规范**(防止双重 `/api` 前缀): + +``` +前端 axios baseURL: VITE_API_BASE_URL=/api (全局唯一前缀来源) +AI 模块: VITE_AI_SERVICE_URL=/ai (相对路径,禁止写 /api/ai) +→ 实际请求: /api/ai/api/v1/** → 网关 Path=/api/ai/** + StripPrefix=2 → AI 服务 /api/v1/** +``` + +### 10.2 宿主机上已装的 nginx 处理 + +服务器若已装宿主机 nginx(占用 80),二选一: + +**方案 A(推荐,最简单):直接停用** —— Tunnel 直连 3000,宿主机 nginx 不需要: + +```bash +sudo systemctl stop nginx && sudo systemctl disable nginx +``` + +**方案 B:只做 80 → 3000 转发**(如需直连 80 端口访问): + +```nginx +# /etc/nginx/conf.d/mes.conf +server { + listen 80 default_server; + server_name _; + location / { + proxy_pass http://127.0.0.1:3000; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + # WebSocket + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_read_timeout 3600s; + } +} +sudo nginx -t && sudo systemctl reload nginx +``` + +### 10.3 Cloudflare 设置 + +- `cloudflared` 隧道指向服务器 **`localhost:3000`**(容器 nginx,非 80) +- **SSL/TLS 模式必须设为 Flexible**(CF 代理 HTTPS → 源站 HTTP),否则源站需要证书 +- 前端与网关同源(`/api` 代理),CORS 默认已放行该域名,无需额外配置;换域名时更新 `CORS_ALLOWED_ORIGINS` + +### 10.4 常见问题排查 -> 当前项目**可直接部署**;headless 设备模拟器(#2)是启用"动态设备展示"的关键,需要时请告知。 \ No newline at end of file +| 症状 | 原因 | 处理 | +|------|------|------| +| 页面 404(刷新子路由) | 容器 nginx 未生效 history fallback | 确认用 `mes-frontend/nginx.conf`(Dockerfile 已 COPY) | +| WS 实时数据断连/不刷新 | Upgrade 头未透传 | 确认 nginx.conf 有 `map $http_upgrade` 段(已内置) | +| 上传/导入报 413 | body 超限 | 已内置 `client_max_body_size 20m`,按需调大 | +| 502 Bad Gateway | 网关容器未就绪/挂了 | `docker compose logs -f mes-gateway`;确认网关已健康 | +| 登录后无限重定向/安全头报 http | Flexible SSL 下协议被覆盖为 http | 已内置 `X-Forwarded-Proto` 透传;检查是否用旧版 nginx.conf | +| 全站 521/522 | Tunnel 指错端口或容器没起 | `cloudflared` 指向 3000;`curl http://localhost:3000/health` | \ No newline at end of file diff --git a/mes-ai-service/.dockerignore b/mes-ai-service/.dockerignore new file mode 100644 index 0000000..0fb0d3d --- /dev/null +++ b/mes-ai-service/.dockerignore @@ -0,0 +1,6 @@ +.venv/ +__pycache__/ +*.pyc +.idea/ +.git/ +tests/ diff --git a/mes-ai-service/Dockerfile b/mes-ai-service/Dockerfile index 2604ccb..7409022 100644 --- a/mes-ai-service/Dockerfile +++ b/mes-ai-service/Dockerfile @@ -1,9 +1,25 @@ -FROM python:3.11-slim +# Virtual Path MES - AI 服务镜像(CPU-only,无 torch/CUDA) +# 构建:docker build -t mes-ai-service . +# Python 版本与本地开发环境一致(README 技术栈为 3.12) +FROM python:3.12-slim + +# pip 镜像源(国内服务器默认清华源,海外可用 --build-arg PIP_INDEX=https://pypi.org/simple 覆盖) +ARG PIP_INDEX=https://pypi.tuna.tsinghua.edu.cn/simple + WORKDIR /app + COPY requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir --upgrade pip -i ${PIP_INDEX} && \ + pip install --no-cache-dir -r requirements.txt -i ${PIP_INDEX} + COPY src/ ./src/ +COPY knowledge/ ./knowledge/ COPY config.yaml ./config.yaml -RUN mkdir -p models tests + EXPOSE 8087 + +# slim 镜像无 curl,用标准库 urllib 做健康检查(/api/v1/health 无需鉴权) +HEALTHCHECK --interval=30s --timeout=5s --retries=3 --start-period=30s \ + CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8087/api/v1/health', timeout=3)" || exit 1 + CMD ["python", "-m", "src.main"] diff --git a/mes-ai-service/README.md b/mes-ai-service/README.md index a4fdb26..5da9a5e 100644 --- a/mes-ai-service/README.md +++ b/mes-ai-service/README.md @@ -17,8 +17,8 @@ - **AI Agent**: 智能生产助理 — 六大能力完备的自主智能体: - **任务理解**: 规则+实体抽取的意图识别(设备监控/健康总览/告警诊断/工单/知识/分析/库存),自动提取设备编码等关键实体 - **流程编排**: 四阶段流水线(任务理解 → 计划执行 → 知识增强 → 结果交付),执行计划注入 + 工具去重防重复调用 - - **工具调用**: 15 个 MES 工具(数字孪生/告警/趋势/工单/物料/知识库),统一执行器含超时保护、错误规范化、失败自动知识库兜底 - - **知识增强**: TF-IDF 中文检索(双字词加权+标题重排),内置 6 篇手册/标准 + `knowledge/` 目录自定义文档扩展 + - **工具调用**: 19 个 MES 工具(设备/工单/工艺/质量/物料/知识库/数字孪生/趋势),统一执行器含超时保护、错误规范化、失败自动知识库兜底 + - **知识增强**: TF-IDF 中文检索(双字词加权+标题重排),内置 `knowledge/device_cnc_manual.json` 手册文档 + `knowledge/` 目录自定义文档扩展 - **多轮交互**: 会话焦点记忆(Redis 30 分钟),"那台设备"等指代自动继承上轮设备编码 - **结果交付**: 结构化报告(summary/关键结论/数据表格/处置建议/后续追问),LLM 生成失败自动规则兜底 - **对话历史**: MySQL 持久化存储,多轮对话记录管理 @@ -46,25 +46,40 @@ ZHIPU_API_KEY=your-api-key-here JWT_SECRET=your-jwt-secret-at-least-32-chars-long-change-me ``` -> **鉴权说明**:除 `/api/v1/health` 外,所有接口必须携带 `Authorization: Bearer `(与 Java 后端共享 `JWT_SECRET`,HS256 校验,实现见 `src/security.py`,无第三方依赖)。Agent 工具调用后端 API 时自动透传用户 token。 +> **鉴权说明**:除 `/api/v1/health` 与 `/api/v1/model/status` 外,所有接口必须携带 `Authorization: Bearer `(与 Java 后端共享 `JWT_SECRET`,HS256 校验,实现见 `src/security.py`,无第三方依赖)。Agent 工具调用后端 API 时自动透传用户 token。 ### Docker部署 + +**方式一(推荐):compose 编排**(根目录,与 Java 服务一起启动): + +```bash +# 环境变量:JWT_SECRET、ZHIPU_API_KEY 必填;MYSQL_*、REDIS_* 按需覆盖 +docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml up -d --build +``` + +**方式二:单独构建**(需自行注入环境变量,否则连接不上 MySQL/Redis): + ```bash docker build -t mes-ai-service . -docker run -p 8087:8087 mes-ai-service +docker run -p 8087:8087 \ + -e MYSQL_HOST=mysql -e MYSQL_USERNAME=root -e MYSQL_PASSWORD=123455 \ + -e REDIS_HOST=redis \ + -e JWT_SECRET=your-jwt-secret -e ZHIPU_API_KEY=your-api-key \ + mes-ai-service ``` +> 说明:镜像默认国内 pip 源(清华),海外构建可用 `--build-arg PIP_INDEX=https://pypi.org/simple`。容器内建表自动完成(`CREATE TABLE IF NOT EXISTS`),无需手工导入 SQL。 + ### 本地开发 ```bash cd mes-ai-service -pip install -r requirements.txt -# 方式一:使用虚拟环境 -.venv\Scripts\activate.bat -python -m src.main +# 建议使用虚拟环境(Python 3.12;国内可加 -i https://pypi.tuna.tsinghua.edu.cn/simple 加速) +py -3.12 -m venv .venv +.venv\Scripts\pip install -r requirements.txt -# 方式二:直接运行 -python -m src.main +# 运行(自动加载项目根目录 .env 中的 JWT_SECRET / ZHIPU_API_KEY 等) +.venv\Scripts\python -m src.main ``` ## API接口 @@ -180,24 +195,24 @@ curl -X POST http://localhost:8087/api/v1/llm/analyze \ ## 配置说明 -配置文件 `config.yaml` 包含服务端口、模型路径、Kafka和Redis连接等信息。 +配置文件 `config.yaml` 提供模型路径、MySQL/Redis 连接、大模型参数等默认值;`server.port/host` 可用环境变量 `AI_PORT`/`AI_HOST` 覆盖,数据库连接可用 `MYSQL_HOST`/`MYSQL_PORT`/`MYSQL_USERNAME`/`MYSQL_PASSWORD`/`MYSQL_DATABASE` 覆盖。 ```yaml server: - host: "0.0.0.0" + host: "0.0.0.0" # 可用环境变量 AI_HOST / AI_PORT 覆盖 port: 8087 model: quality: - onnx_path: "src/models/saved_models/quality_predict.onnx" + onnx_path: "src/models/saved_models/quality_predict.onnx" # onnx 缺失时自动回退 .pkl version: "1.0.0" production: onnx_path: "src/models/saved_models/output_predict.onnx" version: "1.0.0" -# 大模型配置(敏感信息通过环境变量 ZHIPU_API_KEY 设置) +# 大模型配置(密钥只读环境变量 ZHIPU_API_KEY,此文件占位不生效) llm: - api_key: "${ZHIPU_API_KEY}" + api_key: "" model: "glm-4-flash" rate_limit: 60 # LLM调用限流(次/分钟),超限返回"服务繁忙" @@ -209,9 +224,13 @@ database: database: "mes_db" redis: - host: "localhost" + host: "localhost" # 可用 REDIS_HOST / REDIS_PORT 覆盖 port: 6379 db: 1 + +feature: + sliding_window_size: 60 + aggregation_interval: 10 ``` **Redis 缓存说明**(Redis 不可用时全部自动降级,不影响业务): @@ -227,39 +246,42 @@ redis: ``` mes-ai-service/ ├── src/ -│ ├── main.py # 启动入口 +│ ├── main.py # 启动入口(端口读 config.yaml server 段,可用 AI_PORT/AI_HOST 覆盖) │ ├── app.py # FastAPI应用 │ ├── security.py # JWT 鉴权(HS256,标准库实现,与后端共用 JWT_SECRET) -│ ├── models/ # 模型定义 -│ │ ├── prediction_model.py # 质量预测模型 -│ │ ├── regression_model.py # 产量预测模型 -│ │ └── train.py # 训练脚本 +│ ├── models/ # 模型加载与推理 +│ │ ├── prediction_model.py # 质量预测模型(onnx 缺失自动回退 pkl) +│ │ ├── regression_model.py # 产量预测模型 +│ │ └── saved_models/ # 模型文件(.pkl 入库,.onnx gitignore) │ ├── services/ # 业务逻辑 │ │ ├── quality_predictor.py # 质量预测服务 -│ │ ├── inference_service.py # 推理服务 -│ │ ├── llm_service.py # 智谱AI大模型服务(含缓存+限流) -│ │ ├── analysis_service.py # AI分析服务(能耗/SPC/产能/根因/交期) -│ │ ├── conversation_store.py # 对话+分析历史 MySQL 存储(含Redis缓存) -│ │ ├── redis_store.py # Redis统一封装(降级安全) -│ │ ├── task_planner.py # Agent任务理解(意图/实体/计划) -│ │ ├── agent_service.py # Agent编排(四阶段流水线) -│ │ ├── report_builder.py # Agent结果交付(结构化报告) -│ │ ├── tools.py # Agent工具层(15个MES工具+统一执行器) -│ │ ├── knowledge_base.py # RAG知识库(TF-IDF检索) +│ │ ├── inference_service.py # 推理服务 +│ │ ├── llm_service.py # 智谱AI大模型服务(含缓存+限流) +│ │ ├── analysis_service.py # AI分析服务(能耗/SPC/产能/根因/交期) +│ │ ├── conversation_store.py # 对话+分析历史 MySQL 存储(含Redis缓存,MySQL 不可用自动降级) +│ │ ├── redis_store.py # Redis统一封装(降级安全) +│ │ ├── task_planner.py # Agent任务理解(意图/实体/计划) +│ │ ├── agent_service.py # Agent编排(四阶段流水线) +│ │ ├── report_builder.py # Agent结果交付(结构化报告) +│ │ ├── tools.py # Agent工具层(19个MES工具+统一执行器) +│ │ ├── knowledge_base.py # RAG知识库(TF-IDF检索) │ │ └── feature_engineering.py # 特征工程 │ ├── router/ # 路由 │ │ ├── prediction.py # 预测路由 -│ │ ├── llm.py # 大模型路由 -│ │ ├── analysis.py # 分析路由 -│ │ └── agent.py # Agent 路由(含对话历史CRUD) +│ │ ├── llm.py # 大模型路由 +│ │ ├── analysis.py # 分析路由 +│ │ └── agent.py # Agent 路由(含对话历史CRUD) │ ├── schemas/ -│ │ ├── schemas.py # 核心数据模型 +│ │ ├── schemas.py # 核心数据模型 │ │ └── conversation.py # 对话历史模型 -├── models/ # 训练模型输出 -├── config.yaml # 配置文件 -├── .env.local # 本地敏感配置(不提交) -├── requirements.txt # Python依赖 -└── Dockerfile # Docker镜像 +├── knowledge/ # RAG 知识库文档(.json,可自行扩展) +├── tests/ # 单元测试 +├── train_models.py # 训练脚本(训练 LightGBM/XGBoost 并可选导出 ONNX) +├── config.yaml # 配置文件 +├── .env.local # 本地敏感配置(不提交) +├── requirements.txt # Python依赖(运行时,无 torch/CUDA) +├── .dockerignore # 构建上下文排除(.venv/__pycache__ 等) +└── Dockerfile # Docker镜像 ``` ## 技术栈 diff --git a/mes-ai-service/config.yaml b/mes-ai-service/config.yaml index c986ff0..e50fc16 100644 --- a/mes-ai-service/config.yaml +++ b/mes-ai-service/config.yaml @@ -18,16 +18,11 @@ model: version: "1.0.0" llm: - api_key: "${ZHIPU_API_KEY}" + # 密钥只从环境变量 ZHIPU_API_KEY 读取(此文件中的占位不会生效) + api_key: "" model: "glm-4-flash" rate_limit: 60 -kafka: - bootstrap_servers: "localhost:9092" - group_id: "ai-service-group" - topics: - - "mes-device-data" - redis: host: "localhost" port: 6379 diff --git a/mes-ai-service/requirements.txt b/mes-ai-service/requirements.txt index 6406ec9..cc05ef5 100644 --- a/mes-ai-service/requirements.txt +++ b/mes-ai-service/requirements.txt @@ -1,3 +1,7 @@ +# Virtual Path MES - AI 服务运行时依赖 +# 仅含 src/ 实际 import 的包,无 torch/CUDA: +# RAG 知识库 = TF-IDF(numpy/scikit-learn) +# 模型推理 = LightGBM / XGBoost / ONNX Runtime(CPU) fastapi==0.115.6 uvicorn[standard]==0.34.0 lightgbm==4.5.0 @@ -9,12 +13,14 @@ pandas==2.2.3 pyyaml==6.0.2 redis==5.2.1 httpx==0.28.1 -pytest==8.3.4 -joblib==1.4.2 -skl2onnx==1.17.0 -onnx==1.17.0 -protobuf>=3.20,<5 zhipuai>=2.1.5 -chromadb>=0.5.0 -sentence-transformers>=2.7.0 pymysql>=1.1.0 + +# onnxruntime 兼容性约束(protobuf 5.x 不兼容) +protobuf>=3.20,<5 + +# 单元测试 +pytest==8.3.4 + +# 训练并导出 ONNX 时额外安装(train_models.py 为可选导入,缺失时自动 fallback 保存 pkl): +# pip install onnxmltools onnx diff --git a/mes-ai-service/src/main.py b/mes-ai-service/src/main.py index b6e1574..20b4eb3 100644 --- a/mes-ai-service/src/main.py +++ b/mes-ai-service/src/main.py @@ -8,9 +8,21 @@ load_project_env() import uvicorn # noqa: E402 +import yaml # noqa: E402 from src.app import create_app # noqa: E402 app = create_app() if __name__ == "__main__": - uvicorn.run(app, host="0.0.0.0", port=8087) + # 端口/监听地址:环境变量 AI_PORT/AI_HOST 优先,其次 config.yaml 的 server 段 + _config = {} + try: + _config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "config.yaml") + with open(_config_path, "r", encoding="utf-8") as f: + _config = yaml.safe_load(f) or {} + except OSError: + pass + _server = _config.get("server", {}) or {} + host = os.environ.get("AI_HOST", _server.get("host", "0.0.0.0")) + port = int(os.environ.get("AI_PORT", _server.get("port", 8087))) + uvicorn.run(app, host=host, port=port) diff --git a/mes-ai-service/src/services/conversation_store.py b/mes-ai-service/src/services/conversation_store.py index 84b130b..5db12ed 100644 --- a/mes-ai-service/src/services/conversation_store.py +++ b/mes-ai-service/src/services/conversation_store.py @@ -42,48 +42,60 @@ def _get_conn() -> pymysql.Connection: def init_db(): - """建表(兜底 — 正式环境用 init.sql)""" + """建表(兜底 — 正式环境用 init.sql)。MySQL 不可用时降级:只告警不阻断启动, + 对话历史相关接口会返回错误,其余功能(LLM/预测/分析)不受影响。""" + try: + _create_tables() + except Exception as e: + logger.warning("MySQL 初始化失败,对话历史功能降级: %s", e) + + +def _create_tables(): conn = _get_conn() - conn.cursor().execute(""" - CREATE TABLE IF NOT EXISTS `ai_chat_conversations` ( - `id` varchar(36) NOT NULL, - `user_id` varchar(50) NOT NULL DEFAULT 'default', - `title` varchar(200) NOT NULL DEFAULT '新对话', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP, - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` int DEFAULT '0', - PRIMARY KEY (`id`), - KEY `idx_user_id` (`user_id`), - KEY `idx_update_time` (`update_time`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 - """) - conn.cursor().execute(""" - CREATE TABLE IF NOT EXISTS `ai_chat_messages` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `conversation_id` varchar(36) NOT NULL, - `role` varchar(20) NOT NULL, - `content` text NOT NULL, - `steps` json DEFAULT NULL, - `create_time` datetime DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `idx_conversation_id` (`conversation_id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 - """) - conn.cursor().execute(""" - CREATE TABLE IF NOT EXISTS `ai_analysis_history` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `user_id` varchar(50) NOT NULL DEFAULT 'default', - `device_code` varchar(50) DEFAULT NULL, - `device_name` varchar(100) DEFAULT NULL, - `analysis_type` varchar(20) NOT NULL, - `result_data` json DEFAULT NULL, - `create_time` datetime DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - KEY `idx_user_id` (`user_id`), - KEY `idx_type` (`analysis_type`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 - """) - conn.close() + try: + cur = conn.cursor() + cur.execute(""" + CREATE TABLE IF NOT EXISTS `ai_chat_conversations` ( + `id` varchar(36) NOT NULL, + `user_id` varchar(50) NOT NULL DEFAULT 'default', + `title` varchar(200) NOT NULL DEFAULT '新对话', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP, + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `deleted` int DEFAULT '0', + PRIMARY KEY (`id`), + KEY `idx_user_id` (`user_id`), + KEY `idx_update_time` (`update_time`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 + """) + cur.execute(""" + CREATE TABLE IF NOT EXISTS `ai_chat_messages` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `conversation_id` varchar(36) NOT NULL, + `role` varchar(20) NOT NULL, + `content` text NOT NULL, + `steps` json DEFAULT NULL, + `create_time` datetime DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_conversation_id` (`conversation_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 + """) + cur.execute(""" + CREATE TABLE IF NOT EXISTS `ai_analysis_history` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `user_id` varchar(50) NOT NULL DEFAULT 'default', + `device_code` varchar(50) DEFAULT NULL, + `device_name` varchar(100) DEFAULT NULL, + `analysis_type` varchar(20) NOT NULL, + `result_data` json DEFAULT NULL, + `create_time` datetime DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_user_id` (`user_id`), + KEY `idx_type` (`analysis_type`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 + """) + conn.commit() + finally: + conn.close() async def _run_sync(func, *args, **kwargs): diff --git a/mes-auth/.dockerignore b/mes-auth/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-auth/.dockerignore +++ b/mes-auth/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-auth/Dockerfile b/mes-auth/Dockerfile index 691d86f..e264780 100644 --- a/mes-auth/Dockerfile +++ b/mes-auth/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/mes-common/src/main/java/com/mes/common/exception/GlobalExceptionHandler.java b/mes-common/src/main/java/com/mes/common/exception/GlobalExceptionHandler.java index cac9db0..5371691 100644 --- a/mes-common/src/main/java/com/mes/common/exception/GlobalExceptionHandler.java +++ b/mes-common/src/main/java/com/mes/common/exception/GlobalExceptionHandler.java @@ -173,6 +173,23 @@ public Result handleDataIntegrity(DataIntegrityViolationException e) { return Result.fail(400, message); } + /** + * 处理 SQL 语法/表结构错误(如实体字段与表列不一致导致的 Unknown column) + */ + @ExceptionHandler(org.springframework.jdbc.BadSqlGrammarException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public Result handleBadSqlGrammar(org.springframework.jdbc.BadSqlGrammarException e) { + String sqlMessage = e.getMostSpecificCause() != null ? e.getMostSpecificCause().getMessage() : e.getMessage(); + String message = "数据库查询失败,可能存在字段/表结构不一致"; + if (sqlMessage != null && sqlMessage.contains("Unknown column")) { + message = "数据库字段与实体不一致: " + sqlMessage.substring(0, Math.min(sqlMessage.length(), 100)); + } else if (sqlMessage != null) { + message = "数据库查询失败: " + sqlMessage.substring(0, Math.min(sqlMessage.length(), 100)); + } + log.error("SQL 语法异常: {}", message, e); + return Result.fail(400, message); + } + /** * 处理404异常 */ diff --git a/mes-dashboard/.dockerignore b/mes-dashboard/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-dashboard/.dockerignore +++ b/mes-dashboard/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-dashboard/Dockerfile b/mes-dashboard/Dockerfile index 3875226..0f18a6f 100644 --- a/mes-dashboard/Dockerfile +++ b/mes-dashboard/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/mes-dashboard/src/main/java/com/mes/dashboard/controller/DashboardController.java b/mes-dashboard/src/main/java/com/mes/dashboard/controller/DashboardController.java index 7aa96d5..55ad919 100644 --- a/mes-dashboard/src/main/java/com/mes/dashboard/controller/DashboardController.java +++ b/mes-dashboard/src/main/java/com/mes/dashboard/controller/DashboardController.java @@ -44,20 +44,30 @@ public Result createDevice(@RequestBody DeviceStatus device) { @Operation(summary = "批量创建设备") @PostMapping("/device/batch") @RequirePermission("device:control") - public Result createDevicesBatch(@RequestBody List devices) { + public Result> createDevicesBatch(@RequestBody List devices) { int created = 0; + int skipped = 0; + List errors = new java.util.ArrayList<>(); if (devices != null) { for (DeviceStatus device : devices) { try { dashboardService.createDevice(device); created++; } catch (Exception e) { - // 跳过已存在/异常设备,继续批量创建 - log.warn("Batch create skipped device {}: {}", device.getDeviceCode(), e.getMessage()); + skipped++; + String reason = e.getMessage() == null ? e.getClass().getSimpleName() : e.getMessage(); + // 截断过长 SQL 详情,避免接口暴露完整 SQL + if (reason.length() > 120) reason = reason.substring(0, 120) + "..."; + errors.add((device.getDeviceCode() != null ? device.getDeviceCode() : "?") + ": " + reason); + log.warn("Batch create skipped device {}: {}", device.getDeviceCode(), reason); } } } - return Result.ok(created); + Map result = new java.util.HashMap<>(); + result.put("created", created); + result.put("skipped", skipped); + result.put("errors", errors); + return Result.ok(result); } @Operation(summary = "删除设备") diff --git a/mes-frontend/.env.production b/mes-frontend/.env.production index 969df5e..f9fd1e4 100644 --- a/mes-frontend/.env.production +++ b/mes-frontend/.env.production @@ -1,8 +1,10 @@ # 生产环境 API 基础路径(走网关 /api/**,需在 Nginx/网关层将 /api 转发到 mes-gateway:9090) VITE_API_BASE_URL=/api -# AI 服务地址:与网关路由 /api/ai/** 对应(StripPrefix=2 后转发到 AI 服务) -VITE_AI_SERVICE_URL=/api/ai +# AI 服务地址:相对路径 /ai,与 axios baseURL(/api) 拼接后为 /api/ai/**, +# 经网关 StripPrefix=2 转发到 AI 服务 /api/v1/**。 +# 禁止写 /api/ai:会与 baseURL 双重拼接成 /api/api/ai/** 导致 404/挂起 +VITE_AI_SERVICE_URL=/ai # WebSocket 地址(可选):默认自动推导为同源 /api/ws/dashboard(网关 WebSocket 路由) # 若 Nginx 未代理 WS,可显式配置,例如:VITE_WS_URL=wss://mes.example.com/api/ws/dashboard diff --git a/mes-frontend/Dockerfile b/mes-frontend/Dockerfile index 4b423ad..66ca5bf 100644 --- a/mes-frontend/Dockerfile +++ b/mes-frontend/Dockerfile @@ -3,6 +3,8 @@ FROM node:18-alpine AS builder # 构建期 Vite 环境变量(docker compose build.args 传入,缺省用 .env.production) ARG VITE_API_BASE_URL ARG VITE_AI_SERVICE_URL +# npm 镜像源(国内服务器默认 npmmirror,海外可用 --build-arg NPM_REGISTRY=https://registry.npmjs.org 覆盖) +ARG NPM_REGISTRY=https://registry.npmmirror.com ENV VITE_API_BASE_URL=${VITE_API_BASE_URL} ENV VITE_AI_SERVICE_URL=${VITE_AI_SERVICE_URL} @@ -11,8 +13,8 @@ WORKDIR /app # Copy package files COPY package*.json ./ -# Install dependencies -RUN npm install +# Install dependencies(npm ci 按 lock 精确安装,--no-audit --no-fund 跳过审计/赞助请求) +RUN npm config set registry ${NPM_REGISTRY} && npm ci --no-audit --no-fund # Copy source code COPY . ./ diff --git a/mes-frontend/nginx.conf b/mes-frontend/nginx.conf index b13aa85..faff98c 100644 --- a/mes-frontend/nginx.conf +++ b/mes-frontend/nginx.conf @@ -1,43 +1,64 @@ +# Virtual Path MES 前端 nginx(容器内,监听 3000) +# 架构:浏览器 → Cloudflare Tunnel (Flexible SSL) → 本容器 :3000 → /api 代理 → mes-gateway:9090 + +# Cloudflare Flexible SSL:浏览器→CF 为 https,CF→源站为 http 且带 X-Forwarded-Proto: https。 +# 透传该头给网关,避免后端把请求误判为 http(影响重定向与安全头)。 +map $http_x_forwarded_proto $forwarded_proto { + default $scheme; + "https" https; +} + +# WebSocket:仅当客户端真的带 Upgrade 头时才升级,普通 HTTP 请求保持 close +map $http_upgrade $connection_upgrade { + default upgrade; + "" close; +} + server { listen 3000; - server_name localhost; - + server_name _; + root /usr/share/nginx/html; index index.html; - + + server_tokens off; + client_max_body_size 20m; + # Gzip compression gzip on; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml; + gzip_vary on; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml image/svg+xml; gzip_min_length 1000; - + # History router fallback location / { try_files $uri $uri/ /index.html; } - + # Static files caching location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ { expires 30d; add_header Cache-Control "public, immutable"; } - - # Proxy API to backend + + # Proxy API to backend (Spring Cloud Gateway) location /api/ { proxy_pass http://mes-gateway:9090/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Proto $forwarded_proto; # WebSocket 升级(前端 3D 孪生实时数据 /api/ws/dashboard) proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + proxy_set_header Connection $connection_upgrade; proxy_read_timeout 3600s; + proxy_send_timeout 3600s; } - + # Health check endpoint location /health { access_log off; return 200 "OK"; } -} \ No newline at end of file +} diff --git a/mes-gateway/.dockerignore b/mes-gateway/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-gateway/.dockerignore +++ b/mes-gateway/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-gateway/Dockerfile b/mes-gateway/Dockerfile index f88e767..89d9da6 100644 --- a/mes-gateway/Dockerfile +++ b/mes-gateway/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/mes-gateway/src/main/resources/application-docker.yml b/mes-gateway/src/main/resources/application-docker.yml index 4e39fc1..56d1859 100644 --- a/mes-gateway/src/main/resources/application-docker.yml +++ b/mes-gateway/src/main/resources/application-docker.yml @@ -60,7 +60,7 @@ spring: globalcors: cors-configurations: '[/**]': - allowedOriginPatterns: ${CORS_ALLOWED_ORIGINS:http://localhost:3000,http://localhost:5173} + allowedOriginPatterns: ${CORS_ALLOWED_ORIGINS:http://localhost:3000,http://localhost:5173,https://*.reality-blog.asia,https://virtual-path-mes.reality-blog.asia} allowedMethods: "*" allowedHeaders: "*" allowCredentials: true diff --git a/mes-process/.dockerignore b/mes-process/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-process/.dockerignore +++ b/mes-process/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-process/Dockerfile b/mes-process/Dockerfile index ea6424a..04ae1eb 100644 --- a/mes-process/Dockerfile +++ b/mes-process/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/mes-quality/.dockerignore b/mes-quality/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-quality/.dockerignore +++ b/mes-quality/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-quality/Dockerfile b/mes-quality/Dockerfile index 6e5af3b..12418db 100644 --- a/mes-quality/Dockerfile +++ b/mes-quality/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/mes-workorder/.dockerignore b/mes-workorder/.dockerignore index d29c1bf..624aaca 100644 --- a/mes-workorder/.dockerignore +++ b/mes-workorder/.dockerignore @@ -1,6 +1,6 @@ -target/ -*.jar +target/* +!target/*.jar *.class .idea/ *.iml -src/test/ +src/test/ \ No newline at end of file diff --git a/mes-workorder/Dockerfile b/mes-workorder/Dockerfile index 487eba6..6a9e853 100644 --- a/mes-workorder/Dockerfile +++ b/mes-workorder/Dockerfile @@ -8,7 +8,16 @@ RUN groupadd -r mes && useradd -r -g mes mes WORKDIR /app -RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* +ENV SPRING_PROFILES_ACTIVE=docker + +# 国内服务器:Debian 源换阿里云镜像,仅装 healthcheck 需要的 curl +RUN if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources; \ + else \ + sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list; \ + fi && \ + apt-get update && apt-get install -y --no-install-recommends curl && \ + rm -rf /var/lib/apt/lists/* RUN mkdir -p /app/logs /app/config && chown -R mes:mes /app diff --git a/sql/V14__add_device_type.sql b/sql/V14__add_device_type.sql new file mode 100644 index 0000000..979c916 --- /dev/null +++ b/sql/V14__add_device_type.sql @@ -0,0 +1,18 @@ +-- ===================================================== +-- V14__add_device_type.sql +-- 为 dash_device_status 表补 device_type 字段(幂等) +-- 服务器已手工加过列,可安全重复执行 +-- ===================================================== + +SET @col_exists = ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'dash_device_status' + AND COLUMN_NAME = 'device_type' +); +SET @sql = IF(@col_exists = 0, + 'ALTER TABLE `dash_device_status` ADD COLUMN `device_type` varchar(50) DEFAULT NULL COMMENT ''设备类型'' AFTER `device_name`', + 'SELECT 1'); +PREPARE stmt FROM @sql; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; \ No newline at end of file diff --git a/sql/init.sql b/sql/init.sql index d132b33..18beeff 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -373,6 +373,7 @@ CREATE TABLE `dash_device_status` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', `device_code` varchar(50) NOT NULL COMMENT '设备编码', `device_name` varchar(100) DEFAULT NULL COMMENT '设备名称', + `device_type` varchar(50) DEFAULT NULL COMMENT '设备类型', `status` varchar(20) DEFAULT NULL COMMENT '状态: ONLINE/OFFLINE/MAINTENANCE/ALARM', `temperature` double DEFAULT NULL COMMENT '温度', `speed` double DEFAULT NULL COMMENT '速度',