hexiao преди 1 година
родител
ревизия
d222f958e5
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
  2. 1 1
      hazard-admin/src/main/resources/application.yml

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -784,7 +784,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         rc = redisCache;
         sc = serverConfig;
         wsUrl = caneraConfig.getWsUrl();
-        recordUrl = caneraConfig.getWsUrl();
+        recordUrl = caneraConfig.getRecordUrl();
     }
 
 

+ 1 - 1
hazard-admin/src/main/resources/application.yml

@@ -25,7 +25,7 @@ base:
   wsUrl: ws://183.236.39.220:9080
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://${server-ip}:18801/picbucket
-  recordUrl: http://183.236.39.220:8083
+  recordUrl: http://183.236.39.220:8083${server.servlet.context-path}
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080