hexiao 1 rok temu
rodzic
commit
ade0dd8c0e

+ 2 - 0
hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -31,5 +31,7 @@ public class CaneraConfig {
     @Value("${base.bakUrl:http://124.70.58.209:18891}")
     private String bakUrl;
 
+    @Value("${base.wsUrl:http://124.70.58.209:18891}")
+    private String wsUrl;
 
 }

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

@@ -60,6 +60,7 @@ public class CameraUtil {
     private static String transcribeFilePath;
     private static String webUrl;
     private static String bakUrl;
+    private static String wsUrl;
     private static CmdCameraUtil cUtil;
     private static RedisCache rc;
     private static ServerConfig sc;
@@ -780,6 +781,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         cUtil = cmdCameraUtil;
         rc = redisCache;
         sc = serverConfig;
+        wsUrl = caneraConfig.getWsUrl();
     }
 
 

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

@@ -19,8 +19,8 @@ base:
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/
   webUrl: http://124.70.58.209:18812
-  #  bakUrl: http://124.70.58.209:18891
-  bakUrl: ws://124.70.58.209:9080
+  bakUrl: http://124.70.58.209:18891
+  wsUrl: ws://124.70.58.209:9080
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.71.171.71:18801/picbucket