From c8b9e590efaf5e7a10724b5f26f14de741e3c8a7 Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: Thu, 24 Feb 2022 19:02:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96--?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AC=E5=9C=B0=E7=9A=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?druid=E7=9A=84sql=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=92=8C=E7=9B=91=E6=8E=A7=E9=9D=A2=E6=9D=BF=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9druid=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../genersoft/iot/vmp/VManageBootstrap.java | 2 + .../vmp/conf/druid/DruidConfiguration.java | 64 +++++++++++++ .../vmp/conf/druid/EnableDruidSupport.java | 24 +++++ src/main/resources/logback-spring-local.xml | 90 +++++++++++++++++++ 5 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java create mode 100644 src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java create mode 100644 src/main/resources/logback-spring-local.xml diff --git a/pom.xml b/pom.xml index f1ac4581..809d8dbe 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,8 @@ com.alibaba - druid - 1.2.3 + druid-spring-boot-starter + 1.1.22 diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java index bfe58419..9dacbade 100644 --- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java +++ b/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; diff --git a/src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java b/src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java new file mode 100644 index 00000000..12f6e636 --- /dev/null +++ b/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 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 filterRegistrationBean = new FilterRegistrationBean<>(new WebStatFilter()); + filterRegistrationBean.addUrlPatterns("/*"); + filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"); + return filterRegistrationBean; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java b/src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java new file mode 100644 index 00000000..5fd710be --- /dev/null +++ b/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 { +} diff --git a/src/main/resources/logback-spring-local.xml b/src/main/resources/logback-spring-local.xml new file mode 100644 index 00000000..6d818420 --- /dev/null +++ b/src/main/resources/logback-spring-local.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + + + + + + + ${LOG_HOME}/wvp-%d{yyyy-MM-dd}.%i.log + + 30 + 20MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + + INFO + + + + + + + + + ${LOG_HOME}/error-%d{yyyy-MM-dd}.%i.log + + 30 + 20MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + WARN + + + + + + + + + + ${LOG_HOME}/druid-%d{yyyy-MM-dd}.%i.log + + 30 + 50MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7852c4fde736fddef780e87e831a70932acdb439 Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: Sun, 9 Jan 2022 09:30:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?research--local=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 99 ++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 src/main/resources/application-local.yml diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 00000000..e7e689b4 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,99 @@ +spring: + # REDIS数据库配置 + redis: + # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 + host: 127.0.0.1 + # [必须修改] 端口号 + port: 6379 + # [可选] 数据库 DB + database: 6 + # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 + password: + # [可选] 超时时间 + timeout: 10000 + # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 + datasource: + # 使用mysql 打开23-28行注释， 删除29-36行 + name: wvp + url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false + username: root + password: root123 + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver +# name: eiot +# url: jdbc:sqlite::resource:wvp.sqlite +# username: +# password: +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: org.sqlite.JDBC +# journal_mode: WAL +# synchronous: NORMAL +# transaction_mode: IMMEDIATE +# max-active: 1 +# min-idle: 1 + +# [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 +server: + port: 18080 + +# 作为28181服务器的配置 +sip: + # [必须修改] 本机的IP + ip: 192.168.118.212 + # [可选] 28181服务监听的端口 + port: 5060 + # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） + # 后两位为行业编码，定义参照附录D.3 + # 3701020049标识山东济南历下区 信息行业接入 + # [可选] + domain: 4401020049 + # [可选] + id: 44010200492000000001 + # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 + password: admin123 + +#zlm 默认服务器配置 +media: + # [必须修改] zlm服务器的内网IP + ip: 127.0.0.1 + # [必须修改] zlm服务器的http.port + http-port: 80 + # [可选] zlm服务器的hook.admin_params=secret + secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc + # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 + rtp: + # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输 + enable: true + # [可选] 在此范围内选择端口用于媒体流传输, + port-range: 30000,30500 # 端口范围 + # [可选] 国标级联在此范围内选择端口发送媒体流, + send-port-range: 30000,30500 # 端口范围 + # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用 + record-assist-port: 18081 +# [可选] 日志配置, 一般不需要改 +logging: + file: + name: logs/wvp.log + max-history: 30 + max-size: 10MB + total-size-cap: 300MB + level: + com.genersoft.iot: debug + com.genersoft.iot.vmp.storager.dao: info + com.genersoft.iot.vmp.gb28181: info + +# [根据业务需求配置] +user-settings: + # 推流直播是否录制 + record-push-live: true + auto-apply-play: false + +# 在线文档： swagger-ui（生产环境建议关闭） +swagger-ui: + enabled: true + +# 版本信息， 不需修改 +version: + version: "@project.version@" + description: "@project.description@" + artifact-id: "@project.artifactId@" From e0f8acf09f70fdbcf0d8dd912d70cfc6f27bcef6 Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: Wed, 9 Feb 2022 09:37:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0git=E7=9A=84=E5=BF=BD?= =?UTF-8?q?=E7=95=A5logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 51ebf9e9..21f40064 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # Log file *.log - +logs/* # BlueJ files *.ctxt From 777f2e21217fcc4ee3a946cc071602da8b977258 Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: Fri, 25 Feb 2022 09:54:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6local=E7=9A=84mysql=E8=BF=9E=E6=8E=A5=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 74 ++++++++++++++---------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index e7e689b4..9a109520 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -11,35 +11,54 @@ spring: password: # [可选] 超时时间 timeout: 10000 - # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 + # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 + # mysql数据源 datasource: - # 使用mysql 打开23-28行注释， 删除29-36行 - name: wvp - url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false - username: root - password: root123 - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver -# name: eiot -# url: jdbc:sqlite::resource:wvp.sqlite -# username: -# password: -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: org.sqlite.JDBC -# journal_mode: WAL -# synchronous: NORMAL -# transaction_mode: IMMEDIATE -# max-active: 1 -# min-idle: 1 + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false + username: root + password: root123 + druid: + initialSize: 10 # 连接池初始化连接数 + maxActive: 200 # 连接池最大连接数 + minIdle: 5 # 连接池最小空闲连接数 + maxWait: 60000 # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，如果需要可以通过配置useUnfairLock属性为true使用非公平锁。 + keepAlive: true # 连接池中的minIdle数量以内的连接，空闲时间超过minEvictableIdleTimeMillis，则会执行keepAlive操作。 + validationQuery: select 1 # 检测连接是否有效sql，要求是查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。 + testWhileIdle: true # 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 + testOnBorrow: false # 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + testOnReturn: false # 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + poolPreparedStatements: false # 是否開啟PSCache，並且指定每個連線上PSCache的大小 + timeBetweenEvictionRunsMillis: 60000 # 配置間隔多久才進行一次檢測，檢測需要關閉的空閒連線，單位是毫秒 + minEvictableIdleTimeMillis: 300000 # 配置一個連線在池中最小生存的時間，單位是毫秒 + filters: stat,wall,slf4j # 配置监控统计拦截的filters，监控统计用的filter:sta, 日志用的filter:log4j, 防御sql注入的filter:wall + useGlobalDataSourceStat: true # 合并多个DruidDataSource的监控数据 + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000 + #stat-view-servlet.url-pattern: /admin/druid/* -# [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 + # druid管理监控页面的一些配置 +rj-druid-manage: + allow: # 访问druid监控页面的IP白名单 + deny: 192.168.1.100 # 访问druid监控页面IP黑名单 + loginUsername: rjAdmin # 访问druid监控页面账号 + loginPassword: rj@2022 # 访问druid监控页面密码 + resetEnable: false # 是否能够重置数据 禁用HTML页面上的“Reset All”功能 +#mybatis: +# configuration: +# # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# # 返回类型为Map,显示null对应的字段 +# call-setters-on-nulls: true +## [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 server: port: 18080 # 作为28181服务器的配置 sip: # [必须修改] 本机的IP - ip: 192.168.118.212 + ip: 192.168.118.70 # [可选] 28181服务监听的端口 port: 5060 # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） @@ -55,7 +74,7 @@ sip: #zlm 默认服务器配置 media: # [必须修改] zlm服务器的内网IP - ip: 127.0.0.1 + ip: 192.168.118.70 # [必须修改] zlm服务器的http.port http-port: 80 # [可选] zlm服务器的hook.admin_params=secret @@ -72,15 +91,8 @@ media: record-assist-port: 18081 # [可选] 日志配置, 一般不需要改 logging: - file: - name: logs/wvp.log - max-history: 30 - max-size: 10MB - total-size-cap: 300MB - level: - com.genersoft.iot: debug - com.genersoft.iot.vmp.storager.dao: info - com.genersoft.iot.vmp.gb28181: info + config: classpath:logback-spring-local.xml + # [根据业务需求配置] user-settings: From f52be3039975b41f24f8df02b71b60911aa7c63a Mon Sep 17 00:00:00 2001 From: walkTtalk Date: Sat, 26 Feb 2022 00:01:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Fix=20issue=20#347:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/control.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue index bc6ac5ea..49280778 100644 --- a/web_src/src/components/control.vue +++ b/web_src/src/components/control.vue @@ -21,11 +21,11 @@
- + - + @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ 查看 - {{value}} + {{value}}
@@ -75,7 +75,7 @@ - + @@ -88,7 +88,7 @@ - + From bb1fada32cdd9c563c3c526d39adbaabbc6a1b2b Mon Sep 17 00:00:00 2001 From: SaltFish <42058801+SaltFish001@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:33:04 +0800 Subject: [PATCH 6/6] Update StreamPushMapper.java --- .../com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java index 594c319e..909d3a8b 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java +++ b/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;