humanleft
|
f36730933d
|
fix: substring 越界防护 + Redis key 解析修正
- VehicleSyncTask: 改用前缀精确切割解析 Redis key,避免 split 对含下划线 ID 的误解析
- VehicleSyncTask/MqttChargeStationConsumer/MqttDynamicConsumer: substring(0, 2) 增加长度校验
|
hace 2 semanas |
humanleft
|
1874089606
|
test: 修复 mqy20260511 合并后的测试编译和运行时失败
|
hace 2 semanas |
humanleft
|
3502bf7db6
|
docs: 更新部署文档,反映 taosAdapter 容器化改造
|
hace 2 semanas |
humanleft
|
d3c6084a83
|
Merge remote-tracking branch 'origin/mqy20260511'
|
hace 2 semanas |
humanleft
|
bfd6fef24c
|
fix: 覆盖 entrypoint.sh 使 taosadapter 读取配置文件
上游镜像的 entrypoint.sh 启动 taosadapter 时缺少 -c 参数,
导致 /etc/taos/taosadapter.toml 配置未生效。
- 新增 deploy/config/entrypoint.sh,在启动 taosadapter 时添加
-c /etc/taos/taosadapter.toml 参数
- 精简 taosadapter.toml,禁用 keeper 上传和未使用的插件
- 更新 start-tdengine-operator.sh,挂载修改后的 entrypoint.sh
|
hace 2 semanas |
humanleft
|
806cdb0a64
|
deploy: taos-explorer 和 iot-platform 改用 host.containers.internal 访问 TDengine
- tdengine-operator 同时启动 taosd + taosadapter(host 网络)
- 删除单独的 taosadapter bridge 容器
- explorer REST API 地址改为 host.containers.internal:6041
- explorer 去掉 cluster_native(bridge 网络 native 连接不可用)
- iot-platform JDBC URL 改为 host.containers.internal:6031
- start-tdengine-operator.sh 不传 taosd 参数,禁用 keeper/explorer
|
hace 2 semanas |
lenovo
|
52edc4e33d
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
iot-platform/src/main/java/com/iot/platform/task/VehicleSyncTask.java
|
hace 2 semanas |
lenovo
|
fa665b2448
|
Merge branch 'master' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
humanleft
|
be664864ed
|
fix: taos-explorer 挂载 explorer-register.cfg,注册信息持久化
|
hace 2 semanas |
humanleft
|
47a20a4280
|
fix: explorer.toml 恢复 REST API cluster,保留 cluster_native 辅助
|
hace 2 semanas |
humanleft
|
7064feef6a
|
fix: taos-explorer 挂载改为父目录,避免匿名卷覆盖
|
hace 2 semanas |
humanleft
|
a7e8f5d60c
|
deploy: taos-explorer 改 native 直连 + taosAdapter 独立容器化
- explorer.toml: 改为 cluster_native 直连 taosd:6031,注释掉 REST API
- 新增 taosadapter.toml: 独立 REST API 服务配置 (port 6041)
- 新增 start-taos-explorer.sh: bridge 网络,挂载数据目录和配置
- 新增 start-taosadapter.sh: bridge 网络,映射 6041 端口
- 新增 start-tdengine-operator.sh: host 网络,仅启动 taosd
- README.md: 更新容器架构、添加 TDengine 管理说明和架构图
|
hace 2 semanas |
lenovo
|
5c882198d6
|
Merge branch 'master' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
lenovo
|
1becba790f
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
lenovo
|
10fedc0a39
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
humanleft
|
4ccc79ca3e
|
fix
|
hace 2 semanas |
lenovo
|
a7a02b9a84
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
lenovo
|
a21ed3c069
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
lenovo
|
fdabe24599
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
Conflicts:
iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java
|
hace 2 semanas |
lenovo
|
6ec2442651
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
bdc2ccb2ea
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
35d1316718
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
2fcc39dbad
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
041d3a1380
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
ccfd3a4e7e
|
Merge remote-tracking branch 'origin/master' into mqy20260511
|
hace 2 semanas |
humanleft
|
e1532193d2
|
refactor: TdEngineService 代码清理
|
hace 2 semanas |
humanleft
|
75f639e4d7
|
Merge remote-tracking branch 'origin/mqy20260511'
|
hace 2 semanas |
humanleft
|
8772fd4c08
|
chore(deploy): JAR 备份保留数量改回 10 个
|
hace 2 semanas |
humanleft
|
12e9e3b352
|
feat(deploy): 限制 JAR 备份保留 3 个 + 清理 dangling 镜像
|
hace 2 semanas |
humanleft
|
08860c245f
|
docs: 更新部署文档和项目说明
- deploy/README.md:
- 安装目录 /opt/iot-platform -> /mnt/iot-platform
- 网络模式 host -> bridge,新增端口映射说明
- 去掉自动回滚描述,改为保留容器排查
- 新增容器架构表格和 TDengine 配置文件说明
- CLAUDE.md:
- Redis host: localhost -> ${REDIS_HOST:localhost}
- TDengine URL: 127.0.0.1 -> 172.21.185.173
- 环境变量示例添加 REDIS_HOST
|
hace 2 semanas |
humanleft
|
a5b7e0823f
|
feat(deploy): 容器网络架构改造 + 配置纳入版本控制
网络架构:
- iot-platform: host -> bridge (新增 -p 8887:8887 端口映射)
- taos-explorer: bridge (新增 /mnt/taos-explorer-data 数据持久化)
- tdengine-operator: 保持 host 网络
配置更新:
- TDengine URL: 127.0.0.1 -> 172.21.185.173 (宿主机内网 IP)
- Redis host: localhost -> ${REDIS_HOST:localhost} 环境变量
- taos.cfg fqdn: 127.0.0.1 -> 172.21.185.173
- explorer.toml cluster: localhost -> 172.21.185.173
部署脚本:
- REMOTE_DIR: /opt/iot-platform -> /mnt/iot-platform
- 日志目录: /opt/iot-platform/logs -> /mnt/iot-platform/logs
- 去掉自动回滚逻辑,保留容器用于排查
- 新增 -p 8887:8887 端口映射
新增服务器配置文件到仓库:
- deploy/Dockerfile
- deploy/start-container.sh
- deploy/config/taos.cfg
- deploy/config/explorer.toml
- deploy/config/tdengine-explorer.conf
- .env (移除 .gitignore 忽略)
|
hace 2 semanas |
lenovo
|
502604ea6c
|
Merge remote-tracking branch 'origin/master' into mqy20260511
|
hace 2 semanas |
lenovo
|
5667d23b2e
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
83c0ffdcf1
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
humanleft
|
fd11440482
|
docs: 更新部署文档为容器化方案
- deploy/README.md: systemd → Podman 容器化部署
- CLAUDE.md: 更新部署命令、TDengine URL、.env 加载方式
|
hace 2 semanas |
humanleft
|
ea084791d6
|
chore(deploy): 部署脚本改为容器化 (Podman)
- 停止/启动 systemd 服务 → 停止/启动 Podman 容器
- 部署时自动构建容器镜像
- 回滚逻辑同步改为容器方式
|
hace 2 semanas |
humanleft
|
356fd0b43c
|
chore: 修改 TDengine JDBC URL 为 127.0.0.1:6031
- application.yml: localhost → 127.0.0.1 避免 IPv6 解析问题
- IotProperties.java: 同步修改默认 URL
|
hace 2 semanas |
humanleft
|
350327912e
|
Merge remote-tracking branch 'origin/mqy20260511'
|
hace 2 semanas |
lenovo
|
a84e9ef88c
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
609e23ff9d
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
humanleft
|
a2d0c7d0d6
|
Merge remote-tracking branch 'origin/mqy20260511'
|
hace 2 semanas |
lenovo
|
bda327cf66
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
833288c1b4
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
humanleft
|
bb26329b48
|
chore: 部署全新 TDengine 3.3.6.0 实例(端口 6031),升级 JDBC 驱动至 3.3.2
- 服务器新建独立 TDengine 容器实例(Podman),端口 6031
- 数据卷挂载至 /mnt/tdengine-new/(大容量数据盘)
- 部署 taos-explorer Web 控制台,nginx 6060 端口反向代理 + Basic Auth
- 升级 taos-jdbcdriver 3.2.7 → 3.3.2
- 应用 JDBC URL 指向新实例 localhost:6031
- TdEngineService 删除 device_id VARCHAR(32) 特殊处理,统一 VARCHAR(255)
|
hace 2 semanas |
lenovo
|
a66d8179ed
|
Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511
|
hace 2 semanas |
lenovo
|
2e06aefae5
|
修改超级表
|
hace 2 semanas |
lenovo
|
de65516db4
|
修改超级表
|
hace 2 semanas |
humanleft
|
216f58c8b6
|
超级表传输
|
hace 2 semanas |
humanleft
|
04e70a5dea
|
格式
|
hace 2 semanas |
humanleft
|
5c88b90a61
|
fix(service): 放宽表名校验正则,允许数字开头和连字符
|
hace 2 semanas |