a68ce9a28a
fix(xxl-job): 配置executor IP和端口解决跨服务器回调失败
...
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
XXL-Job Admin部署在Infra服务器,executor运行在Prod服务器的Docker容器中,
容器内部IP不可达,需指定宿主机IP和独立端口供Admin回调。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 17:03:39 +08:00
748b09d355
fix(rocketmq): 添加腾讯云TDMQ ACL认证配置解决连接失败
...
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
修复RocketMQ发送消息报"No accessKey is configured"错误,
统一各模块环境变量名为ROCKETMQ_NAMESRV_ADDR。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 15:50:44 +08:00
91de356a67
fix(iot-gateway): 修正RPC环境变量名为VIEWSH_IOT_GATEWAY_RPC_URL
...
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
Spring Boot relaxed binding将viewsh.iot.gateway.rpc.url映射为
VIEWSH_IOT_GATEWAY_RPC_URL,而非VIEWSH_GATEWAY_RPC_URL。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 15:17:06 +08:00
e15ebfd3d4
fix(iot-gateway): 修正RPC环境变量名不匹配导致连接失败
...
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中VIEWSH_IOT_GATEWAY_RPC_URL与yaml期望的VIEWSH_GATEWAY_RPC_URL不一致,
导致iot-gateway回退到默认值127.0.0.1:48091,容器间无法通信。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 11:39:37 +08:00
26e909cce9
fix(deploy): 迁移Nacos/TDengine/XXL-Job至Infra服务器(172.17.16.7)
...
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
将基础设施服务地址从Prod服务器(172.17.16.14)统一迁移至Infra服务器(172.17.16.7):
- Nacos: 172.17.16.14:8848 → 172.17.16.7:8848
- TDengine: 172.17.16.14:6041 → 172.17.16.7:6041
- XXL-Job: 172.17.16.14:19090 → 172.17.16.7:19090
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 11:22:02 +08:00
547da7cfd2
refactor(deploy): 迁移CI/CD至双服务器架构
...
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: Registry改为Infra内网172.17.16.7:5000,部署目标改为Prod内网172.17.16.14
- docker-compose: 镜像源改为172.17.16.7:5000,MySQL改为172.17.16.8,Redis改为172.17.16.13,RocketMQ改为腾讯云TDMQ
- 所有模块application-prod.yaml: 统一更新MySQL/Redis/RocketMQ默认连接地址
- deploy.sh: Registry地址同步更新
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 10:41:54 +08:00
cea43d282c
fix: 修复iot-gateway调用iot-server地址错误问题
2026-01-16 15:31:29 +08:00
8a543db18f
fix: 修复iot-gateway容器端口未映射
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-16 11:46:47 +08:00
cfdf065f37
fix: 修复XXL_JOB地址
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-15 16:59:11 +08:00
c8010e06d2
feat(ops): add deployment configuration and actuator dependency
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-15 16:30:15 +08:00
520aa027fa
fix: iot-server容器端口改为48091
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-14 21:49:35 +08:00
bcbbde1879
fix: iot-gateway去除健康检查、nacos配置
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-14 17:48:00 +08:00
b0300ef5d9
fix: 修复端口写错bug
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-14 16:32:00 +08:00
99a4d72e04
fix: 调整IOT服务端口适配健康检查
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-14 16:14:35 +08:00
2a4400e8ee
fix: Jenkins修复8-改为使用1panel-network容器网络
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-14 13:50:20 +08:00
cfc4238c99
fix: Jenkins修复6-移除tdengine服务依赖
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-14 13:00:35 +08:00
4162783263
fix: Jenkins修复3-iot-server时序库缺失
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-14 12:02:30 +08:00
52017f7e23
fix: Jenkins修复3-prod缺失配置添加
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-14 11:43:47 +08:00
4a71719e51
fix: Jenkins修复3-修改数据库名称
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-14 11:22:46 +08:00
a20ef566d0
fix: Jenkins修复3-修改nacos配置
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-14 11:12:28 +08:00
282457d53d
fix: Jenkinsfile修复2
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-14 10:42:13 +08:00
efe05ad624
refactor: 重构配置管理,移除.env依赖,使用docker-compose环境变量+Nacos配置中心
...
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.core.yml,使用Spring Boot环境变量命名规范
- 修复Jenkins pipeline中的getContainerName方法调用错误
- 配置优先级:Nacos配置中心 > Docker环境变量 > application-prod.yaml
变更文件:
- viewsh-gateway/src/main/resources/application-prod.yaml
- viewsh-module-system-server/src/main/resources/application-prod.yaml
- viewsh-module-infra-server/src/main/resources/application-prod.yaml
- viewsh-module-iot-server/src/main/resources/application-prod.yaml
- viewsh-module-iot-gateway/src/main/resources/application-prod.yaml
- docker-compose.core.yml
- Jenkinsfile
2026-01-13 23:50:37 +08:00
1f03c44a39
fix: 修复一直重启、构建bug
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 22:04:33 +08:00
b7664f7dd0
fix: 修复健康检查和配置问题
...
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
- 修复健康检查 IP 地址 (172.17.16.14 -> localhost)
- 禁用微信自动配置避免 appid 错误
- 添加服务依赖关系和启动顺序
- 优化 Jenkinsfile 部署流程
- 添加 Quartz 优雅关闭配置
- 注释 XXL-JOB Admin 配置(暂不部署)
2026-01-13 19:13:30 +08:00
93e8848845
fix: 使用宿主机 IP 进行健康检查
...
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
改用 172.17.16.14 替代 localhost
确保健康检查在 host 网络模式下正常工作
2026-01-13 18:15:31 +08:00
b3d13dacc8
fix: 使用宿主机 IP 进行健康检查
...
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
- 改用 172.17.16.14 替代 localhost
- 确保健康检查在 host 网络模式下正常工作
2026-01-13 18:12:44 +08:00
676e7d6c31
fix: 添加 REDIS_DATABASE 环境变量到所有服务
...
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
- 所有服务添加 REDIS_DATABASE 环境变量
- 默认值为 0
- 解决 Redis 配置无法正确解析的问题
2026-01-13 17:27:59 +08:00
62978560c5
feat: iot-gateway 支持 Nacos 配置管理
...
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
b3948df69b
feat: 添加 Jenkins CI/CD 配置和部署脚本
...
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