Merge remote-tracking branch 'origin/main'

.devops/config.yaml

@@ -44,10 +44,6 @@ infrastructure:
     docker_service: ruoyi-nacos
     wait_time: 20  # Nacos 需要等待 MySQL 就绪
 
-  - name: thingsboard-postgres
-    docker_service: thingsboard-postgres
-    wait_time: 20  # PostgreSQL 需要时间初始化
-
   - name: zlmediakit
     docker_service: zlmediakit
     wait_time: 10  # 流媒体服务器启动较快
@@ -66,10 +62,6 @@ infrastructure:
       - cp -r wvpweb/dist docker/wvp/web/html/dist
     wait_time: 10  # Nginx 启动较快
 
-  - name: thingsboard-ce
-    docker_service: thingsboard-ce
-    wait_time: 40  # ThingsBoard 需要等待 PostgreSQL 并初始化
-
 # Git 仓库配置
 repositories:
   # 认证服务

docker/docker-compose.yml

@@ -381,38 +381,3 @@ services:
       - wvp-pro
     links:
       - wvp-pro
-  thingsboard-postgres:
-    container_name: thingsboard-postgres
-    image: registry.t-aaron.com/postgres:16
-    restart: always
-    environment:
-      - TZ=Asia/Shanghai
-      - POSTGRES_DB=thingsboard
-      - POSTGRES_PASSWORD=postgres
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./thingsboard/postgres-data:/var/lib/postgresql/data
-  thingsboard-ce:
-    container_name: thingsboard-ce
-    image: registry.t-aaron.com/thingsboard/tb-node:4.2.1.1
-    restart: always
-    environment:
-      - TZ=Asia/Shanghai
-      - TB_SERVICE_ID=tb-ce-node
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://thingsboard-postgres:5432/thingsboard
-    ports:
-      - "18081:8080"
-      - "7070:7070"
-      - "1883:1883"
-      - "8883:8883"
-      - "5683-5688:5683-5688/udp"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "10"
-    depends_on:
-      - thingsboard-postgres
-    links:
-      - thingsboard-postgres

docker/thingsboard/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     restart: always
     image: "registry.t-aaron.com/thingsboard/tb-node:4.2.1.1"
     ports:
-      - "18080:8080"
+      - "28080:8080"
       - "7070:7070"
       - "1883:1883"
       - "8883:8883"

docker/thingsboard/reademe.md

@@ -1,5 +1,7 @@
 会加入ruoyi的默认网络docker_default
-
+docker-compose down -v
+#docker volume rm tb-postgres-data
+#docker network create docker_default
 #第一次的时候执行这个
 docker-compose run --rm -e INSTALL_TB=true -e LOAD_DEMO=true thingsboard-ce
 docker-compose up -d