From 9aad57b02481686e09f2a25c86c15bd70a28764f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:18:21 +0800
Subject: [PATCH] 执法记录仪同步去除
---
.idea/workspace.xml | 149 ++++++++------------
wvp-pro.iml | 182 ++++++++++++++++++++++++++
src/main/resources/application-test.yml | 4
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 30 ++--
src/main/resources/logback-spring-local.xml | 22 ++-
5 files changed, 272 insertions(+), 115 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index da072b4..dfec153 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -18,9 +18,10 @@
<component name="ChangeListManager">
<list default="true" id="208daac0-1abd-465d-abf2-6a0414be019b" name="默认的" comment="配置提交">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-test.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring-local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring-local.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/wvp-pro.iml" beforeDir="false" afterPath="$PROJECT_DIR$/wvp-pro.iml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,8 +113,8 @@
</method>
</configuration>
<list>
- <item itemvalue="Spring Boot.VManageBootstrap" />
<item itemvalue="Application.Hex" />
+ <item itemvalue="Spring Boot.VManageBootstrap" />
</list>
<recent_temporary>
<list>
@@ -167,6 +168,26 @@
<workItem from="1677660534432" duration="58000" />
<workItem from="1677726051229" duration="38096000" />
<workItem from="1678063078799" duration="44512000" />
+ <workItem from="1679490323634" duration="1413000" />
+ <workItem from="1679563941193" duration="126000" />
+ <workItem from="1680596793283" duration="115000" />
+ <workItem from="1680829200086" duration="12000" />
+ <workItem from="1684921092427" duration="298000" />
+ <workItem from="1685414249687" duration="3818000" />
+ <workItem from="1685428864131" duration="2465000" />
+ <workItem from="1685513729757" duration="1370000" />
+ <workItem from="1685605361294" duration="801000" />
+ <workItem from="1686726606934" duration="849000" />
+ <workItem from="1686903348469" duration="8451000" />
+ <workItem from="1686964248076" duration="1434000" />
+ <workItem from="1687137332219" duration="185000" />
+ <workItem from="1687140662373" duration="6000" />
+ <workItem from="1687141091110" duration="2173000" />
+ <workItem from="1687174390885" duration="2830000" />
+ <workItem from="1687224493645" duration="304000" />
+ <workItem from="1687240699186" duration="276000" />
+ <workItem from="1687249861313" duration="464000" />
+ <workItem from="1687772319116" duration="68000" />
</task>
<task id="LOCAL-00001" summary="默认的">
<created>1676691639632</created>
@@ -282,126 +303,74 @@
<option name="LAST_COMMIT_MESSAGE" value="设备插入修改" />
</component>
<component name="WindowStateProjectService">
- <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1678100334007">
+ <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1686903824574">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1678100334007" />
- <state x="765" y="225" key="#com.intellij.ide.util.MemberChooser" timestamp="1678193398796">
+ <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686903824574" />
+ <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1686965187217">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="765" y="225" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1678193398796" />
- <state x="511" y="442" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1677736409554">
+ <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686965187217" />
+ <state width="1877" height="402" key="GridCell.Tab.0.bottom" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="511" y="442" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1677736409554" />
- <state x="640" y="386" width="639" height="274" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1677740738587">
+ <state width="1877" height="402" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.0.center" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="640" y="386" width="639" height="274" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1040@0.0.1920.1040" timestamp="1677740738587" />
- <state x="184" y="86" key="DiffContextDialog" timestamp="1676946016193">
+ <state width="1877" height="402" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.0.left" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="184" y="86" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1676946016193" />
- <state x="740" y="275" key="FileChooserDialogImpl" timestamp="1677835225799">
+ <state width="1877" height="402" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.0.right" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1677835225799" />
- <state width="1877" height="244" key="GridCell.Tab.0.bottom" timestamp="1678181753747">
+ <state width="1877" height="402" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.1.bottom" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="244" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1678181753747" />
- <state width="1877" height="244" key="GridCell.Tab.0.center" timestamp="1678181753746">
+ <state width="1877" height="402" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.1.center" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="244" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1678181753746" />
- <state width="1877" height="244" key="GridCell.Tab.0.left" timestamp="1678181753746">
+ <state width="1877" height="402" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.1.left" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="244" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1678181753746" />
- <state width="1877" height="244" key="GridCell.Tab.0.right" timestamp="1678181753747">
+ <state width="1877" height="402" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.1.right" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="244" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1678181753747" />
- <state width="1877" height="437" key="GridCell.Tab.1.bottom" timestamp="1678169313836">
+ <state width="1877" height="402" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.2.bottom" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.1.center" timestamp="1678169313836">
+ <state width="1877" height="402" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.2.center" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.1.left" timestamp="1678169313836">
+ <state width="1877" height="402" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.2.left" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.1.right" timestamp="1678169313836">
+ <state width="1877" height="402" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state width="1877" height="402" key="GridCell.Tab.2.right" timestamp="1687772386516">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.2.bottom" timestamp="1678169313836">
+ <state width="1877" height="402" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687772386516" />
+ <state x="644" y="221" key="RollbackChangesDialog" timestamp="1686904469155">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.2.center" timestamp="1678169313836">
+ <state x="644" y="221" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686904469155" />
+ <state x="661" y="252" width="866" height="536" key="find.popup" timestamp="1687177208968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.2.left" timestamp="1678169313836">
+ <state x="661" y="252" width="866" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1687177208968" />
+ <state x="643" y="306" key="git4idea.merge.GitPullDialog" timestamp="1684921113189">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="437" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state width="1877" height="437" key="GridCell.Tab.2.right" timestamp="1678169313836">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state width="1877" height="437" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1678169313836" />
- <state x="184" y="86" key="MergeDialog" timestamp="1678169634470">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="184" y="86" key="MergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1678169634470" />
- <state x="595" y="280" key="MultipleFileMergeDialog" timestamp="1678169636516">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="595" y="280" key="MultipleFileMergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1678169636516" />
- <state x="698" y="221" key="RollbackChangesDialog" timestamp="1671415751049">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="698" y="221" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1671415751049" />
- <state x="461" y="164" key="SettingsEditor" timestamp="1676692121637">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1676692121637" />
- <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1678191963092">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1678191963092" />
- <state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1673925442539">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1673925442539" />
- <state x="122" y="0" width="1402" height="698" maximized="true" key="dock-window-1" timestamp="1678073150799">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="122" y="0" width="1402" height="698" maximized="true" key="dock-window-1/0.0.1920.1040@0.0.1920.1040" timestamp="1678073150799" />
- <state x="661" y="252" width="866" height="536" key="find.popup" timestamp="1678183717780">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="661" y="252" width="866" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1678183717780" />
- <state x="643" y="306" key="git4idea.merge.GitPullDialog" timestamp="1678191884252">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="643" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1678191884252" />
- <state x="716" y="419" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1676692396357">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="716" y="419" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1676692396357" />
- <state x="616" y="240" key="run.anything.popup" timestamp="1677745746270">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1677745746270" />
- <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1677744075205">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1677744075205" />
+ <state x="643" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1684921113189" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index b640b6b..901353b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -185,10 +185,10 @@
deviceChannelMapper.updateChannelSubCount(deviceId,channel.getParentId());
System.out.println("设备名称 = " + channel.getName());
//如果是是执法记录仪
- if (null!=channel.getName() && channel.getName().contains("执法记录仪")){
- //更新执法记录仪信息
- deviceChannelPoliceCameraService.updateChannelPoliceCamera(channel);
- }
+// if (null!=channel.getName() && channel.getName().contains("执法记录仪")){
+// //更新执法记录仪信息
+// deviceChannelPoliceCameraService.updateChannelPoliceCamera(channel);
+// }
}
@Override
@@ -241,13 +241,13 @@
deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex));
//执法记录仪数据新增
// System.out.println("执法记录仪批量新增 ================= ");
- deviceChannelPoliceCameraMapper.batchAdd(addChannels.subList(i, toIndex));
+// deviceChannelPoliceCameraMapper.batchAdd(addChannels.subList(i, toIndex));
}
}else {
deviceChannelMapper.batchAdd(addChannels);
//执法记录仪数据新增
// System.out.println("执法记录仪批量新增 ================= ");
- deviceChannelPoliceCameraMapper.batchAdd(addChannels);
+// deviceChannelPoliceCameraMapper.batchAdd(addChannels);
}
}
if (updateChannels.size() > 0) {
@@ -260,13 +260,13 @@
deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex));
//执法记录仪数据修改
// System.out.println("执法记录仪批量修改 ================= ");
- deviceChannelPoliceCameraMapper.batchUpdate(updateChannels.subList(i, toIndex));
+// deviceChannelPoliceCameraMapper.batchUpdate(updateChannels.subList(i, toIndex));
}
}else {
deviceChannelMapper.batchUpdate(updateChannels);
//执法记录仪数据修改
// System.out.println("执法记录仪批量修改 ================= ");
- deviceChannelPoliceCameraMapper.batchUpdate(updateChannels);
+// deviceChannelPoliceCameraMapper.batchUpdate(updateChannels);
}
}
}
@@ -434,10 +434,10 @@
public int delChannel(String deviceId, String channelId) {
//查询设备信息
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
- if (deviceChannel.getName().contains("执法记录仪")){
- //同时删除执法记录仪信息
- deviceChannelPoliceCameraService.del(deviceId, channelId);
- }
+// if (deviceChannel.getName().contains("执法记录仪")){
+// //同时删除执法记录仪信息
+// deviceChannelPoliceCameraService.del(deviceId, channelId);
+// }
return deviceChannelMapper.del(deviceId, channelId);
}
@@ -556,9 +556,9 @@
*/
@Override
public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
- if (mobilePosition.getDeviceName().contains("执法记录仪")){
- deviceChannelPoliceCameraService.insertNewPositionPoliceCamera(mobilePosition);
- }
+// if (mobilePosition.getDeviceName().contains("执法记录仪")){
+// deviceChannelPoliceCameraService.insertNewPositionPoliceCamera(mobilePosition);
+// }
return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 87d1e44..651ba71 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -45,13 +45,13 @@
#[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
server:
- port: 18085
+ port: 18185
# 作为28181服务器的配置
sip:
monitor-ip: 0.0.0.0
# [必须修改] 本机的IP
- ip: 192.168.0.126
+ ip: 192.168.1.170
# [可选] 28181服务监听的端口
port: 5070
# 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
diff --git a/src/main/resources/logback-spring-local.xml b/src/main/resources/logback-spring-local.xml
index af6184f..2b4cfd0 100644
--- a/src/main/resources/logback-spring-local.xml
+++ b/src/main/resources/logback-spring-local.xml
@@ -70,6 +70,12 @@
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
</encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <!--设置日志级别,过滤掉info日志,只输入error日志-->
+ <level>WARN</level>
+ <!-- <onMatch>ACCEPT</onMatch> <!– 用过滤器，只接受ERROR级别的日志信息，其余全部过滤掉 –>-->
+ <!-- <onMismatch>DENY</onMismatch>-->
+ </filter>
</appender>
@@ -88,9 +94,9 @@
</logger>
<!--记录druid-sql的记录-->
- <logger name="druid.sql.Statement" level="debug" additivity="true">
+ <logger name="druid.sql.Statement" level="warn" additivity="true">
<!--AppenderRef ref="Console"/-->
- <!-- <appender-ref ref="RollingFile"/>-->
+ <appender-ref ref="RollingFile"/>
<appender-ref ref="RollingFileError"/>
<appender-ref ref="druidSqlRollingFile"/>
</logger>
@@ -104,10 +110,10 @@
</logger>
<!--gb28181包日志的记录-->
- <logger name="com.genersoft.iot.vmp.netty" level="info" additivity="true">
- <!--AppenderRef ref="Console"/-->
- <appender-ref ref="RollingFile"/>
- <appender-ref ref="RollingFileError"/>
- <appender-ref ref="druidSqlRollingFile"/>
- </logger>
+<!-- <logger name="com.genersoft.iot.vmp.netty" level="info" additivity="true">-->
+<!-- <!–AppenderRef ref="Console"/–>-->
+<!-- <appender-ref ref="RollingFile"/>-->
+<!-- <appender-ref ref="RollingFileError"/>-->
+<!-- <appender-ref ref="druidSqlRollingFile"/>-->
+<!-- </logger>-->
</configuration>
\ No newline at end of file
diff --git a/wvp-pro.iml b/wvp-pro.iml
index d11f50f..767aee1 100644
--- a/wvp-pro.iml
+++ b/wvp-pro.iml
@@ -389,5 +389,187 @@
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.53.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.11.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.39" level="project" />
+ <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.39" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.1" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.22" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.32.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+ <orderEntry type="library" name="Maven: javax.sip:jain-sip-ri:1.3.0-91" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.35" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.0" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:4.9.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
+ <orderEntry type="library" name="Maven: com.burgstaller:okhttp-digest:2.1" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.kxml:kxml2:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.mitre.dsmiley.httpproxy:smiley-http-proxy-servlet:1.12" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.0.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+ <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
+ <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.10.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.3.1.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.3" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.3" level="project" />
+ <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.3" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.3" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.3" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.3" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.13.1" level="project" />
+ <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
+ <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.17" level="project" />
+ <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.17" level="project" />
+ <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+ <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.10.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.9.3