Merge pull request #1990 from kairlec/master

fix: remove conflicting files `AblUrls.java` on Windows

src/main/java/com/genersoft/iot/vmp/media/abl/bean/ABLUrls.java

@@ -17,5 +17,8 @@ public class ABLUrls {
     @JSONField(name = "http-mp4")
     private String httpMp4;
 
+    @JSONField(name = "http-hls")
+    private String httpHls;
+
     private String download;
 }

src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblUrls.java

@@ -1,58 +0,0 @@
-package com.genersoft.iot.vmp.media.abl.bean;
-
-public class AblUrls {
-    private String rtsp;
-    private String rtmp;
-    private String httpFlv;
-    private String wsFlv;
-    private String httpMp4;
-    private String httpHls;
-
-    public String getRtsp() {
-        return rtsp;
-    }
-
-    public void setRtsp(String rtsp) {
-        this.rtsp = rtsp;
-    }
-
-    public String getRtmp() {
-        return rtmp;
-    }
-
-    public void setRtmp(String rtmp) {
-        this.rtmp = rtmp;
-    }
-
-    public String getHttpFlv() {
-        return httpFlv;
-    }
-
-    public void setHttpFlv(String httpFlv) {
-        this.httpFlv = httpFlv;
-    }
-
-    public String getWsFlv() {
-        return wsFlv;
-    }
-
-    public void setWsFlv(String wsFlv) {
-        this.wsFlv = wsFlv;
-    }
-
-    public String getHttpMp4() {
-        return httpMp4;
-    }
-
-    public void setHttpMp4(String httpMp4) {
-        this.httpMp4 = httpMp4;
-    }
-
-    public String getHttpHls() {
-        return httpHls;
-    }
-
-    public void setHttpHls(String httpHls) {
-        this.httpHls = httpHls;
-    }
-}

src/main/java/com/genersoft/iot/vmp/media/abl/bean/hook/OnStreamArriveABLHookParam.java

@@ -1,6 +1,6 @@
 package com.genersoft.iot.vmp.media.abl.bean.hook;
 
-import com.genersoft.iot.vmp.media.abl.bean.AblUrls;
+import com.genersoft.iot.vmp.media.abl.bean.ABLUrls;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -108,5 +108,5 @@ public class OnStreamArriveABLHookParam extends ABLHookParam{
     private Integer audioBitrate;
 
 
-    private AblUrls url;
+    private ABLUrls url;
 }