From 416278326394a56c9faf49dfd57d20c18ba800fd Mon Sep 17 00:00:00 2001
From: lzh <sickone075@gmail.com>
Date: Wed, 14 Jan 2026 12:02:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20Jenkins=E4=BF=AE=E5=A4=8D3-iot-server?=
 =?UTF-8?q?=E6=97=B6=E5=BA=8F=E5=BA=93=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.core.yml                       | 27 +++++++++++++++++++
 .../src/main/resources/application-prod.yaml  |  7 +++++
 2 files changed, 34 insertions(+)

diff --git a/docker-compose.core.yml b/docker-compose.core.yml
index a3cafdb..5ab9867 100644
--- a/docker-compose.core.yml
+++ b/docker-compose.core.yml
@@ -155,6 +155,12 @@ services:
       SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD"
       
       ROCKETMQ_NAME_SERVER: 172.17.16.14:9876
+
+      # TDengine
+      TDENGINE_HOST: 172.17.16.14
+      TDENGINE_PORT: 6041
+      TDENGINE_USERNAME: root
+      TDENGINE_PASSWORD: taosdata
       
     volumes:
       - app-logs:/app/logs
@@ -172,6 +178,8 @@ services:
     depends_on:
       viewsh-module-infra-server:
         condition: service_healthy
+      tdengine:
+        condition: service_healthy
 
   viewsh-module-iot-gateway:
     image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-iot-gateway:${IMAGE_TAG:-latest}
@@ -210,3 +218,22 @@ services:
     depends_on:
       viewsh-module-iot-server:
         condition: service_healthy
+
+  tdengine:
+    image: tdengine/tdengine:3.0.1.4
+    container_name: aiot-tdengine
+    restart: always
+    network_mode: host
+    environment:
+      TZ: Asia/Shanghai
+      TAOS_FIRST_EP: "172.17.16.14:6030"
+      TAOS_FQDN: "172.17.16.14"
+    volumes:
+      - ./tdengine/data:/var/lib/taos
+      - ./tdengine/log:/var/log/taos
+    healthcheck:
+      test: ["CMD", "taos", "-s", "show dnodes"]
+      interval: 10s
+      timeout: 5s
+      retries: 12
+      start_period: 30s
diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml
index 417240c..feb82ec 100644
--- a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml
+++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml
@@ -63,6 +63,13 @@ spring:
           url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:127.0.0.1}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
           username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}}
           password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}}
+        tdengine:
+          url: jdbc:TAOS-WS://${TDENGINE_HOST:172.17.16.14}:${TDENGINE_PORT:6041}/aiot_platform
+          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+          username: ${TDENGINE_USERNAME:root}
+          password: ${TDENGINE_PASSWORD:taosdata}
+          druid:
+            validation-query: SELECT SERVER_STATUS()
 
   data:
     redis: