添加云端录像功能

src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java

@@ -51,6 +51,9 @@ public class MediaConfig {
     @Value("${media.rtp.portRange}")
     private String rtpPortRange;
 
+    @Value("${media.recordAssistPort}")
+    private int recordAssistPort;
+
     public String getIp() {
         return ip;
     }
@@ -174,4 +177,12 @@ public class MediaConfig {
     public void setRtspSSLPort(String rtspSSLPort) {
         this.rtspSSLPort = rtspSSLPort;
     }
+
+    public int getRecordAssistPort() {
+        return recordAssistPort;
+    }
+
+    public void setRecordAssistPort(int recordAssistPort) {
+        this.recordAssistPort = recordAssistPort;
+    }
 }

src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java

@@ -0,0 +1,60 @@
+package com.genersoft.iot.vmp.conf;
+
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.mitre.dsmiley.httpproxy.ProxyServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.util.Locale;
+
+
+@Configuration
+public class ProxyServletConfig {
+
+    private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
+
+    @Autowired
+    private MediaConfig mediaConfig;
+
+    @Bean
+    public ServletRegistrationBean zlmServletRegistrationBean(){
+        String ip = StringUtils.isEmpty(mediaConfig.getWanIp())? mediaConfig.getIp(): mediaConfig.getWanIp();
+        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZLMProxySerlet(),"/zlm/*");
+        servletRegistrationBean.setName("zlm_Proxy");
+        servletRegistrationBean.addInitParameter("targetUri", String.format("http://%s:%s", ip, mediaConfig.getHttpPort()));
+        if (logger.isDebugEnabled()) {
+            servletRegistrationBean.addInitParameter("log", "true");
+        }
+        return servletRegistrationBean;
+    }
+
+    class  ZLMProxySerlet extends ProxyServlet{
+        @Override
+        protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResonse, Exception e){
+            System.out.println(e.getMessage());
+            try {
+                super.handleRequestException(proxyRequest, proxyResonse, e);
+            } catch (ServletException servletException) {
+                logger.error("zlm 代理失败： ", e);
+            } catch (IOException ioException) {
+                if (ioException instanceof ConnectException) {
+                    logger.error("zlm 连接失败");
+                }else {
+                    logger.error("zlm 代理失败： ", e);
+                }
+            } catch (RuntimeException exception){
+                logger.error("zlm 代理失败： ", e);
+            }
+        }
+    }
+
+}

src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java

@@ -43,7 +43,6 @@ public class RedisConfig extends CachingConfigurerSupport {
 	 * 通过反射技术调用消息订阅处理器的相关方法进行一些业务处理
 	 * 
 	 * @param connectionFactory
-	 * @param listenerAdapter
 	 * @return
 	 */
 	@Bean

src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java

@@ -8,11 +8,53 @@ public class UserSetup {
     @Value("${userSettings.savePositionHistory}")
     boolean savePositionHistory;
 
+    @Value("${userSettings.autoApplyPlay}")
+    private boolean autoApplyPlay;
+
+    @Value("${userSettings.seniorSdp}")
+    private boolean seniorSdp;
+
+    @Value("${userSettings.playTimeout}")
+    private long playTimeout;
+
+    @Value("${userSettings.waitTrack}")
+    private boolean waitTrack;
+
+    @Value("${userSettings.interfaceAuthentication}")
+    private boolean interfaceAuthentication;
+
+    @Value("${userSettings.recordPushLive}")
+    private boolean recordPushLive;
+
     public boolean getSavePositionHistory() {
         return savePositionHistory;
     }
 
-    public void setSavePositionHistory(boolean savePositionHistory) {
-        this.savePositionHistory = savePositionHistory;
+    public boolean isSavePositionHistory() {
+        return savePositionHistory;
+    }
+
+    public boolean isAutoApplyPlay() {
+        return autoApplyPlay;
+    }
+
+    public boolean isSeniorSdp() {
+        return seniorSdp;
+    }
+
+    public long getPlayTimeout() {
+        return playTimeout;
+    }
+
+    public boolean isWaitTrack() {
+        return waitTrack;
+    }
+
+    public boolean isInterfaceAuthentication() {
+        return interfaceAuthentication;
+    }
+
+    public boolean isRecordPushLive() {
+        return recordPushLive;
     }
 }

src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.conf.security;
 
+import com.genersoft.iot.vmp.conf.UserSetup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -22,8 +23,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Value("${userSettings.interfaceAuthentication}")
-    private boolean interfaceAuthentication;
+    @Autowired
+    private UserSetup userSetup;
 
     @Autowired
     private DefaultUserDetailsServiceImpl userDetailsService;
@@ -71,7 +72,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     public void configure(WebSecurity web) {
 
-        if (!interfaceAuthentication) {
+        if (!userSetup.isInterfaceAuthentication()) {
             web.ignoring().antMatchers("**");
         }else {
             // 可以直接访问的静态数据