From 55aeffaa4cecc613e6daaf831a63440034059716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Fri, 10 Jan 2025 19:27:10 +0800
Subject: [PATCH] =?UTF-8?q?netty=E9=87=8D=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  10 +-
 .idea/jarRepositories.xml                     |  10 +
 .idea/misc.xml                                |   1 +
 modules/common/common.iml                     | 119 +----------
 modules/common/target/common-1.0.0.jar        | Bin 19369 -> 27172 bytes
 .../target/maven-archiver/pom.properties      |   2 +-
 .../compile/default-compile/createdFiles.lst  |  14 --
 modules/filter/filter.iml                     | 143 +------------
 modules/filter/target/filter-1.0.0.jar        | Bin 11388 -> 11388 bytes
 .../compile/default-compile/createdFiles.lst  |   8 -
 modules/modules.iml                           | 143 -------------
 web/duoji.iml                                 | 194 +-----------------
 .../com/zhehekeji/web/service/PlcService.java |  10 +-
 .../zhehekeji/web/service/client/Decoder.java |   2 +-
 .../web/service/client/Transmission.java      |   2 +-
 .../web/service/ksec/KsecDecoder.java         |   1 +
 .../web/service/ksec/KsecNettyClient.java     |  26 ++-
 web/src/main/resources/application-prod.yml   |   2 +-
 18 files changed, 53 insertions(+), 634 deletions(-)
 delete mode 100644 modules/modules.iml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 961f114..e121e5c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,19 +11,13 @@
         <module name="duoji" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="common" target="1.8" />
-      <module name="duoji" target="1.8" />
-      <module name="filter" target="1.8" />
-      <module name="modules" target="1.8" />
-      <module name="springbootstart" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="duoji" options="-parameters" />
       <module name="filter" options="-parameters" />
-      <module name="modules" options="" />
+      <module name="modules" options="-parameters" />
+      <module name="springbootstart" options="-parameters" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a67608b..f8885be 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="Nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="nexus" />
       <option name="name" value="Nexus" />
@@ -21,5 +26,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ca8a8f2..ec4bc82 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/modules/common/common.iml b/modules/common/common.iml
index b260a0a..1daccae 100644
--- a/modules/common/common.iml
+++ b/modules/common/common.iml
@@ -1,125 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.9.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.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.28" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.26" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.26" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.26" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.12.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-aop:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.28" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:core:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:base-assembly:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.17" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/modules/common/target/common-1.0.0.jar b/modules/common/target/common-1.0.0.jar
index cbd8128e7bd1b6e8231f830a40bcc651ad2a3424..fa6a975204a8218c88767c3cdbcb4307f655a76d 100644
GIT binary patch
delta 8835
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

delta 1141
zcmZ8gOH30%7@plOW&3auC;=BstL32!!ny?t@=)nPlO{leAQ58QEu}z0#K!?IMnYnu
zL__%xXbiW;SHy!g-bnOdB1VG;jgf-~jU;+NNeuBp#F?F?vTV}bZ~pndZ{~kA`G&bW
z%?RxQ6K6%_fx&opLhx`?<XdyI^uft^x3;0bIQ)&C8m{`UAdJN7o@}Dr%*=xkPr(*v
z=w#|RLWBg<K*4K9G4tB7DTx(WEtqQLKIo_@)2gEiOO=j7wxo&jGP9OBihkvOu~M{D
zbe<E)8Mb>t*Q^<#@@<fv<xXAoJTp^9m&EF*SN^1X`n?Y~oO~TR@|{o_O#w4KdntI)
z<D(#>x0$<)Gfy4q6*-<Dhiy`V!SFHX>Z^s0?`@Sqxwc)dPAN)CsqPpNgrKa*$`UMw
z{nTMs#H&>qx+BdTDI!!xMR*i((8bG$UMXHZNCg4)C<W7MfPy8pMXw!%qayPgm}mjC
zv3YPOYIl<o9KZJD#}tdu9B!MksX56pI|rvd`EWtCz!2vEzK;r$3IE4A2B9@9@)`uo
zW=(Lv&kk*wIUvQTV8@MxKcBH6X+lUg2-bLAP^MkwZ`XLD6O#_(j?@^4RkpPAq|HH`
zX?6!<BKuCjdpqGwOr)_%9GlP8V$Wlui{u#MyS#NczYvd5nZfumF#WYu*U&GrUJuqu
zP~NZmCvdD((!4H8b`sb8X0FtaUdQRj@kRF={3@p6hqPQ4L!;Se@sVFG2$dKpxn2l*
z%PQIf4C^qFe-s_<r?cNi>{wvIcid+X%=@$pEW}-!b7*Ddy%U$SI0MhEf#`08)`5DO
z&BTDnUTT8d15Qn}iHDr&#dfs5o@#=zK^Odt&}OCgFepwh2yvMZOQAuv?&cAh=J8u4
x=icIW<>zd@h}?{+_3n+4AHqJv_-7oi))q{XU?yw@VTczBQ6ZYZx$}N<>OcS6GbjK6

diff --git a/modules/common/target/maven-archiver/pom.properties b/modules/common/target/maven-archiver/pom.properties
index 04c9db5..23b2bca 100644
--- a/modules/common/target/maven-archiver/pom.properties
+++ b/modules/common/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 30 16:26:16 CST 2023
+#Fri Jan 10 11:12:09 CST 2025
 groupId=com.zhehekeji
 artifactId=common
 version=1.0.0
diff --git a/modules/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/modules/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index a98cb50..e69de29 100644
--- a/modules/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/modules/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,14 +0,0 @@
-com\zhehekeji\common\properities\Properity.class
-com\zhehekeji\common\util\FileUtil.class
-com\zhehekeji\common\util\QrUtil.class
-com\zhehekeji\common\util\SpringContextUtil.class
-com\zhehekeji\common\util\PathUtil.class
-com\zhehekeji\common\util\ValidatorUtil.class
-com\zhehekeji\common\properities\Md5Properity.class
-com\zhehekeji\common\util\Tools.class
-META-INF\spring-configuration-metadata.json
-com\zhehekeji\common\properities\RedisProperity.class
-com\zhehekeji\common\constant\CommonConstant.class
-com\zhehekeji\common\util\MD5Util.class
-com\zhehekeji\common\util\HttpUtil.class
-com\zhehekeji\common\CommonConfigure.class
diff --git a/modules/filter/filter.iml b/modules/filter/filter.iml
index 1db8675..1daccae 100644
--- a/modules/filter/filter.iml
+++ b/modules/filter/filter.iml
@@ -1,149 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.9.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.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:core:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.39.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.36" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" 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: redis.clients:jedis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:base-assembly:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.9.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.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.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:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.36" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.36" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.9.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.10.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/modules/filter/target/filter-1.0.0.jar b/modules/filter/target/filter-1.0.0.jar
index 34060618656d6ab282b412c4ba4abf49390db406..dda8a566950a647ab4ec601a29e4e1bdb94735e7 100644
GIT binary patch
delta 471
zcmewp@h5^Wz?+#xgn@yBgQ2=XD{3O&Ru(XQT$zO<0?2<S2c{<rFls;;HjMfZMn0n%
zgz=D3b+W!XI}bAp7tkCa0_vOmkkN#N9mJ4iQUseg*^WsQ!pLSahcK2g*|D@mYDH~+
z!E}vH5X73cSZ+ZyBLl-9Al91vfKOtwwx;OjKb)zI5QVASS<DdDWj<zh2<w*UPN?j3
z@h&Ean5vWqlvOA*g%x5Or&1sbbDdJu<~XI<Of2m{+a~{2X@|&lsM<jor&Nt0o?=wf
zgD{NMETH~XvxhJ?skuQIf7D!H45`U+>RJ#F_oy2}%sQxU31R$GcZV=MHT=Ntn><@1
z62kbQ5dvWZXl6hddo)8K3{kBJ2%}Id2*Nn71=XdZ9SAY7QriLSr^$P@Lm^%g(@6sW
D>3oef

delta 471
zcmewp@h5^Wz?+#xgn@yBgJDW$dc;J&tt?>rxH8N7I3WL>9GIRgz^K788K_{g4WmAU
zk<VxbVLW71ovg3U&cn>Y1vH0&0j%sHqY2AepaGL5nH0e$PPSvxgfOz1%pr_rOm<)s
zHosuH#wG~THf^!of@nqthCe{8HTeOb#AIzv(anE2QyC!&Q@OL4A*{=M%<K@>EzzA&
z+3Dh4Ob{_uDGw;CP-Y4%SZp$<QXoqw&_$c$lx8!5S(E>&v_o9dp=t+VoKiK0_?J;l
z55h23vw-N&SF?vOHmSKm7=P4UU<|3raq3zS5BI1WLd-g-ZV6%hQ+J0jJT?3v8fI%m
zLKr_ZLLiI)%?t=*k7g)@A*vMtVH9cwK^Vuipt@AF10f=n+71w(?9~p1FvN7y0P$9%
AivR!s

diff --git a/modules/filter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/modules/filter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 6257415..e69de29 100644
--- a/modules/filter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/modules/filter/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,8 +0,0 @@
-com\zhehekeji\filter\pojo\SessionHandler.class
-com\zhehekeji\filter\pojo\CurrentUser.class
-com\zhehekeji\filter\pojo\UserType.class
-com\zhehekeji\filter\aspect\SessionAspect.class
-com\zhehekeji\filter\util\CurrentUserUtil.class
-com\zhehekeji\filter\pojo\CurrentUser$CurrentUserBuilder.class
-com\zhehekeji\filter\util\JwtUtil.class
-com\zhehekeji\filter\FilterConstance.class
diff --git a/modules/modules.iml b/modules/modules.iml
deleted file mode 100644
index 1831e3c..0000000
--- a/modules/modules.iml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:base-assembly:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.1.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.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.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:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" 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: redis.clients:jedis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:core:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.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.boot:spring-boot-starter-json:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.36" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.36" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" 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.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/web/duoji.iml b/web/duoji.iml
index 25cde06..1daccae 100644
--- a/web/duoji.iml
+++ b/web/duoji.iml
@@ -1,200 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:base-assembly:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.1.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.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.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:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.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:spring-context-support:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.36" 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.36" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" 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: redis.clients:jedis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.zhehekeji:core:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.50.Final" level="project" />
-    <orderEntry type="module" module-name="filter" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" 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="module-library">
-      <library name="Maven: com.sun.jna:jna:1.0">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/main/resources/libs/jna.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.sun.jna.examples:test:1.0">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/main/resources/libs/examples.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: gnu.io:SerialPort:1.0">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/main/resources/libs/rxtx-2.1.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" 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" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" 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.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.50.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index d2102d7..493872f 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -194,11 +194,11 @@ public class PlcService {
 
     public void orderStop(KsecDataInfo plcCmdInfo) {
         LocalDateTime endTime = LocalDateTime.now();
-        Street street = streetMapper.getStreetByPlcId(plcCmdInfo.getCmdName());
+        Street street = streetMapper.getStreetByPlcId(plcCmdInfo.getSRMNumber());
         if (street == null) {
             return;
         }
-        Order order = orderMapper.getOneByOrderNum(plcCmdInfo.getCmdName()+"_"+plcCmdInfo.getTaskId());
+        Order order = orderMapper.getOneByStreetId(street.getId());
         if (order == null) {
             log.error("订单结束信号，订单不存在，orderNum:{}", plcCmdInfo.getCmdName()+"_"+plcCmdInfo.getTaskId());
             return;
@@ -788,6 +788,7 @@ public class PlcService {
 
 
         Street street = streetService.getStreetByPlcId(dataInfo.getSRMNumber());
+        System.out.println(dataInfo);
         Order order = orderMapper.getOneByStreetId(street.getId());
         try {
         //执行动作
@@ -822,4 +823,9 @@ public class PlcService {
             throw new RuntimeException(e);
         }
     }
+
+    public void upStreet(KsecDataInfo dataInfo) {
+        Street street = streetMapper.list().get(0);
+        dataInfo.setSRMNumber(street.getPlcId());
+    }
 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
index d9a1a82..4c4566e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
+++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
@@ -96,7 +96,7 @@ public class Decoder extends DelimiterBasedFrameDecoder {
             }else if("TP".equals(transmission.getHeader())){
                 //底部拍照
                 Street street = emptyCheckService.getStreet(transmission);
-                Order order = emptyCheckService.visualJudgment(transmission,"BP",street);
+                Order order = emptyCheckService.visualJudgment(transmission,"TP",street);
                 KsecInfo ksecInfo = emptyCheckService.getKSECWriteByOrder(order,street);
                 KsecNettyClient.write(ksecInfo);
 
diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Transmission.java b/web/src/main/java/com/zhehekeji/web/service/client/Transmission.java
index af91587..1d980f3 100644
--- a/web/src/main/java/com/zhehekeji/web/service/client/Transmission.java
+++ b/web/src/main/java/com/zhehekeji/web/service/client/Transmission.java
@@ -39,7 +39,7 @@ public class Transmission {
         }
     }
     public static void main(String[] args) {
-        Transmission t = new Transmission("TP&6&2121&UL062009050111&0&name1&25>");
+        Transmission t = new Transmission("TP&003&3&E:/ccd/tupian/shang/20250110_114141_546832100.png&1&0>");
         System.out.println(t);
     }
     public String getHeader(){
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
index 0eadc2e..dbd7885 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
@@ -92,6 +92,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     return ;
                 }
                 KsecDataInfo dataInfo = ksecInfo.getData();
+                plcService.upStreet(dataInfo);
                 String srmNumber = null;
                 String cmdName = null;
                 if(dataInfo != null){
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
index f2aecd5..38cf6a7 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
@@ -6,10 +6,13 @@ import com.zhehekeji.web.config.ConfigProperties;
 import com.zhehekeji.web.service.PlcService;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
@@ -19,6 +22,7 @@ import javax.annotation.Resource;
 @Component
 public class KsecNettyClient {
 
+    private static final Logger tcpLogger = LoggerFactory.getLogger("tcp");
     private static EventLoopGroup group = new NioEventLoopGroup();
     @Resource
     private PlcService plcService;
@@ -32,6 +36,8 @@ public class KsecNettyClient {
 
     private static Channel channel;
 
+    private Bootstrap client;
+
     public void createClient(ConfigProperties.KSEC ksec) throws InterruptedException {
         String lotnum = FileUtil.getText("lastLotnum");
         if(lotnum != null){
@@ -40,13 +46,28 @@ public class KsecNettyClient {
         if (StringUtils.isEmpty(ksec.getIp()) || ksec.getPort() == null) {
             return;
         }
-        Bootstrap client = new Bootstrap();
+        client = new Bootstrap();
         client.group(group);
         client.channel(NioSocketChannel.class);
         KsecInfo heart = KsecInfo.heart();
         client.handler(new KescFilter(heart, plcService,this));
         // 连接服务端
-        channel = client.connect(ksec.getIp(), ksec.getPort()).sync().channel();
+        //channel = client.connect(ksec.getIp(), ksec.getPort()).sync().channel();
+
+        connect(ksec);
+    }
+    private void connect(ConfigProperties.KSEC ksec) {
+        client.connect(ksec.getIp(), ksec.getPort()).addListener((ChannelFutureListener) future -> {
+            if (future.isSuccess()) {
+                channel = future.channel();
+                System.out.println("Connected to server at " + ksec.getIp()+ ":" + ksec.getPort() );
+            } else {
+                System.err.println("Failed to connect to server, retrying...");
+                future.channel().eventLoop().schedule(()->{
+                    this.connect(ksec);
+                }, 5, java.util.concurrent.TimeUnit.SECONDS);
+            }
+        });
     }
 
     /**
@@ -96,6 +117,7 @@ public class KsecNettyClient {
     public static void write(KsecInfo ksecInfo){
         if(channel != null){
             channel.writeAndFlush(ksecInfo);
+            tcpLogger.info(ksecInfo.toString());
         }else {
             log.error(" no connected upPc");
         }
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index da18d85..08a499d 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/web/src/main/resources/application-prod.yml
@@ -14,7 +14,7 @@ spring:
     testWhileIdle: false
     timeBetweenEvictionRunsMillis: 60000
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/lia_duoji_jinshennogn?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: root
     validationQuery: SELECT 1 FROM DUAL
 # --------本服务端口号