Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511

.env

@@ -0,0 +1,24 @@
+# IoT 平台环境变量配置
+# 启动前自动加载：./start.sh start
+# 或手动加载：source .env
+
+# MySQL 数据库（主从共用）
+MYSQL_USERNAME=root
+MYSQL_PASSWORD="Zhu059300()__"
+
+# Redis
+REDIS_PASSWORD=
+
+# MQTT Broker
+MQTT_USERNAME=NjniyrEO
+MQTT_PASSWORD=2b577892f4824d466dbc323a1ee4dfe1902c55bb
+
+# TDengine 时序数据库
+TDENGINE_USERNAME=root
+TDENGINE_PASSWORD=taosdata
+
+# Druid 监控（生产环境建议设为 false 关闭）
+DRUID_STAT_ENABLED=true
+DRUID_USERNAME=ruoyi
+DRUID_PASSWORD=123456
+REDIS_HOST=172.21.185.173

.gitignore

@@ -50,5 +50,6 @@ nbdist/
 .claude/
 
 # Environment variables
-.env
+# .env is now tracked in git per user request
+# .env
 !.env.example

CLAUDE.md

@@ -9,7 +9,7 @@ This is an **IoT Energy Storage Management Platform** (储能运营平台), orig
 - **Backend**: Spring Boot 2.5.15, Java 8, Spring Security 5.7.12, JWT authentication
 - **Frontend**: Vue 2 + Element UI (separate repository, not in this workspace)
 - **Database**: MySQL 8 (dual datasource via Druid), TDengine 3.x for time-series
-- **Cache**: Redis (localhost:6379)
+- **Cache**: Redis (`${REDIS_HOST:localhost}:6379`)
 - **Message Broker**: MQTT (EMQX on 47.104.204.180:1883)
 
 ## Build & Run Commands
@@ -55,11 +55,11 @@ iot-platform/
 ### TDengine (Time-Series Database)
 - Used for high-frequency IoT telemetry ingestion
 - Connection pool: HikariCP via `TDengineService`
-- Connects to `jdbc:TAOS://127.0.0.1:6031/`
+- Connects to `jdbc:TAOS://172.21.185.173:6031/` (host network, via host IP)
 - Super-table pattern with column caching (`stableColumnCache`)
 
 ### Redis
-- Host: `localhost:6379`
+- Host: `${REDIS_HOST:localhost}:6379` (production overrides via `REDIS_HOST` env var)
 - Key patterns (defined in `common/RedisKeys.java`):
   - `DSB:active:devices` — Set of active IoT device keys
   - `DSB:<controllerId>:<metricName>` — Hash storing device telemetry
@@ -81,6 +81,7 @@ All sensitive credentials are externalized to `.env`:
 MYSQL_USERNAME=root
 MYSQL_PASSWORD="..."
 REDIS_PASSWORD=
+REDIS_HOST=172.21.185.173
 MQTT_USERNAME=...
 MQTT_PASSWORD=...
 TDENGINE_USERNAME=root

deploy/.env

@@ -0,0 +1,24 @@
+# IoT 平台环境变量配置
+# 启动前自动加载：./start.sh start
+# 或手动加载：source .env
+
+# MySQL 数据库（主从共用）
+MYSQL_USERNAME=root
+MYSQL_PASSWORD="Zhu059300()__"
+
+# Redis
+REDIS_PASSWORD=
+
+# MQTT Broker
+MQTT_USERNAME=NjniyrEO
+MQTT_PASSWORD=2b577892f4824d466dbc323a1ee4dfe1902c55bb
+
+# TDengine 时序数据库
+TDENGINE_USERNAME=root
+TDENGINE_PASSWORD=taosdata
+
+# Druid 监控（生产环境建议设为 false 关闭）
+DRUID_STAT_ENABLED=true
+DRUID_USERNAME=ruoyi
+DRUID_PASSWORD=123456
+REDIS_HOST=172.21.185.173

deploy/Dockerfile

@@ -0,0 +1,15 @@
+FROM tdengine/tdengine:3.3.6.13
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends openjdk-8-jre-headless && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/iot-platform
+
+COPY iot-platform.jar .
+COPY .env .
+COPY start-container.sh .
+RUN chmod +x start-container.sh
+
+EXPOSE 8887
+
+ENTRYPOINT ["./start-container.sh"]

deploy/README.md

@@ -2,7 +2,7 @@
 
 ## 概述
 
-本项目使用 Podman 容器化部署，通过 `deploy.sh` 脚本实现一键构建、上传、构建镜像、健康检查和自动回滚。
+本项目使用 Podman 容器化部署，通过 `deploy.sh` 脚本实现一键构建、上传、构建镜像、健康检查。
 
 ## 服务器环境
 
@@ -10,13 +10,13 @@
 - **OS**: Alibaba Cloud Linux 3
 - **容器运行时**: Podman 4.9.4 (docker 兼容)
 - **Java**: OpenJDK 1.8 (容器内)
-- **安装目录**: `/opt/iot-platform/`
+- **安装目录**: `/mnt/iot-platform/`（兼容软链接 `/opt/iot-platform`）
 - **容器名称**: `iot-platform`
 
 ## 目录结构
 
 ```
-/opt/iot-platform/
+/mnt/iot-platform/
 ├── iot-platform.jar          # 当前运行版本
 ├── Dockerfile                # 容器镜像构建定义
 ├── start-container.sh        # 容器启动脚本（加载 .env）
@@ -29,19 +29,27 @@
 └── logs/                     # 日志输出（宿主机挂载）
 ```
 
+## 容器架构
+
+| 容器 | 网络模式 | 端口映射 | 数据持久化 |
+|------|---------|---------|-----------|
+| `tdengine-operator` | host | 6031, 6041 | `/mnt/tdengine-operator/data` |
+| `taos-explorer` | bridge | `127.0.0.1:6060->6060` | `/mnt/taos-explorer-data` |
+| `iot-platform` | bridge | `0.0.0.0:8887->8887` | `/mnt/iot-platform/logs` |
+
 ## 快速开始
 
 ### 首次部署（服务器初始化）
 
-确保服务器上已有 `/opt/iot-platform/` 目录，并包含 `Dockerfile`、`.env`、`start-container.sh`：
+确保服务器上已有 `/mnt/iot-platform/` 目录，并包含 `Dockerfile`、`.env`、`start-container.sh`：
 
 ```bash
 # 从本地同步必要文件到服务器
-scp deploy/setup-server.sh root@47.104.204.180:/opt/iot-platform/
-scp .env root@47.104.204.180:/opt/iot-platform/
-scp Dockerfile root@47.104.204.180:/opt/iot-platform/
-scp start-container.sh root@47.104.204.180:/opt/iot-platform/
-ssh root@47.104.204.180 "chmod +x /opt/iot-platform/start-container.sh"
+scp deploy/setup-server.sh root@47.104.204.180:/mnt/iot-platform/
+scp .env root@47.104.204.180:/mnt/iot-platform/
+scp deploy/Dockerfile root@47.104.204.180:/mnt/iot-platform/
+scp deploy/start-container.sh root@47.104.204.180:/mnt/iot-platform/
+ssh root@47.104.204.180 "chmod +x /mnt/iot-platform/start-container.sh"
 ```
 
 然后执行首次部署：
@@ -62,13 +70,13 @@ cd deploy
 
 流程：
 1. 本地执行 `mvn clean package`
-2. 上传 jar 到服务器
+2. 上传 jar 到服务器 `/mnt/iot-platform/`
 3. 备份当前版本（带时间戳）
 4. 停止并删除旧容器
 5. 替换 jar 并构建新镜像
-6. 启动容器（host 网络模式）
+6. 启动容器（bridge 网络模式，端口映射 `8887:8887`）
 7. 健康检查（`/actuator/health`）
-8. 失败则自动回滚到上一个版本
+8. 失败时保留容器用于排查（不再自动回滚）
 
 #### 方式二：指定 jar 部署
 
@@ -86,7 +94,7 @@ cd deploy
 
 ## 环境变量
 
-`.env` 文件位于项目根目录和服务器 `/opt/iot-platform/.env`，包含所有敏感凭据：
+`.env` 文件位于项目根目录和服务器 `/mnt/iot-platform/.env`，包含所有环境变量：
 
 ```bash
 # MySQL
@@ -95,6 +103,7 @@ MYSQL_PASSWORD="..."
 
 # Redis
 REDIS_PASSWORD=
+REDIS_HOST=172.21.185.173
 
 # MQTT
 MQTT_USERNAME=...
@@ -110,13 +119,11 @@ DRUID_USERNAME=ruoyi
 DRUID_PASSWORD=...
 ```
 
-**注意**：`.env` 文件已加入 `.gitignore`，**切勿提交到 Git**。
-
 ## 服务器管理
 
 ```bash
 # 查看容器状态
-podman ps | grep iot-platform
+podman ps
 
 # 查看实时日志
 podman logs -f iot-platform
@@ -125,7 +132,7 @@ podman logs -f iot-platform
 podman logs --tail 100 iot-platform
 
 # 查看宿主机上的日志文件（和容器内同步）
-tail -f /opt/iot-platform/logs/iot-platform.$(date +%Y-%m-%d).*.log
+tail -f /mnt/iot-platform/logs/iot-platform.$(date +%Y-%m-%d).*.log
 
 # 停止容器
 podman stop iot-platform
@@ -141,7 +148,7 @@ podman restart iot-platform
 
 ```bash
 # 在服务器上执行
-bash /opt/iot-platform/bin/health-check.sh localhost 8887 30
+bash /mnt/iot-platform/bin/health-check.sh localhost 8887 30
 
 # 或从本地检查
 curl -s http://47.104.204.180:8887/actuator/health
@@ -153,9 +160,7 @@ curl -s http://47.104.204.180:8887/actuator/health
 
 ## 回滚
 
-如果部署失败，`deploy.sh` 会自动回滚到上一个版本。
-
-手动回滚：
+部署失败时容器会保留用于排查，需手动回滚：
 
 ```bash
 ssh root@47.104.204.180
@@ -164,16 +169,17 @@ ssh root@47.104.204.180
 podman stop iot-platform && podman rm iot-platform
 
 # 恢复旧版本 jar
-ls /opt/iot-platform/backup/          # 查看可用备份
-cp /opt/iot-platform/backup/iot-platform-XXXX.jar /opt/iot-platform/iot-platform.jar
+ls /mnt/iot-platform/backup/          # 查看可用备份
+cp /mnt/iot-platform/backup/iot-platform-XXXX.jar /mnt/iot-platform/iot-platform.jar
 
 # 重新构建镜像并启动
-cd /opt/iot-platform && podman build -t iot-platform:latest .
+cd /mnt/iot-platform && podman build -t iot-platform:latest .
 podman run -d \
     --name iot-platform \
-    --network host \
+    --network bridge \
     --restart unless-stopped \
-    -v /opt/iot-platform/logs:/opt/iot-platform/logs \
+    -p 8887:8887 \
+    -v /mnt/iot-platform/logs:/opt/iot-platform/logs \
     localhost/iot-platform:latest
 ```
 
@@ -187,3 +193,6 @@ podman run -d \
 | `Dockerfile` | 容器镜像构建定义 |
 | `start-container.sh` | 容器内启动脚本（加载 .env） |
 | `iot-platform.service` | systemd 服务定义（已废弃，保留备用） |
+| `config/taos.cfg` | TDengine 服务端配置 |
+| `config/explorer.toml` | taos-explorer 配置 |
+| `config/tdengine-explorer.conf` | nginx 代理配置 |

deploy/config/explorer.toml

@@ -0,0 +1,117 @@
+# This is a automacically generated configuration file for Explorer in [TOML](https://toml.io/) format.
+#
+# Here is a full list of available options.
+
+# Explorer server port to listen on.
+# Default is 6060.
+#
+port = 6060
+
+# IPv4 listen address.
+# Default is 0.0.0.0
+addr = "0.0.0.0"
+
+# IPv6 listen address.
+
+# ipv6 = "::1"
+
+# explorer server instance id
+# 
+# The instanceId of each instance is unique on the host
+# instanceId = 1
+
+# Explorer server log level.
+# Default is "info"
+# 
+# Deprecated: use log.level instead
+log_level = "info"
+
+# All data files are stored in this directory
+# data_dir = "/var/lib/taos/explorer" # Default for Linux
+# data_dir = "C:\\TDengine\\data\\explorer" # Default for Windows
+
+# REST API endpoint to connect to the cluster.
+# This configuration is also the target for data migration tasks.
+# 
+# Default is "http://localhost:6041" - the default endpoint for REST API.
+#
+cluster = "http://172.21.185.173:6041"
+
+# native endpoint to connect to the cluster.
+# Default is disabled. To enable it, set it to the native API URL like "taos://localhost:6030" and uncomment it.
+# If you enable it, you will get more performance for data migration tasks.
+# If modify this config item, you must relogin to clear the cache in browser local storage.
+#
+# cluster_native = "taos://localhost:6030"
+
+# API endpoint for data replication/backup/data sources. No default option.
+#   Set it to API URL like "http://localhost:6050".
+#
+x_api = "http://localhost:6050"
+
+# Please set it to same as the "grpc" parameter used by taosX Service; 
+# If "grpc" parameter is not set explicitly in taosX service, please set it to the default grpc address of taosX
+grpc = "http://localhost:6055"
+
+# CORS configuration switch, it allows cross-origin access
+cors = true
+
+# cloud open api.
+# cloud_open_api = "https://pre.ali.cloud.taosdata.com/openapi"
+
+# Enable ssl
+# If the following two files exist, enable ssl protocol
+#
+[ssl]
+
+# SSL certificate
+#
+# certificate = "/path/to/ca.file" # on linux/macOS
+# certificate = "C:\\path\\to\\ca.file" # on windows
+
+# SSL certificate key
+#
+# certificate_key = "/path/to/key.file" # on linux/macOS
+# certificate_key = "C:\\path\\to\\key.file" # on windows
+
+# log configuration
+[log]
+# All log files are stored in this directory
+# 
+# path = "/var/log/taos" # on linux/macOS
+# path = "C:\\TDengine\\log" # on windows
+
+# log filter level
+#
+# level = "info"
+
+# Compress archived log files or not
+# 
+# compress = false
+
+# The number of log files retained by the current explorer server instance in the `path` directory
+# 
+# rotationCount = 30
+
+# Rotate when the log file reaches this size
+# 
+# rotationSize = "1GB"
+
+# Log downgrade when the remaining disk space reaches this size, only logging `ERROR` level logs
+# 
+# reservedDiskSize = "1GB"
+
+# The number of days log files are retained
+#
+# keepDays = 30
+
+# integrated with Grafana
+[grafana]
+# The token of the Grafana server, which is used to access the Grafana server.
+#token = ""
+
+# The URL of the Grafana dashboard, which is used to display the monitoring data of the TDengine cluster.
+# You can configure multiple Grafana dashboards.
+[grafana.dashboards]
+#TDengine3 = "http://localhost:3000/d/000000001/tdengine3"
+#taosX = "http://localhost:3000/d/000000002/taosx"

deploy/config/taos.cfg

@@ -0,0 +1,2 @@
+fqdn 172.21.185.173
+serverPort 6031

deploy/config/tdengine-explorer.conf

@@ -0,0 +1,16 @@
+server {
+    listen 172.21.185.173:6060;
+    server_name 47.104.204.180;
+
+    location / {
+        proxy_pass http://127.0.0.1:6060;
+        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_read_timeout 300s;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}

deploy/deploy.sh

@@ -15,7 +15,7 @@ set -e
 # 配置
 SERVER_HOST="${SERVER_HOST:-47.104.204.180}"
 SERVER_USER="${SERVER_USER:-root}"
-REMOTE_DIR="${REMOTE_DIR:-/opt/iot-platform}"
+REMOTE_DIR="${REMOTE_DIR:-/mnt/iot-platform}"
 APP_NAME="iot-platform"
 LOCAL_JAR=""
 DO_BUILD=false
@@ -101,6 +101,12 @@ ssh "${SERVER_USER}@${SERVER_HOST}" "
         cp -a ${REMOTE_DIR}/${APP_NAME}.jar ${REMOTE_DIR}/backup/${BACKUP_NAME}
         echo '  已备份: ${BACKUP_NAME}'
         ls -lh ${REMOTE_DIR}/backup/ | tail -5
+        # 清理旧备份，保留最近 10 个
+        BACKUP_COUNT=\$(ls -1t ${REMOTE_DIR}/backup/${APP_NAME}-*.jar 2>/dev/null | wc -l)
+        if [ "\$BACKUP_COUNT" -gt 10 ]; then
+            ls -1t ${REMOTE_DIR}/backup/${APP_NAME}-*.jar | tail -n +11 | xargs -r rm -f
+            echo "  已清理旧备份，保留最近 10 个"
+        fi
     else
         echo '  无现有版本，跳过备份'
     fi
@@ -124,6 +130,8 @@ ssh "${SERVER_USER}@${SERVER_HOST}" "
     echo '  构建镜像...'
     cd ${REMOTE_DIR} && podman build -t ${APP_NAME}:latest . >/dev/null 2>&1
     echo '  镜像构建完成'
+    podman image prune -f >/dev/null 2>&1
+    echo '  已清理 dangling 镜像'
     podman images | grep ${APP_NAME}
 "
 echo -e "${GREEN}[4/6] 镜像构建完成${NC}"
@@ -133,9 +141,10 @@ echo -e "${YELLOW}[5/6] 启动容器...${NC}"
 ssh "${SERVER_USER}@${SERVER_HOST}" "
     podman run -d \
         --name ${APP_NAME} \
-        --network host \
+        --network bridge \
         --restart unless-stopped \
-        -v ${REMOTE_DIR}/logs:/opt/iot-platform/logs \
+        -p 8887:8887 \
+        -v /mnt/iot-platform/logs:/opt/iot-platform/logs \
         localhost/${APP_NAME}:latest >/dev/null 2>&1
 "
 sleep 5
@@ -163,40 +172,11 @@ if ssh "${SERVER_USER}@${SERVER_HOST}" "bash ${REMOTE_DIR}/bin/health-check.sh l
     exit 0
 else
     echo -e "${RED}[6/6] 健康检查失败!${NC}"
-
-    if [ "$NO_ROLLBACK" = true ]; then
-        echo -e "${YELLOW}[no-rollback] 已启用不回滚模式，保留新版本用于排查${NC}"
-        echo -e "${YELLOW}排查命令:${NC}"
-        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman logs -f ${APP_NAME}'"
-        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman ps | grep ${APP_NAME}'"
-        exit 1
-    fi
-
-    echo -e "${YELLOW}[rollback] 执行回滚...${NC}"
-    ssh "${SERVER_USER}@${SERVER_HOST}" "podman stop ${APP_NAME} >/dev/null 2>&1 && podman rm ${APP_NAME} >/dev/null 2>&1 || true"
-
-    if ssh "${SERVER_USER}@${SERVER_HOST}" "test -f ${REMOTE_DIR}/backup/${BACKUP_NAME}"; then
-        echo -e "${YELLOW}[rollback] 恢复旧版本...${NC}"
-        ssh "${SERVER_USER}@${SERVER_HOST}" "
-            cp ${REMOTE_DIR}/backup/${BACKUP_NAME} ${REMOTE_DIR}/${APP_NAME}.jar
-            cd ${REMOTE_DIR} && podman build -t ${APP_NAME}:latest . >/dev/null 2>&1
-            podman run -d \
-                --name ${APP_NAME} \
-                --network host \
-                --restart unless-stopped \
-                -v ${REMOTE_DIR}/logs:/opt/iot-platform/logs \
-                localhost/${APP_NAME}:latest >/dev/null 2>&1
-        "
-        sleep 5
-
-        if ssh "${SERVER_USER}@${SERVER_HOST}" "bash ${REMOTE_DIR}/bin/health-check.sh localhost 8887 60"; then
-            echo -e "${GREEN}[rollback] 回滚成功，旧版本已恢复${NC}"
-        else
-            echo -e "${RED}[rollback] 回滚后健康检查仍失败，请手动排查!${NC}"
-        fi
-    else
-        echo -e "${RED}[rollback] 无备份可回滚，请手动修复!${NC}"
-    fi
-
+    echo -e "${YELLOW}保留容器用于排查，不自动回滚${NC}"
+    echo ""
+    echo "排查命令:"
+    echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman logs -f ${APP_NAME}'"
+    echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman ps | grep ${APP_NAME}'"
+    echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'curl -s http://localhost:8887/actuator/health'"
     exit 1
 fi

deploy/start-container.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -a
+source /opt/iot-platform/.env
+set +a
+
+cd /opt/iot-platform
+exec java -server -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -Xms1g -Xmx2g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/iot-platform/logs/heapdump.hprof -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -jar iot-platform.jar --spring.profiles.include=online

iot-platform/src/main/java/com/iot/platform/config/IotProperties.java

@@ -115,7 +115,7 @@ public class IotProperties {
      * TDengine配置
      */
     public static class TDengine {
-        private String url = "jdbc:TAOS://127.0.0.1:6031/";
+        private String url = "jdbc:TAOS://172.21.185.173:6031/";
         private String username = "";
         private String password = "";
 

iot-platform/src/main/resources/application.yml

@@ -29,7 +29,7 @@ spring:
     restart:
       enabled: false
   redis:
-    host: localhost
+    host: ${REDIS_HOST:localhost}
     port: 6379
     database: 0
     password: ${REDIS_PASSWORD:}
@@ -70,6 +70,6 @@ iot:
     password: ${MQTT_PASSWORD:}
     charge-station-topic: ${MQTT_CHARGE_STATION_TOPIC:station/ChargeStation/device/+/post/json}
   tdengine:
-    url: jdbc:TAOS://127.0.0.1:6031/
+    url: jdbc:TAOS://172.21.185.173:6031/
     username: ${TDENGINE_USERNAME:}
     password: ${TDENGINE_PASSWORD:}