修改 thingsboard 部署

.devops/config.yaml

@@ -208,3 +208,26 @@ repositories:
     artifact_path: target/*.jar
     docker_path: docker/ruoyi/modules/media/jar
     docker_service: tuoheng-modules-media
+
+  # WVP 后端服务
+  - name: wvp-pro
+    url: http://th.local.t-aaron.com:13000/THENG/a-wvp-java.git
+    path: wvpjar
+    type: java
+    build_commands:
+      - mvn clean package -DskipTests
+    artifact_path: target/*.jar
+    docker_path: docker/wvp/wvpjar/jar
+    docker_service: wvp-pro
+
+  # WVP 前端服务
+  - name: wvp-web
+    url: http://th.local.t-aaron.com:13000/THENG/a-wvp-web.git
+    path: wvpweb
+    type: nodejs
+    build_commands:
+      - npm install
+      - npm run build:prod
+    artifact_path: dist
+    docker_path: docker/wvp/web/html/dist
+    docker_service: wvp-web

.gitignore

@@ -56,6 +56,8 @@ docker/minio/data/
 docker/minio/config/
 docker/nginx/html/dist/*
 !docker/nginx/html/dist/.gitkeep
+docker/wvp/web/html/dist/*
+!docker/wvp/web/html/dist/.gitkeep
 runtime/*
 !runtime/.gitkeep
 *.jar

docker/copy.sh

@@ -63,5 +63,8 @@ echo "begin copy tuoheng-media "
 cp ../ruoyi-modules/tuoheng-media/target/tuoheng-media.jar ./ruoyi/modules/media/jar
 
 
-echo "begin copy wvp-jar "
+echo "begin copy wvp-jar"
 cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar
+
+echo "begin copy wvp-web"
+cp -r ../wvpweb/dist/* ./wvp/web/html/dist/

docker/deploy.sh

@@ -50,7 +50,9 @@ docker-compose build --no-cache tuoheng-modules-airline && docker-compose up -d
 docker-compose build --no-cache tuoheng-modules-task && docker-compose up -d tuoheng-modules-task
 docker-compose build --no-cache tuoheng-modules-fms && docker-compose up -d tuoheng-modules-fms
 docker-compose build --no-cache tuoheng-modules-media && docker-compose up -d tuoheng-modules-media
+# cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar/
 docker-compose build --no-cache wvp-pro && docker-compose up -d wvp-pro
+docker-compose build --no-cache wvp-web && docker-compose up -d wvp-web
 
 # 关闭所有环境/模块
 stop(){
@@ -84,3 +86,14 @@ case "$1" in
 	usage
 ;;
 esac
+
+
+#  cd /Users/sunpeng/workspace/hyf_project/RuoYi-Cloud/wvpweb
+#
+#  # 1. 安装依赖（如果还没安装）
+#  npm install
+#
+#  # 2. 生产环境打包
+#  npm run build:prod
+#
+#  打包完成后，生成的文件会在 dist 目录中。

docker/docker-compose.yml

@@ -301,8 +301,38 @@ services:
       dockerfile: dockerfile
     environment:
       - TZ=Asia/Shanghai
+      # Redis 配置
+      - REDIS_HOST=ruoyi-redis
+      - REDIS_PORT=6379
+      # MySQL 数据库配置
+      - DATABASE_HOST=ruoyi-mysql
+      - DATABASE_PORT=3306
+      - DATABASE_USER=ylcx
+      - DATABASE_PASSWORD=Tuoheng@2025
+      # SIP 配置
+      - SIP_ShowIP=127.0.0.1
+      - SIP_Port=5060
+      - SIP_Domain=3502000000
+      - SIP_Id=35020000002000000001
+      - SIP_Password=wvp_sip_password
+      # ZLM 媒体服务器配置
+      - ZLM_HOST=zlmediakit
+      - ZLM_HOOK_HOST=wvp-pro
+      - ZLM_SERCERT=fgVdaI75GcSBPeSBvg8NL7aRrlkCtGPv
+      # 流媒体地址配置
+      - Stream_IP=127.0.0.1
+      - SDP_IP=127.0.0.1
+      # 流媒体端口配置
+      - MediaHttp=9090
+      - MediaHttps=
+      - MediaRtp=10000
+      - MediaRtmp=1935
+      - MediaRtsp=8554
+      # 录像配置
+      - RecordPushLive=false
+      - RecordSip=false
     ports:
-      - "18080:18080"
+      - "18080:18978"
       - "5060:5060/udp"
 #      - "6379:6379"
     volumes:
@@ -331,3 +361,56 @@ services:
       - "8000:8000/udp"    # WebRTC UDP
       - "9900:9000/udp"    # WebRTC UDP (注意：与 minio 9000 端口冲突，可能需要调整)
     restart: unless-stopped
+  wvp-web:
+    container_name: wvp-web
+    image: wvp-web-runtime
+    build:
+      context: ./wvp/web
+    environment:
+      - TZ=Asia/Shanghai
+    ports:
+      - "28181:80"
+    volumes:
+      - ./wvp/web/html/dist:/home/ruoyi/projects/wvp-ui
+      - ./wvp/web/conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./wvp/web/logs:/var/log/nginx
+      - ./wvp/web/conf.d:/etc/nginx/conf.d
+    depends_on:
+      - 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/wvp/web/conf/nginx.conf

@@ -0,0 +1,69 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        # WVP 后端 API 代理（优先匹配）
+        location /api/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://wvp-pro:18978;
+        }
+
+        # 后端静态资源代理（快照图片等，来自后端服务）
+        location /snap/ {
+            proxy_pass http://wvp-pro:18978;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        # WebSocket 代理支持
+        location /ws/ {
+            proxy_pass http://wvp-pro:18978;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        # 前端静态资源（CSS、JS、图片等）
+        location /static/ {
+            root   /home/ruoyi/projects/wvp-ui;
+            expires 30d;
+            access_log off;
+        }
+
+        # 前端页面（最后匹配）
+        location / {
+            root   /home/ruoyi/projects/wvp-ui;
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+
+        # 避免actuator暴露
+        if ($uri ~ "/actuator") {
+            return 403;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}

docker/wvp/web/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM registry.t-aaron.com/nginx:latest
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi/projects/wvp-ui
+# 创建目录
+RUN mkdir -p /home/ruoyi/projects/wvp-ui
+# 指定路径
+WORKDIR /home/ruoyi/projects/wvp-ui
+# 复制conf文件到路径
+COPY ./conf/nginx.conf /etc/nginx/nginx.conf
+# 复制html文件到路径
+COPY ./html/dist /home/ruoyi/projects/wvp-ui

docker/wvp/wvpjar/dockerfile

@@ -3,8 +3,6 @@ FROM  registry.t-aaron.com/eclipse-temurin:21.0.9_10-jre-alpine-3.23
 # author
 MAINTAINER ruoyi
 
-# 挂载目录
-VOLUME /home/ruoyi
 # 创建目录
 RUN mkdir -p /home/ruoyi
 # 指定路径

wvpjar

@@ -1 +1 @@
-Subproject commit d07950cecde5e39d75068e9c17a367d59014c629
+Subproject commit 4d0a1f269aa70b6961d048b1ef1f7e66450ca1e7