Commit Graph

317 Commits

Author SHA1 Message Date
lzh
25fad8d6fd perf: 启用 Docker BuildKit 和 Maven 缓存优化构建速度
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 启用 Docker BuildKit 缓存挂载
- 使用 --mount=type=cache 缓存 Maven 依赖
- 优化 Dockerfile 层缓存策略
- 添加构建优化指南文档

预期效果:
- 首次构建: ~30分钟
- 后续构建(无变更): ~2分钟
- 后续构建(有变更): ~5-8分钟
2026-01-13 15:36:29 +08:00
lzh
deabc90f9a fix: 添加部署诊断信息和目录检查
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 添加 SSH 连接测试
- 检查并创建项目目录
- 改进错误提示
2026-01-13 15:30:07 +08:00
lzh
beabec5fb3 fix: 修正宿主机 SSH 地址为 172.19.0.1
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- Jenkins 容器在 1panel-network 网络中
- 网关地址是 172.19.0.1 而不是 172.17.0.1
- Jenkins 负责指挥,实际部署在宿主机执行
2026-01-13 15:13:49 +08:00
lzh
27d3cc4b94 fix: 修复 Jenkins 中 docker compose 命令执行问题
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 使用 docker 的绝对路径 /usr/bin/docker
- 切换到项目目录执行命令
- 确保命令在 Jenkins shell 环境中正确执行
2026-01-13 15:04:34 +08:00
lzh
7d0949ffbe docs: 添加服务器部署和 Nacos 配置完整指南
- 详细的 .env 文件配置步骤
- Nacos 配置中心使用指南
- 为所有 5 个核心服务提供配置模板
- 包含常见问题和故障排查
2026-01-13 14:15:59 +08:00
lzh
62978560c5 feat: iot-gateway 支持 Nacos 配置管理
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 在 application.yaml 中添加 Nacos config import
- 在 application-prod.yaml 中添加 Nacos 配置
- 在 docker-compose.core.yml 中注入 Nacos 环境变量
- 支持配置统一管理和动态刷新
- 与其他微服务保持架构一致性
2026-01-13 14:10:05 +08:00
lzh
98d3db9ade fix: 调整 iot-gateway prod 配置结构与 application.yaml 保持一致
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 移除 Nacos 配置(在 application.yaml 中通过 import 引入)
- 保持与 application.yaml 完全相同的结构
- 仅将硬编码值替换为环境变量占位符
2026-01-13 13:51:53 +08:00
lzh
f9aa7828c7 feat: 完善 iot-gateway 生产环境配置
- 添加 IoT 网关特有的配置项环境变量支持
- 支持 HTTP/MQTT/TCP/EMQX 协议配置
- 支持设备 RPC 和 Token 配置
- 支持消息总线配置
- 添加生产环境配置文档
2026-01-13 12:32:14 +08:00
lzh
2b9c1aa7d8 feat: 添加所有核心服务的生产环境配置文件
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 创建 application-prod.yaml 支持环境变量占位符
- 支持 Docker Compose 环境变量注入
- 支持 Nacos 配置中心覆盖
- 涵盖 5 个核心服务: gateway, system, infra, iot-server, iot-gateway
2026-01-13 11:52:27 +08:00
lzh
ceea293412 fix: 使用 docker compose v2 命令替代 docker-compose
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 修改部署脚本使用 'docker compose' 而不是 'docker-compose'
- 兼容新版 Docker Compose v2
2026-01-13 10:42:24 +08:00
lzh
177918ce3d fix: 暂时移除 ops-server(还在开发分支中)
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 从 CORE_SERVICES 列表中移除 viewsh-module-ops-server
- 等待 ops-server 开发完成并合并到 master 后再添加
2026-01-13 10:23:34 +08:00
lzh
982fdba4e7 fix: 移除 Dockerfile 中不存在的 viewsh-module-ops/pom.xml 复制
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-01-13 10:03:30 +08:00
lzh
7d5cf21bdc fix: 改用 Docker 多阶段构建,移除对 Jenkins Maven 的依赖
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 移除独立的 Maven Build 阶段
- 直接使用 Docker 多阶段构建(Dockerfile 中包含 Maven)
- 改为串行构建避免内存溢出
- 添加更详细的构建日志
2026-01-13 10:00:54 +08:00
lzh
5e2f92f177 fix: 修复 Jenkinsfile 首次构建检测逻辑
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 改用 git rev-parse HEAD~1 检测上一次提交
- 首次构建时正确触发全量构建
- 添加更多调试日志
2026-01-13 09:58:37 +08:00
lzh
b3948df69b feat: 添加 Jenkins CI/CD 配置和部署脚本
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 添加 Jenkinsfile 支持智能增量构建
- 添加 Docker 多阶段构建模板
- 添加 Docker Compose 配置(连接 1Panel 中间件)
- 添加部署、回滚、清理脚本
- 添加环境变量配置模板
2026-01-13 09:49:19 +08:00
lzh
cd8d38149c chore: 【ops】语音播报去重简易实现 2026-01-09 17:42:46 +08:00
lzh
6be3e5b0e5 chore: 【ops】基础工单单元测试 2026-01-09 17:42:24 +08:00
lzh
47cbf6f1cc chore: 【ops】状态机配置 2026-01-09 17:42:08 +08:00
lzh
baa8d6e60c chore: 【ops】队列同步JOB 2026-01-09 17:41:49 +08:00
lzh
75a9df9f9f chore: 【ops】异步任务配置 2026-01-09 17:41:37 +08:00
lzh
2792226c95 chore: 【ops】保洁与IOT对接设备消费MQ消息 2026-01-09 17:41:14 +08:00
lzh
f26bd15f5b chore: 【ops】保洁员状态管理 2026-01-09 17:39:54 +08:00
lzh
628d8fd8c4 chore: 【ops】保洁员业务领域调整 2026-01-09 17:39:34 +08:00
lzh
9dd2dd35f1 chore: 【ops】实体调整 2026-01-09 17:39:14 +08:00
lzh
ea3c7829e9 chore: 【ops】工单业务日志注解 2026-01-09 17:38:29 +08:00
lzh
5974c767d5 chore: 【ops】工单基础操作修改 2026-01-09 17:38:01 +08:00
lzh
6ae2a9c750 chore: 【ops】保洁工单service修改 2026-01-09 17:36:17 +08:00
lzh
4a2801e97c chore: 【ops】保洁调度实现 2026-01-09 17:35:54 +08:00
lzh
23830961c8 chore: 【ops】保洁相关Mapper迁移 2026-01-09 16:50:51 +08:00
lzh
17a1f779a5 chore: 【ops】保洁相关Mapper迁移 2026-01-09 16:50:39 +08:00
lzh
51997af20c chore: 【ops】保洁工单生命周期监听器 2026-01-09 16:47:03 +08:00
lzh
08af90e732 chore: 【ops】工单生命周期管理器重新调整 2026-01-09 16:46:16 +08:00
lzh
8feb778291 chore: 【ops】调度引擎重新调整 2026-01-09 16:45:44 +08:00
lzh
285abe6d48 chore: 【ops】迁移cleaner相关实体到environment模块 2026-01-09 16:44:26 +08:00
lzh
d9b335c6c9 chore: 【ops】派单策略逻辑编写(暂时预留、后期设计接入) 2026-01-08 15:14:08 +08:00
lzh
97f30356d8 chore: 【ops】工单队列状态调整 2026-01-08 15:12:59 +08:00
lzh
e4fa971fea chore: 【ops】工单队列管理 2026-01-08 15:12:39 +08:00
lzh
2a4ca53249 chore: 【ops】保洁工单mapper-insertOnDuplicateKeyUpdate方法 2026-01-08 15:06:38 +08:00
lzh
48e1a91fd5 chore: 【ops】工单生命周期操作(暂停、回复、完成、取消) 2026-01-08 15:06:08 +08:00
lzh
5e9dc8b104 chore: 【ops】状态机实现/状态切换事件发布/保洁监听处理事件 2026-01-08 15:05:09 +08:00
lzh
a30a60245d chore: 【ops】保洁业务通知消息常量 2026-01-08 15:01:03 +08:00
lzh
bdb2eb0856 chore: 【ops】删除状态机监听器 2026-01-08 15:00:35 +08:00
lzh
b225df4392 chore: 【ops】SuperBuilder改为Builder 2026-01-08 14:32:30 +08:00
lzh
6ae9aea548 chore: 【ops】biz模块添加mq依赖 2026-01-08 14:31:55 +08:00
lzh
1f889b65bf chore: 【ops】fsm和order单元测试1.0 2026-01-06 10:53:37 +08:00
lzh
a11c801b93 chore: 【ops】工单基础Controller 2026-01-06 10:53:13 +08:00
lzh
2e28183b39 chore: 【ops】保洁员状态Service 2026-01-06 10:52:57 +08:00
lzh
c07f864f7e chore: 【ops】保洁工单基础Service 2026-01-06 10:52:40 +08:00
lzh
77b7bfb89d chore: 【ops】工单基础Service 2026-01-06 10:52:33 +08:00
lzh
bb94103548 chore: 【ops】保洁员DispatchEngine 2026-01-06 10:51:55 +08:00