Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0

src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java

@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp;
 
 import java.util.logging.LogManager;
 
+import com.genersoft.iot.vmp.conf.druid.EnableDruidSupport;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -17,6 +18,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
 @SpringBootApplication
 @EnableScheduling
 @EnableOpenApi
+@EnableDruidSupport
 public class VManageBootstrap extends LogManager {
 	private static String[] args;
 	private static ConfigurableApplicationContext context;

src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java

@@ -0,0 +1,64 @@
+package com.genersoft.iot.vmp.conf.druid;
+
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+
+/**
+ * druid监控配置
+ * @author
+ */
+public class DruidConfiguration  {
+
+    @Value("${rj-druid-manage.allow:127.0.0.1}")
+    private String allow;
+
+    @Value("${rj-druid-manage.deny:}")
+    private String deny;
+
+    @Value("${rj-druid-manage.loginUsername:admin}")
+    private String loginUsername;
+
+    @Value("${rj-druid-manage.loginPassword:admin}")
+    private String loginPassword;
+
+    @Value("${rj-druid-manage.resetEnable:false}")
+    private String resetEnable;
+
+    /**
+     * druid监控页面开启
+     */
+    @Bean
+    public ServletRegistrationBean druidServlet() {
+        ServletRegistrationBean<Servlet> servletRegistrationBean = new ServletRegistrationBean<>(new StatViewServlet(), "/druid/*");
+        // IP白名单
+        servletRegistrationBean.addInitParameter("allow", allow);
+        // IP黑名单(共同存在时，deny优先于allow)
+        servletRegistrationBean.addInitParameter("deny", deny);
+        //控制台管理用户
+        servletRegistrationBean.addInitParameter("loginUsername", loginUsername);
+        servletRegistrationBean.addInitParameter("loginPassword", loginPassword);
+        //是否能够重置数据 禁用HTML页面上的“Reset All”功能
+        servletRegistrationBean.addInitParameter("resetEnable", resetEnable);
+        return servletRegistrationBean;
+    }
+
+    /**
+     * druid url监控配置
+     */
+    @Bean
+    public FilterRegistrationBean filterRegistrationBean() {
+        FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>(new WebStatFilter());
+        filterRegistrationBean.addUrlPatterns("/*");
+        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+        return filterRegistrationBean;
+    }
+
+
+}

src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java

@@ -0,0 +1,24 @@
+package com.genersoft.iot.vmp.conf.druid;
+
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
+
+/**
+ * druid监控支持注解
+ *
+ * @author
+ * {@link DruidConfiguration} druid监控页面安全配置支持
+ * {@link ServletComponentScan} druid监控页面需要扫描servlet
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@Import({
+        DruidConfiguration.class,
+})
+@ServletComponentScan
+public @interface EnableDruidSupport {
+}

src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java

@@ -3,7 +3,7 @@ package com.genersoft.iot.vmp.storager.dao;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import org.apache.ibatis.annotations.*;
-import org.omg.PortableInterceptor.INACTIVE;
+// import org.omg.PortableInterceptor.INACTIVE;
 import org.springframework.stereotype.Repository;
 
 import java.util.Collection;