fix

ruoyi-admin/Dockerfile

@@ -18,7 +18,7 @@ ENTRYPOINT ["./start.sh"]
 #EXPOSE 8081
 #ADD ./target/ruoyi-admin.jar ./app.jar
 #ADD ./Shanghai /home/Shanghai
-#ADD start-duty.sh ./start.sh
+#ADD start-system.sh ./start.sh
 #RUN ln -sf /home/Shanghai /etc/localtime \
 #    && echo "Asia/Shanghai" > /etc/timezone
 #RUN chmod +x ./start.sh

ruoyi-admin/docker-build.sh

@@ -7,7 +7,7 @@
 
 # 宿迁内网环境
 docker build -t 10.11.208.18:18080/hses/yjzh_server:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server:v3.1
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_duty:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_duty:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_system_server:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_system_server:v3.1
 #docker build -t 10.11.208.18:18080/hses/yjzh_server_plan:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_plan:v3.1
 #docker build -t 10.11.208.18:18080/hses/yjzh_server_resource:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_resource:v3.1
 #docker build -t 10.11.208.18:18080/hses/yjzh_server_file:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_file:v3.1

ruoyi-admin/nacos/yjzh-sq-prod.yaml

@@ -154,9 +154,9 @@ ruoyi:
     profile: /home/tocc
 
 third:
-    dhAuthorize: http://10.55.134.3:6699/videoService/accounts/authorize # 大华鉴权创建用户会话
-    keepalive: http://10.55.134.3:6699/videoService/accounts/token/keepalive # 大华会话保活
-    dhDeviceTree: http://10.55.134.3:6699/videoService/devicesManager/deviceTree # 大华设备树
+    dhAuthorize: http://10.55.134.3:8314/videoService/accounts/authorize # 大华鉴权创建用户会话
+    keepalive: http://10.55.134.3:8314/videoService/accounts/token/keepalive # 大华会话保活
+    dhDeviceTree: http://10.55.134.3:8314/videoService/devicesManager/deviceTree # 大华设备树
     incidentUrl: https://tocc.jtj.suqian.gov.cn:30030/sqmb/#/status/3/detaillite?id=#incidentId&taskid=#taskId # 移动端待办跳转链接
     incidentDetailUrl: https://tocc.jtj.suqian.gov.cn:30030/sqmb/#/status/3/detail?id=#incidentId # 事件详情页面
     resourceUrl: https://tocc.jtj.suqian.gov.cn:30030/sqmb/#/warehouse/list?taskid=#taskId # 移动端资源跳转链接

ruoyi-admin/nacos/yjzh-sq-test.yaml

@@ -154,9 +154,9 @@ ruoyi:
     profile: /home/tocc
 
 third:
-    dhAuthorize: http://10.55.134.30:8314/videoService/accounts/authorize # 大华鉴权创建用户会话
-    keepalive: http://10.55.134.30:8314/videoService/accounts/token/keepalive # 大华会话保活
-    dhDeviceTree: http://10.55.134.30:8314/videoService/devicesManager/deviceTree # 大华设备树
+    dhAuthorize: http://10.55.134.3:8314/videoService/accounts/authorize # 大华鉴权创建用户会话
+    keepalive: http://10.55.134.3:8314/videoService/accounts/token/keepalive # 大华会话保活
+    dhDeviceTree: http://10.55.134.3:8314/videoService/devicesManager/deviceTree # 大华设备树
     incidentUrl: http://sqmb.xt.wenhq.top:8083/#/status/3/detaillite?id=#incidentId&taskid=#taskId # 移动端待办跳转链接
     incidentDetailUrl: http://sqmb.xt.wenhq.top:8083/#/status/3/detail?id=#incidentId # 事件详情页面
     resourceUrl: http://sqmb.xt.wenhq.top:8083/#/warehouse/list?taskid=#taskId # 移动端资源跳转链接

ruoyi-admin/start-system.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 命令后加入 & ，保持程序后台持续运行
+#脚本所在目录
+SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=YJZH-SYSTEM -Dserver.port=8081 app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+
+# 死循环，保持docker前台运行
+while [[ true ]]; do
+    sleep 1
+done

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DhServiceImpl.java

@@ -161,7 +161,7 @@ public class DhServiceImpl implements IDhService {
         String get = "";
         String token = this.authorize("jtj01", "Dahua@4002", "winpc", Constants.CACHE_DH_FUYONG_TOKEN).get("token");
         try {
-            get = HttpRequest.get("http://10.55.134.30:8314/videoService/devicesManager/searchDevices")
+            get = HttpRequest.get("http://10.55.134.3:8314/videoService/devicesManager/searchDevices")
                 .header("X-Subject-Token", token)
                 .form(param)
                 .timeout(-1)