Browse Source

修改协议为ws

hexiao 2 năm trước cách đây
mục cha
commit
02f3386f40

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

@@ -113,16 +113,16 @@ public class CameraUtil {
      * @return
      */
     public static String getPlayFlv(String cameraCode, String channel, boolean flay) {
-//        if (!flay) {
-//            return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
-//        }
-//        return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
-
-
         if (!flay) {
-            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+            return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
         }
-        return webUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+        return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+
+
+//        if (!flay) {
+//            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+//        }
+//        return webUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
     }
 
     public static String getPlayFlv(String cameraCode, String channel) {

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

@@ -20,8 +20,8 @@ base:
   filePath: /opt/streams/
   historyUrl: http://124.70.58.209:18891
   #  webUrl: http://124.70.58.209:18819
-  webUrl: ws://124.70.58.209:18812
-  bakUrl: ws://124.70.58.209:18891
+  webUrl: http://124.70.58.209:18812
+  bakUrl: http://124.70.58.209:18891
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.71.171.71:18801/picbucket