Merge branch 'wvp-28181-2.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue

src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeferredResultEx.java

@@ -0,0 +1,31 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import org.springframework.web.context.request.async.DeferredResult;
+
+public class DeferredResultEx<T> {
+
+    private DeferredResult<T> deferredResult;
+
+    private DeferredResultFilter filter;
+
+    public DeferredResultEx(DeferredResult<T> result) {
+        this.deferredResult = result;
+    }
+
+
+    public DeferredResult<T> getDeferredResult() {
+        return deferredResult;
+    }
+
+    public void setDeferredResult(DeferredResult<T> deferredResult) {
+        this.deferredResult = deferredResult;
+    }
+
+    public DeferredResultFilter getFilter() {
+        return filter;
+    }
+
+    public void setFilter(DeferredResultFilter filter) {
+        this.filter = filter;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeferredResultFilter.java

@@ -0,0 +1,6 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+public interface DeferredResultFilter {
+
+    Object handler(Object o);
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceBaceInfo.java

@@ -0,0 +1,22 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+public class ResourceBaceInfo {
+    private int total;
+    private int online;
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getOnline() {
+        return online;
+    }
+
+    public void setOnline(int online) {
+        this.online = online;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java

@@ -0,0 +1,41 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+public class ResourceInfo {
+
+    private ResourceBaceInfo device;
+    private ResourceBaceInfo channel;
+    private ResourceBaceInfo push;
+    private ResourceBaceInfo proxy;
+
+    public ResourceBaceInfo getDevice() {
+        return device;
+    }
+
+    public void setDevice(ResourceBaceInfo device) {
+        this.device = device;
+    }
+
+    public ResourceBaceInfo getChannel() {
+        return channel;
+    }
+
+    public void setChannel(ResourceBaceInfo channel) {
+        this.channel = channel;
+    }
+
+    public ResourceBaceInfo getPush() {
+        return push;
+    }
+
+    public void setPush(ResourceBaceInfo push) {
+        this.push = push;
+    }
+
+    public ResourceBaceInfo getProxy() {
+        return proxy;
+    }
+
+    public void setProxy(ResourceBaceInfo proxy) {
+        this.proxy = proxy;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java

@@ -0,0 +1,47 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import com.genersoft.iot.vmp.common.VersionPo;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.VersionInfo;
+
+public class SystemConfigInfo {
+
+    private int serverPort;
+    private SipConfig sip;
+    private UserSetting addOn;
+    private VersionPo version;
+
+    public int getServerPort() {
+        return serverPort;
+    }
+
+    public void setServerPort(int serverPort) {
+        this.serverPort = serverPort;
+    }
+
+    public SipConfig getSip() {
+        return sip;
+    }
+
+    public void setSip(SipConfig sip) {
+        this.sip = sip;
+    }
+
+    public UserSetting getAddOn() {
+        return addOn;
+    }
+
+    public void setAddOn(UserSetting addOn) {
+        this.addOn = addOn;
+    }
+
+    public VersionPo getVersion() {
+        return version;
+    }
+
+    public void setVersion(VersionPo version) {
+        this.version = version;
+    }
+}
+

src/main/java/com/genersoft/iot/vmp/vmanager/bean/WVPResult.java

@@ -4,7 +4,7 @@ package com.genersoft.iot.vmp.vmanager.bean;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "统一返回结果")
-public class WVPResult<T> {
+public class WVPResult<T> implements Cloneable{
 
     public WVPResult() {
     }
@@ -63,4 +63,9 @@ public class WVPResult<T> {
     public void setData(T data) {
         this.data = data;
     }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }