1.登录和修改密码接口对接完毕

3c5affeb · leyboy · e94771ec · 3c5affeb · 3c5affeb · e94771ec
Commit 3c5affeb authored Sep 07, 2018 by leyboy
19 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,12 +6,26 @@
    </artifacts-to-build>
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" />
+    <list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="1.ZnksServer完成,接受客户端解码未完成">
+      <change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/adc-da-main.iml" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/main/config/DruidDataSourceConfig.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/main/ds/DataSourceContextHolder.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSource.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSourceAspect.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/main/ds/MybatisConfig.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/znks/controller/BaseEOController.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/znks/dao/BaseEODao.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/com/adc/da/znks/service/BaseEOService.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/mybatis/mapper/znks/BaseEOMapper.xml" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/white/csrfWhite.txt" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/white/csrfWhite.txt" />
+      <change beforePath="$PROJECT_DIR$/adc-da.iml" afterPath="$PROJECT_DIR$/adc-da.iml" />
    </list>
    <ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
    <ignored path="$PROJECT_DIR$/target/" />
@@ -104,10 +118,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/page/BaseVO.java" />
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/util/FtpUtil.java" />
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/entity/ComponentStandardEO.java" />
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/dao/BaseEODao.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/page/FtpUser.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znds/BaseEOMapper.xml" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/controller/ZndsEOController.java" />
@@ -138,7 +148,6 @@
        <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/SecurityUtils.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" />
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/config.properties" />
        <option value="$PROJECT_DIR$/adc-da-main/src/test/java/com/adc/da/gen/CodeUtil.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/database.properties" />
@@ -151,10 +160,15 @@
        <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java" />
        <option value="$PROJECT_DIR$/adc-da-main/pom.xml" />
-        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/Message.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksClient.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksClientHandler.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/IdGeneratorUtils.java" />
+        <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" />
      </list>
    </option>
  </component>
@@ -183,10 +197,10 @@
    </treeState>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="221" />
-    <option name="y" value="1" />
-    <option name="width" value="1146" />
-    <option name="height" value="652" />
+    <option name="x" value="276" />
+    <option name="y" value="15" />
+    <option name="width" value="1047" />
+    <option name="height" value="655" />
  </component>
  <component name="ProjectInspectionProfilesVisibleTreeState">
    <entry key="Project Default">
@@ -640,6 +654,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="AndroidView" />
      <pane id="ProjectPane">
        <subPane>
@@ -702,7 +717,51 @@
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="da" type="462c0819:PsiDirectoryNode" />
              <item name="znks" type="462c0819:PsiDirectoryNode" />
-              <item name="server" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="da" type="462c0819:PsiDirectoryNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="dao" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="da" type="462c0819:PsiDirectoryNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="da" type="462c0819:PsiDirectoryNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="page" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="da" type="462c0819:PsiDirectoryNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
@@ -713,22 +772,38 @@
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="da" type="462c0819:PsiDirectoryNode" />
              <item name="znks" type="462c0819:PsiDirectoryNode" />
-              <item name="server" type="462c0819:PsiDirectoryNode" />
-              <item name="handler" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+              <item name="netty" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="znks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="znks" type="462c0819:PsiDirectoryNode" />
+              <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="white" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
      <pane id="PackagesPane" />
+      <pane id="Scratches" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../springboot-idea/shop" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="settings.editor.selected.configurable" value="MavenSettings" />
    <property name="project.structure.last.edited" value="Modules" />
    <property name="project.structure.proportion" value="0.15" />
@@ -743,10 +818,12 @@
    <property name="restartRequiresConfirmation" value="false" />
  </component>
  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
-      <recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper.znks" />
-      <recent name="E:\Working\znds\adc-da-main\src\main" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\server" />
+      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
+      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\entity" />
+      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources" />
+      <recent name="E:\Working\znks\adc-da-main\src\main\java\com\adc\da\znks" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.adc.da.znks.controller" />
@@ -755,12 +832,10 @@
      <recent name="com.adc.da.znks.dao" />
      <recent name="com.adc.da.znks.entity" />
    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
-      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\entity" />
-      <recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources" />
-      <recent name="E:\Working\znks\adc-da-main\src\main\java\com\adc\da\znks" />
-      <recent name="E:\Working\znds\adc-da-main\src\main\lib" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
+      <recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper.znks" />
+      <recent name="E:\Working\znds\adc-da-main\src\main" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -790,14 +865,9 @@
      <module name="adc-da-main" />
      <envs />
    </configuration>
-    <configuration name="RemoteShellExecutor" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="com.adc.da.znds.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="com.adc.da.znds.util.RemoteShellExecutor" />
+    <configuration name="ZnksClient" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" value="com.adc.da.znks.server.ZnksClient" />
      <option name="VM_PARAMETERS" />
      <option name="PROGRAM_PARAMETERS" />
      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -809,14 +879,9 @@
      <module name="adc-da-main" />
      <envs />
    </configuration>
-    <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="com.adc.da.znds.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="com.adc.da.znds.util.Test" />
+    <configuration name="ZnksServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" value="com.adc.da.znks.server.ZnksServer" />
      <option name="VM_PARAMETERS" />
      <option name="PROGRAM_PARAMETERS" />
      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -937,19 +1002,19 @@
    </configuration>
    <list size="6">
      <item index="0" class="java.lang.String" itemvalue="Spring Boot.AdcDaApplication" />
-      <item index="1" class="java.lang.String" itemvalue="Application.RemoteShellExecutor" />
-      <item index="2" class="java.lang.String" itemvalue="Application.Test" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" />
-      <item index="5" class="java.lang.String" itemvalue="Application.CodeUtil" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" />
+      <item index="3" class="java.lang.String" itemvalue="Application.CodeUtil" />
+      <item index="4" class="java.lang.String" itemvalue="Application.ZnksServer" />
+      <item index="5" class="java.lang.String" itemvalue="Application.ZnksClient" />
    </list>
    <recent_temporary>
      <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Application.CodeUtil" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" />
-        <item index="3" class="java.lang.String" itemvalue="Application.Test" />
-        <item index="4" class="java.lang.String" itemvalue="Application.RemoteShellExecutor" />
+        <item index="0" class="java.lang.String" itemvalue="Application.ZnksClient" />
+        <item index="1" class="java.lang.String" itemvalue="Application.ZnksServer" />
+        <item index="2" class="java.lang.String" itemvalue="Application.CodeUtil" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" />
      </list>
    </recent_temporary>
  </component>
@@ -984,7 +1049,12 @@
      <workItem from="1536164642063" duration="264000" />
      <workItem from="1536164952365" duration="856000" />
      <workItem from="1536195489453" duration="8431000" />
-      <workItem from="1536208878764" duration="56000" />
+      <workItem from="1536208878764" duration="164000" />
+      <workItem from="1536229463702" duration="251000" />
+      <workItem from="1536229884990" duration="75000" />
+      <workItem from="1536280375986" duration="4587000" />
+      <workItem from="1536289362138" duration="118000" />
+      <workItem from="1536300314626" duration="7625000" />
    </task>
    <task id="LOCAL-00001" summary="A">
      <created>1534412427208</created>
@@ -1063,7 +1133,14 @@
      <option name="project" value="LOCAL" />
      <updated>1536204143826</updated>
    </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="1.ZnksServer完成,接受客户端解码未完成">
+      <created>1536208984471</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1536208984471</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
    <servers />
  </component>
  <component name="TestHistory">
@@ -1081,9 +1158,9 @@
    </history-entry>
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="280304000" />
+    <option name="totallyTimeSpent" value="293068000" />
  </component>
-  <component name="TodoView">
+  <component name="TodoView" selected-index="3">
    <todo-panel id="selected-file">
      <is-autoscroll-to-source value="true" />
    </todo-panel>
@@ -1105,19 +1182,21 @@
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4243421" sideWeight="0.49394855" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3256579" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41447368" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3184569" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34493193" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
      <window_info id="Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -1125,12 +1204,10 @@
      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5231561" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
      <window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17324185" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -1146,6 +1223,32 @@
      </list>
    </option>
  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
@@ -1162,11 +1265,12 @@
    <MESSAGE value="1.登录后台接口完成,测试有些问题" />
    <MESSAGE value="1.新增位置接口" />
    <MESSAGE value="1.新增netty-all依赖" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.新增netty-all依赖" />
+    <MESSAGE value="1.ZnksServer完成,接受客户端解码未完成" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.ZnksServer完成,接受客户端解码未完成" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
-      <option name="time" value="115" />
+      <option name="time" value="119" />
    </breakpoint-manager>
    <watches-manager>
      <configuration name="SpringBootApplicationConfigurationType">
@@ -1179,388 +1283,400 @@
    </watches-manager>
  </component>
  <component name="editorHistoryManager">
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-sys/2.2.1/adc-da-sys-2.2.1.jar!/com/adc/da/sys/controller/OrgEORestController.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-595">
-          <caret line="37" column="13" lean-forward="false" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
+        <state relative-caret-position="255">
+          <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/xss/XssFilter.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="238">
+          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/META-INF/maven/com.adc/adc-da-util/pom.properties">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/logs/system/adc-da.system_all.2018-09-04.0.log">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="-3103">
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/annotation/DS.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/META-INF/MANIFEST.MF">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="14" column="18" lean-forward="false" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/constant/GlobalConfig.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/META-INF/maven/com.adc/adc-da-util/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="425">
+          <caret line="55" column="35" lean-forward="true" selection-start-line="55" selection-start-column="35" selection-end-line="55" selection-end-column="35" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2-sources.jar!/org/jasypt/salt/SaltGenerator.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="35" column="17" lean-forward="false" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
+        <state relative-caret-position="-5304">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer">
+        <state />
+      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2-sources.jar!/org/jasypt/salt/FixedSaltGenerator.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final.jar!/io/netty/channel/ChannelHandlerAdapter.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="17" />
+        <state relative-caret-position="221">
+          <caret line="18" column="32" lean-forward="true" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2-sources.jar!/org/jasypt/salt/ByteArrayFixedSaltGenerator.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandler.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+        <state relative-caret-position="-260">
+          <caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerAdapter.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-187">
-          <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
+        <state relative-caret-position="153">
+          <caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/banner.txt">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerContext.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="15" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="15" />
+        <state relative-caret-position="-1530">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/springframework/spring-web/4.3.10.RELEASE/spring-web-4.3.10.RELEASE.jar!/org/springframework/web/bind/annotation/RequestBody.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/Channel.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="16" column="18" lean-forward="false" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
+        <state relative-caret-position="17">
+          <caret line="138" column="33" lean-forward="false" selection-start-line="138" selection-start-column="26" selection-end-line="138" selection-end-column="33" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/springframework/spring-web/4.3.10.RELEASE/spring-web-4.3.10.RELEASE-sources.jar!/org/springframework/http/converter/HttpMessageConverter.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final.jar!/META-INF/maven/io.netty/netty-all/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="32" column="17" lean-forward="false" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+        <state relative-caret-position="-2550">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/org/springframework/spring-web/4.3.10.RELEASE/spring-web-4.3.10.RELEASE-sources.jar!/org/springframework/web/bind/annotation/RequestBody.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="32" column="25" lean-forward="false" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+        <state relative-caret-position="-298">
+          <caret line="280" column="21" lean-forward="true" selection-start-line="280" selection-start-column="21" selection-end-line="280" selection-end-column="21" />
        </state>
      </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer">
+        <state />
+      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="799">
-          <caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
+        <state relative-caret-position="354">
+          <caret line="60" column="16" lean-forward="true" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-gen/2.0.0/adc-da-gen-2.0.0.jar!/com/codemagic/DbCodeGenerateFactory.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
+        <state relative-caret-position="85">
+          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-gen/2.0.0/adc-da-gen-2.0.0.jar!/com/codemagic/def/CodeResourceUtil.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/netty/ServerHandler.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="200" selection-end-column="0" />
+        <state relative-caret-position="374">
+          <caret line="26" column="30" lean-forward="false" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/gen/config.properties">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/netty/RequestDecoder.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="629">
+          <caret line="42" column="40" lean-forward="false" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="40" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/netty/NettyServer.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="64" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="64" />
+        <state relative-caret-position="46">
+          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/gen/database.properties">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final.jar!/io/netty/handler/codec/marshalling/ChannelBufferByteInput.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-gen/2.0.0/adc-da-gen-2.0.0.jar!/com/codemagic/bean/DbCreateBean.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/Message.java" />
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/MessageHeader.java" />
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/AbstractChannelHandlerContext.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1938">
-          <caret line="135" column="0" lean-forward="false" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+        <state relative-caret-position="98">
+          <caret line="830" column="0" lean-forward="false" selection-start-line="830" selection-start-column="0" selection-end-line="830" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/test/java/com/adc/da/gen/CodeUtil.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/DefaultChannelPipeline.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-119">
-          <caret line="10" column="61" lean-forward="false" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" />
+        <state relative-caret-position="106">
+          <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/PositionService.java" />
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/UserService.java" />
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/User.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksClient.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="541">
+          <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/page/PositionPage.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelInboundHandlerAdapter.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-515">
-          <caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+        <state relative-caret-position="192">
+          <caret line="73" column="31" lean-forward="false" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="31" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="21" column="88" lean-forward="false" selection-start-line="21" selection-start-column="88" selection-end-line="21" selection-end-column="88" />
+        <state relative-caret-position="1037">
+          <caret line="71" column="17" lean-forward="false" selection-start-line="71" selection-start-column="12" selection-end-line="71" selection-end-column="17" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="111" column="105" lean-forward="false" selection-start-line="111" selection-start-column="76" selection-end-line="111" selection-end-column="105" />
-          <folding>
-            <marker date="1536154094261" expanded="true" signature="1541:1751" ph="insert into tb_user... " />
-            <marker date="1536154094261" expanded="true" signature="2852:2996" ph="update tb_user... " />
-            <marker date="1536154094261" expanded="true" signature="3139:3502" ph="update tb_user... " />
-            <marker date="1536154094261" expanded="true" signature="3662:3761" ph="select from tb_user" />
-            <marker date="1536154094261" expanded="true" signature="3885:3932" ph="delete from tb_user... " />
-            <marker date="1536154094261" expanded="true" signature="4103:4131" ph="select count... tb_user" />
-            <marker date="1536154094261" expanded="true" signature="4329:4617" ph="select from tb_user" />
-          </folding>
+        <state relative-caret-position="-59">
+          <caret line="44" column="67" lean-forward="false" selection-start-line="44" selection-start-column="67" selection-end-line="44" selection-end-column="67" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Position.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-druid/2.0.0/adc-da-druid-2.0.0.jar!/META-INF/maven/com.adc/adc-da-druid/pom.properties">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
-          <caret line="0" column="30" lean-forward="true" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="30" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-druid/2.0.0/adc-da-druid-2.0.0.jar!/META-INF/maven/com.adc/adc-da-druid/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-561">
-          <caret line="42" column="70" lean-forward="false" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" />
-          <folding>
-            <marker date="1536198339473" expanded="true" signature="1837:2063" ph="insert into tb_position... " />
-            <marker date="1536198339473" expanded="true" signature="3234:3416" ph="update tb_position... " />
-            <marker date="1536198339473" expanded="true" signature="3563:3952" ph="update tb_position... " />
-            <marker date="1536198339473" expanded="true" signature="4116:4228" ph="select from tb_position" />
-            <marker date="1536198339473" expanded="true" signature="4361:4421" ph="delete from tb_position... " />
-            <marker date="1536198339473" expanded="true" signature="4596:4628" ph="select count... tb_position" />
-            <marker date="1536198339473" expanded="true" signature="4830:5122" ph="select from tb_position" />
-          </folding>
+        <state relative-caret-position="272">
+          <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/page/UserPage.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-243">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <state relative-caret-position="34">
+          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/http/Result.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksClientHandler.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="23" column="41" lean-forward="false" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
+        <state relative-caret-position="434">
+          <caret line="35" column="13" lean-forward="true" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/User.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="60" column="16" lean-forward="true" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
+        <state relative-caret-position="-850">
+          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="18" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/FileUtil.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/utils/UUID.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        <state relative-caret-position="108">
+          <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/FtpUtil.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/SocketUtils.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="280" column="50" lean-forward="false" selection-start-line="280" selection-start-column="45" selection-end-line="280" selection-end-column="50" />
+        <state relative-caret-position="221">
+          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/RemoteShellExecutor.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+        <state relative-caret-position="170">
+          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <marker date="1536300546426" expanded="true" signature="749:871" ph="select * fro... tb_device" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/GatewayMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1139">
-          <caret line="67" column="19" lean-forward="true" selection-start-line="67" selection-start-column="19" selection-end-line="67" selection-end-column="19" />
+        <state relative-caret-position="238">
+          <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+          <folding>
+            <marker date="1536300546428" expanded="true" signature="1702:1826" ph="select * fro... tb_gateway" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/logs/system/adc-da.system_all.2018-09-04.0.log">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/GenResponse.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3103">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="349">
+          <caret line="23" column="28" lean-forward="false" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="28" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/META-INF/MANIFEST.MF">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/IdGeneratorUtils.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        <state relative-caret-position="204">
+          <caret line="12" column="18" lean-forward="false" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/META-INF/maven/com.adc/adc-da-util/pom.xml">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/GatewayController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="55" column="35" lean-forward="true" selection-start-line="55" selection-start-column="35" selection-end-line="55" selection-end-column="35" />
+        <state relative-caret-position="46">
+          <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5304">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="-1334">
+          <caret line="42" column="70" lean-forward="false" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" />
+          <folding>
+            <marker date="1536198339473" expanded="true" signature="1837:2063" ph="insert into tb_position... " />
+            <marker date="1536198339473" expanded="true" signature="3234:3416" ph="update tb_position... " />
+            <marker date="1536198339473" expanded="true" signature="3563:3952" ph="update tb_position... " />
+            <marker date="1536198339473" expanded="true" signature="4116:4228" ph="select from tb_position" />
+            <marker date="1536198339473" expanded="true" signature="4361:4421" ph="delete from tb_position... " />
+            <marker date="1536198339473" expanded="true" signature="4596:4628" ph="select count... tb_position" />
+            <marker date="1536198339473" expanded="true" signature="4830:5122" ph="select from tb_position" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/GatewayDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="280" column="21" lean-forward="true" selection-start-line="280" selection-start-column="21" selection-end-line="280" selection-end-column="21" />
+        <state relative-caret-position="204">
+          <caret line="14" column="11" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="11" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-base/2.0.0/adc-da-base-2.0.0.jar!/com/adc/da/base/dao/BaseDao.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="16" column="83" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="111">
+          <caret line="12" column="8" lean-forward="false" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+        <state relative-caret-position="-816">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding>
-            <element signature="imports" expanded="true" />
+            <marker date="1536154094261" expanded="true" signature="1541:1751" ph="insert into tb_user... " />
+            <marker date="1536154094261" expanded="true" signature="2852:2996" ph="update tb_user... " />
+            <marker date="1536154094261" expanded="true" signature="3139:3502" ph="update tb_user... " />
+            <marker date="1536154094261" expanded="true" signature="3662:3761" ph="select from tb_user" />
+            <marker date="1536154094261" expanded="true" signature="3885:3932" ph="delete from tb_user... " />
+            <marker date="1536154094261" expanded="true" signature="4103:4131" ph="select count... tb_user" />
+            <marker date="1536154094261" expanded="true" signature="4329:4617" ph="select from tb_user" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final.jar!/io/netty/channel/ChannelHandlerAdapter.class">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="18" column="32" lean-forward="true" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+        <state relative-caret-position="103">
+          <caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandler.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/GatewayService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-260">
-          <caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
+        <state relative-caret-position="332">
+          <caret line="32" column="38" lean-forward="false" selection-start-line="32" selection-start-column="38" selection-end-line="32" selection-end-column="38" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerAdapter.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
+        <state relative-caret-position="213">
+          <caret line="30" column="30" lean-forward="false" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerContext.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/utils/CollectionUtils.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1530">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="111">
+          <caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
+          <folding>
+            <element signature="e#451#452#0" expanded="true" />
+            <element signature="e#497#498#0" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="116">
+          <caret line="64" column="53" lean-forward="true" selection-start-line="64" selection-start-column="53" selection-end-line="64" selection-end-column="53" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="187">
+          <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="21" selection-end-column="5" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/Channel.java">
+    <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/csrfWhite.txt">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="138" column="33" lean-forward="false" selection-start-line="138" selection-start-column="26" selection-end-line="138" selection-end-column="33" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>

--- a/adc-da-main/adc-da-main.iml
+++ b/adc-da-main/adc-da-main.iml
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-base:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-util:2.2.41" level="project" />
+    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.4.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk14:1.58" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-sys:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-swagger:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.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.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0-RC2" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-file:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-gen:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.adc:adc-da-druid:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.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:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jetty:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:javax-websocket-server-impl:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-annotations:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-plus:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:5.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:5.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:javax-websocket-client-impl:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" name="Maven: javax.websocket:javax.websocket-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mortbay.jasper:apache-el:8.0.33" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.javacsv:javacsv:2.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.9" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
+    <orderEntry type="library" name="Maven: com.oracle:ojdbc7:12.1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.1" level="project" />
+    <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-core:3.1.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.16" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jvnet.hudson:ganymed-ssh2:build210-hudson-1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.camel:camel-ftp:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.50" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot-starter:1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot:1.18" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.22.Final" level="project" />
+  </component>
+</module>
\ No newline at end of file
--- a/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java
+++ b/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java
-package com.adc.da.znks.server;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * znks server
- *
- * @author ley
- **/
-public class ZnksServer {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZnksServer.class);
-
-
-    /**
-     * init znks server
-     **/
-    public static void initZnksServer(int port) {
-        //服务类
-        ServerBootstrap bootstrap = new ServerBootstrap();
-
-        //boss和worker
-        //EventLoopGroup用来管理和调度netty中的各种线程
-        EventLoopGroup boss = new NioEventLoopGroup();
-        EventLoopGroup worker = new NioEventLoopGroup();
-
-        try {
-            //设置线程池
-            bootstrap.group(boss, worker);
-
-            //设置socket工厂、
-            bootstrap.channel(NioServerSocketChannel.class);
-
-            //设置管道工厂
-            bootstrap.childHandler(new ChannelInitializer<Channel>() {
-
-                @Override
-                protected void initChannel(Channel ch) throws Exception {
-
-                }
-            });
-
-            //设置参数，TCP参数
-            bootstrap.option(ChannelOption.SO_BACKLOG, 2048);//serverSocketchannel的设置，链接缓冲池的大小
-            bootstrap.childOption(ChannelOption.SO_KEEPALIVE, true);//socketchannel的设置,维持链接的活跃，清除死链接
-            bootstrap.childOption(ChannelOption.TCP_NODELAY, true);//socketchannel的设置,关闭延迟发送
-
-            //绑定端口
-            ChannelFuture future = bootstrap.bind(port);
-            logger.info("57所netty监听服务启动成功...");
-            //等待服务端关闭
-            future.channel().closeFuture().sync();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            //释放资源
-            boss.shutdownGracefully();
-            worker.shutdownGracefully();
-        }
-    }
-
-}
--- a/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java
+++ b/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java
-package com.adc.da.znks.server.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
-
-import java.util.List;
-
-/**
- * request decoder
- **/
-public class RequestDecoder extends ByteToMessageDecoder {
-
-    /**
-     *
-     * **/
-    @Override
-    protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) throws Exception {
-
-    }
-}
--- a/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java
+++ b/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java
-package com.adc.da.znks.server.handler;
-
-import com.adc.da.znks.server.utils.ClientUtils;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * znks server handler
- *
- * @author ley
- **/
-public class ZnksServerHandler extends ChannelInboundHandlerAdapter {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZnksServerHandler.class);
-
-    /**
-     * 存有连接进来的客户端
-     **/
-    public static final Map<String, ChannelHandlerContext> clientMap =
-            new ConcurrentHashMap<>(64);
-
-    /**
-     * 客户端数量
-     **/
-    private final AtomicInteger clientNumber = new AtomicInteger(0);
-
-    /**
-     * 接受客户端数据
-     **/
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-
-    }
-
-
-    /**
-     * 新客户端接入
-     **/
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        String key = ClientUtils.getClientIpAndPort(ctx);
-        clientMap.put(key, ctx);
-        clientNumber.incrementAndGet();
-        logger.info("客户端: {}, 连接成功", key);
-        logger.info("连接服务端的客户端个数: {}", clientNumber.get());
-    }
-
-
-    /**
-     * 客户端断开
-     **/
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        super.channelInactive(ctx);
-    }
-
-
-    /**
-     * 处理异常
-     **/
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-    }
-}
--- a/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java
+++ b/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java
-package com.adc.da.znks.server.utils;
-
-import io.netty.channel.ChannelHandlerContext;
-
-import java.net.InetSocketAddress;
-
-/**
- * client utility class
- *
- * @author ley
- **/
-public class ClientUtils {
-
-    /**
-     * get client ip and port
-     **/
-    public static String getClientIpAndPort(ChannelHandlerContext context) {
-        InetSocketAddress clientSocket = (InetSocketAddress) context.channel().remoteAddress();
-        String clientIp = clientSocket.getAddress().getHostAddress();
-        int clientPort = clientSocket.getPort();
-        return clientIp + ":" + clientPort;
-    }
-}
--- a/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java
+++ b/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java
@@ -43,7 +43,7 @@ public class UserService extends BaseService<User, String> {
    public Boolean getUserByPhoneNumber(String phoneNumber) {
        Boolean flag = false;
        User user = dao.getUserByPhoneNumber(phoneNumber);
-        if(user != null) {
+        if (user != null) {
            flag = true;
        }
        return flag;
@@ -60,19 +60,29 @@ public class UserService extends BaseService<User, String> {
    public boolean updatePassword(User user) {
        List<String> encryptList = encryptList(user.getPlainPassword());
        Asserts.notNull(encryptList, "encrypt list must not be null.");
-        user.setEncryptkey(encryptList.get(0));
-        user.setPassword(encryptList.get(1));
        UserPage userPage = new UserPage();
-        user.setTemphone(user.getTemphone());
-        User findUser = dao.queryByList(userPage).get(0);
-        User updateUser = new User();
-        updateUser.setPassword(encryptList.get(1));
-        updateUser.setEncryptkey(encryptList.get(0));
-        int result = dao.updateByPrimaryKeySelective(updateUser);
-        if (result != 0) {
+        userPage.setTemphone(user.getTemphone());
+        List<User> users = dao.queryByList(userPage);
+        if (CollectionUtils.isEmpty(users)) {//通过验证码登录时,用户不存在,新增用户
+            user.setId(UUID.randomUUID());
+            user.setPassword(encryptList.get(1));
+            user.setEncryptkey(encryptList.get(0));
+            dao.insert(user);
            return true;
        } else {
-            return false;
+            //
+            User findUser = dao.queryByList(userPage).get(0);
+            logger.info("findUser: {}", findUser);
+            User updateUser = new User();
+            updateUser.setPassword(encryptList.get(1));
+            updateUser.setEncryptkey(encryptList.get(0));
+            updateUser.setId(findUser.getId());
+            int result = dao.updateByPrimaryKeySelective(updateUser);
+            if (result != 0) {
+                return true;
+            } else {
+                return false;
+            }
        }
    }


--- a/adc-da-main/target/classes/application.properties
+++ b/adc-da-main/target/classes/application.properties
@@ -14,9 +14,9 @@
 # ===============================
 #spring.datasource.driverClassName = oracle.jdbc.OracleDriver
 ##数据库服务器外网ip221.239.111.146 内网10.10.0.3
-spring.datasource.ds2.url = jdbc:oracle:thin:@60.30.69.61:1521:ADC
-spring.datasource.ds2.username = cedet_baoxin
-spring.datasource.ds2.password = cedet_baoxin
+#spring.datasource.ds2.url = jdbc:oracle:thin:@60.30.69.61:1521:ADC
+#spring.datasource.ds2.username = cedet_baoxin
+#spring.datasource.ds2.password = cedet_baoxin

 spring.datasource.type = com.alibaba.druid.pool.DruidDataSource
 # 下面为连接池的补充设置，应用到上面所有数据源中

--- a/adc-da-main/target/classes/com/adc/da/main/config/DruidDataSourceConfig.class
+++ b/adc-da-main/target/classes/com/adc/da/main/config/DruidDataSourceConfig.class
--- a/adc-da-main/target/classes/com/adc/da/main/ds/DataSourceContextHolder.class
+++ b/adc-da-main/target/classes/com/adc/da/main/ds/DataSourceContextHolder.class
--- a/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSource.class
+++ b/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSource.class
--- a/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSourceAspect.class
+++ b/adc-da-main/target/classes/com/adc/da/main/ds/DynamicDataSourceAspect.class
--- a/adc-da-main/target/classes/com/adc/da/main/ds/MybatisConfig.class
+++ b/adc-da-main/target/classes/com/adc/da/main/ds/MybatisConfig.class
--- a/adc-da-main/target/classes/com/adc/da/znks/controller/BaseEOController.class
+++ b/adc-da-main/target/classes/com/adc/da/znks/controller/BaseEOController.class
--- a/adc-da-main/target/classes/com/adc/da/znks/dao/BaseEODao.class
+++ b/adc-da-main/target/classes/com/adc/da/znks/dao/BaseEODao.class
--- a/adc-da-main/target/classes/com/adc/da/znks/service/BaseEOService.class
+++ b/adc-da-main/target/classes/com/adc/da/znks/service/BaseEOService.class
--- a/adc-da-main/target/classes/mybatis/mapper/znks/BaseEOMapper.xml
+++ b/adc-da-main/target/classes/mybatis/mapper/znks/BaseEOMapper.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.adc.da.znks.dao.BaseEODao" >
-
-
-  <!-- 损伤情况中英文对照信息    -->
-  <select id="queryUser" resultType="java.util.Map">
-    select * from sys_user
-  </select>
-
-
-</mapper>
--- a/adc-da-main/target/classes/white/csrfWhite.txt
+++ b/adc-da-main/target/classes/white/csrfWhite.txt
 127.0.0.1
+192.168.1.109
 localhost
 index.html
\ No newline at end of file
--- a/adc-da.iml
+++ b/adc-da.iml
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <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" />
+  </component>
+</module>
\ No newline at end of file