From 19e43846733e5bd5417dc43ee34e23baca2dca34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= <xj753277@126.com>
Date: Fri, 12 Jul 2019 11:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84netty=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=AFsdk=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cim-boot-server/cim-boot-server.iml           |  54 +--
 cim-boot-server/cim-boot-server.ipr           | 208 +++++------
 cim-boot-server/cim-boot-server.iws           | 347 +++++++++++++++---
 .../lib/cim-server-sdk-netty-3.7.0.jar        | Bin 98383 -> 101521 bytes
 cim-boot-server/pom.xml                       |   8 +-
 .../admin/controller/SessionController.java   |   5 +-
 .../cim/api/controller/MessageController.java |  25 +-
 .../cim/api/controller/dto/BaseResult.java    |   4 +-
 .../farsunset/cim/{ => config}/CIMConfig.java |  35 +-
 .../farsunset/cim/handler/BindHandler.java    |  28 +-
 .../cim/handler/SessionClosedHandler.java     |  16 +-
 .../cim/push/DefaultMessagePusher.java        |  16 +-
 .../cim/push/SystemMessagePusher.java         |  38 --
 .../cim/repository/SessionRepository.java     |  34 ++
 .../cim/service/CIMSessionService.java        |   4 +-
 ...ceImpl.java => CIMSessionServiceImpl.java} |  49 +--
 .../cim/service/impl/JavaApnsServiceImpl.java |  36 +-
 .../impl/MemorySessionServiceImpl.java        |  69 ----
 .../farsunset/cim/util/ApnsPayloadCompat.java |   5 +-
 .../com/farsunset/cim/util/Constants.java     |  69 ----
 .../com/farsunset/cim/util/StringUtil.java    |  69 ----
 .../src/main/resources/application.properties |  14 +-
 .../cim/sdk/android/CIMPushService.java       |   6 +
 .../server/handler/CIMNioSocketAcceptor.java  |  12 +-
 .../cim/sdk/server/model/CIMSession.java      |   6 +
 25 files changed, 585 insertions(+), 572 deletions(-)
 rename cim-boot-server/src/main/java/com/farsunset/cim/{ => config}/CIMConfig.java (84%)
 delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
 create mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/repository/SessionRepository.java
 rename cim-boot-server/src/main/java/com/farsunset/cim/service/impl/{ClusterSessionServiceImpl.java => CIMSessionServiceImpl.java} (75%)
 delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
 delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
 delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java

diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml
index 896b652..f04276c 100644
--- a/cim-boot-server/cim-boot-server.iml
+++ b/cim-boot-server/cim-boot-server.iml
@@ -25,46 +25,46 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.19" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.19" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.19" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.8.RELEASE" level="project" />
     <orderEntry type="module-library">
-      <library name="Maven: com.farsunset:cim-server-sdk:3.7">
+      <library name="Maven: com.farsunset:cim-server-sdk:3.7.0">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/" />
         </CLASSES>
diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr
index f85e559..3e89788 100644
--- a/cim-boot-server/cim-boot-server.ipr
+++ b/cim-boot-server/cim-boot-server.ipr
@@ -121,59 +121,59 @@
         <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8">
+    <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.8/jackson-core-2.9.8.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.8/jackson-core-2.9.8-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.8/jackson-core-2.9.8-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8">
+    <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.8/jackson-databind-2.9.8.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.8/jackson-databind-2.9.8-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.8/jackson-databind-2.9.8-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8">
+    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.8/jackson-datatype-jdk8-2.9.8.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.8/jackson-datatype-jdk8-2.9.8-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.8/jackson-datatype-jdk8-2.9.8-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8">
+    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.8/jackson-datatype-jsr310-2.9.8.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.8/jackson-datatype-jsr310-2.9.8-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.8/jackson-datatype-jsr310-2.9.8-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8">
+    <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.8/jackson-module-parameter-names-2.9.8.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.8/jackson-module-parameter-names-2.9.8-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.8/jackson-module-parameter-names-2.9.8-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-sources.jar!/" />
       </SOURCES>
     </library>
     <library name="Maven: com.fasterxml:classmate:1.4.0">
@@ -352,37 +352,37 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/mina/mina-core/2.0.21/mina-core-2.0.21-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.19">
+    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.19/tomcat-embed-core-9.0.19.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.19/tomcat-embed-core-9.0.19-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.19/tomcat-embed-core-9.0.19-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.19">
+    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.19/tomcat-embed-el-9.0.19.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.19/tomcat-embed-el-9.0.19-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.19/tomcat-embed-el-9.0.19-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.19">
+    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.19/tomcat-embed-websocket-9.0.19.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.19/tomcat-embed-websocket-9.0.19-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.19/tomcat-embed-websocket-9.0.19-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-sources.jar!/" />
       </SOURCES>
     </library>
     <library name="Maven: org.freemarker:freemarker:2.3.28">
@@ -396,15 +396,15 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final">
+    <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.16.Final/hibernate-validator-6.0.16.Final.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.16.Final/hibernate-validator-6.0.16.Final-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.16.Final/hibernate-validator-6.0.16.Final-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-sources.jar!/" />
       </SOURCES>
     </library>
     <library name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final">
@@ -440,191 +440,191 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.5.RELEASE/spring-boot-autoconfigure-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.5.RELEASE/spring-boot-autoconfigure-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.5.RELEASE/spring-boot-autoconfigure-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.6.RELEASE/spring-boot-starter-freemarker-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.6.RELEASE/spring-boot-starter-freemarker-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.1.6.RELEASE/spring-boot-starter-freemarker-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.5.RELEASE/spring-boot-starter-json-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.5.RELEASE/spring-boot-starter-json-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.5.RELEASE/spring-boot-starter-json-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.5.RELEASE/spring-boot-starter-logging-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.5.RELEASE/spring-boot-starter-logging-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.5.RELEASE/spring-boot-starter-logging-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.5.RELEASE/spring-boot-starter-tomcat-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.5.RELEASE/spring-boot-starter-tomcat-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.5.RELEASE/spring-boot-starter-tomcat-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.5.RELEASE/spring-boot-starter-web-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.5.RELEASE/spring-boot-starter-web-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.5.RELEASE/spring-boot-starter-web-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.5.RELEASE/spring-boot-starter-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.5.RELEASE/spring-boot-starter-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.5.RELEASE/spring-boot-starter-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework.boot:spring-boot:2.1.5.RELEASE">
+    <library name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.5.RELEASE/spring-boot-2.1.5.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.5.RELEASE/spring-boot-2.1.5.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.5.RELEASE/spring-boot-2.1.5.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-aop:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-aop:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.7.RELEASE/spring-aop-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.7.RELEASE/spring-aop-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.7.RELEASE/spring-aop-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-beans:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-beans:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.7.RELEASE/spring-beans-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.7.RELEASE/spring-beans-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.7.RELEASE/spring-beans-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-context-support:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-context-support:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.7.RELEASE/spring-context-support-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.8.RELEASE/spring-context-support-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.7.RELEASE/spring-context-support-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.8.RELEASE/spring-context-support-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.7.RELEASE/spring-context-support-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.8.RELEASE/spring-context-support-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-context:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-context:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.7.RELEASE/spring-context-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.7.RELEASE/spring-context-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.7.RELEASE/spring-context-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-core:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-core:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.7.RELEASE/spring-core-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.7.RELEASE/spring-core-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.7.RELEASE/spring-core-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-expression:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-expression:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.7.RELEASE/spring-expression-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.7.RELEASE/spring-expression-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.7.RELEASE/spring-expression-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.7.RELEASE/spring-jcl-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.7.RELEASE/spring-jcl-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.7.RELEASE/spring-jcl-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-web:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-web:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE">
+    <library name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.7.RELEASE/spring-webmvc-5.1.7.RELEASE.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.7.RELEASE/spring-webmvc-5.1.7.RELEASE-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-javadoc.jar!/" />
       </JAVADOC>
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.7.RELEASE/spring-webmvc-5.1.7.RELEASE-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-sources.jar!/" />
       </SOURCES>
     </library>
     <library name="Maven: org.yaml:snakeyaml:1.23">
diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws
index 397bba6..7155dfe 100644
--- a/cim-boot-server/cim-boot-server.iws
+++ b/cim-boot-server/cim-boot-server.iws
@@ -18,26 +18,100 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="836">
-              <caret line="44" column="66" selection-start-line="44" selection-start-column="66" selection-end-line="44" selection-end-column="66" />
+            <state relative-caret-position="288">
+              <caret line="39" column="44" lean-forward="true" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/CIMSessionService.java">
+        <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-mina-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="43" selection-start-line="43" selection-end-line="43" />
+            <state relative-caret-position="397">
+              <caret line="122" column="5" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
+              <folding>
+                <element signature="e#4800#4801#0" expanded="true" />
+                <element signature="e#4857#4858#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="123">
+              <caret line="58" column="30" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="30" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1768#1769#0" expanded="true" />
+                <element signature="e#1791#1792#0" expanded="true" />
+                <element signature="e#2334#2335#0" expanded="true" />
+                <element signature="e#2357#2358#0" expanded="true" />
+                <element signature="e#2009#2010#0" expanded="true" />
+                <element signature="e#2027#2028#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/CIMConfig.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="57" column="78" selection-start-line="57" selection-start-column="78" selection-end-line="57" selection-end-column="78" />
+            <state relative-caret-position="411">
+              <caret line="25" selection-start-line="25" selection-end-line="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="76" column="13" lean-forward="true" selection-start-line="76" selection-start-column="13" selection-end-line="76" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/repository/SessionRepository.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#670#671#0" expanded="true" />
+                <element signature="e#705#706#0" expanded="true" />
+                <element signature="e#745#746#0" expanded="true" />
+                <element signature="e#798#799#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$MAVEN_REPOSITORY$/cn/teaey/apns4j/apns4j/1.1.4/apns4j-1.1.4.jar!/cn/teaey/apns4j/protocol/ApnsPayload.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="114">
+              <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$MAVEN_REPOSITORY$/cn/teaey/apns4j/apns4j/1.1.4/apns4j-1.1.4.jar!/cn/teaey/apns4j/protocol/Payload.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="227">
+              <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="618">
+              <caret line="64" column="32" selection-start-line="64" selection-start-column="32" selection-end-line="64" selection-end-column="32" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -46,22 +120,33 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/BindHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+            <state relative-caret-position="283">
+              <caret line="103" column="39" selection-start-line="103" selection-start-column="39" selection-end-line="103" selection-end-column="39" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>CIMWebBridge</find>
-      <find>memorySessionService</find>
       <find>cim-server-sdk-mina-3.7.0.jar</find>
       <find>cim.server.port</find>
+      <find>memorySessionService</find>
+      <find>Logger</find>
     </findStrings>
     <replaceStrings>
       <replace>CIMPushManager</replace>
@@ -74,9 +159,19 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/main/resources/static/js/cim/cim.web.sdk.js" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/CIMConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/CIMConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/api/controller/MessageController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/BindHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/farsunset/cim/repository/SessionRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -90,7 +185,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -126,23 +220,22 @@
               <item name="cim-boot-server" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="cim" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cim-boot-server" type="b2602c69:ProjectViewProjectNode" />
               <item name="cim-boot-server" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="cim" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -219,17 +312,18 @@
       <workItem from="1559110709907" duration="1801000" />
       <workItem from="1559198165156" duration="1213000" />
       <workItem from="1559269742769" duration="598000" />
+      <workItem from="1562899329294" duration="2390000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8228000" />
+    <option name="totallyTimeSpent" value="10618000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1920" height="1057" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27433154" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27754012" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="UI Designer" order="3" />
@@ -237,7 +331,7 @@
       <window_info id="Web" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.51953536" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3315734" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.26821542" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -247,7 +341,7 @@
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="12" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.32946146" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <window_info anchor="bottom" id="Database Changes" order="14" />
       <window_info anchor="bottom" id="Version Control" order="15" />
@@ -302,27 +396,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-mina-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-136">
-          <caret line="57" column="58" selection-start-line="57" selection-start-column="58" selection-end-line="57" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="836">
-          <caret line="44" column="66" selection-start-line="44" selection-start-column="66" selection-end-line="44" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/CIMSessionService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -330,23 +403,197 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/model/CIMSession.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="114">
-          <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/CIMConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="57" column="78" selection-start-line="57" selection-start-column="78" selection-end-line="57" selection-end-column="78" />
+        <state relative-caret-position="418">
+          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/CIMConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="23" column="49" selection-start-line="23" selection-start-column="31" selection-end-line="23" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/admin/controller/SessionController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="44" selection-start-line="44" selection-end-line="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#2009#2041#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/util/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="532">
+          <caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/util/StringUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="50" column="45" lean-forward="true" selection-start-line="50" selection-start-column="45" selection-end-line="50" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="33" column="36" lean-forward="true" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/api/controller/MessageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/page/console/session/manage.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="37" column="36" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="703">
+          <caret line="65" column="36" selection-start-line="65" selection-start-column="36" selection-end-line="65" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/BindHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="283">
+          <caret line="103" column="39" selection-start-line="103" selection-start-column="39" selection-end-line="103" selection-end-column="39" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="618">
+          <caret line="64" column="32" selection-start-line="64" selection-start-column="32" selection-end-line="64" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1018">
+          <caret line="108" column="37" selection-start-line="108" selection-start-column="37" selection-end-line="108" selection-end-column="37" />
+          <folding>
+            <element signature="e#5892#5893#0" expanded="true" />
+            <element signature="e#5969#5970#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="39" column="44" lean-forward="true" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="123">
+          <caret line="58" column="30" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1768#1769#0" expanded="true" />
+            <element signature="e#1791#1792#0" expanded="true" />
+            <element signature="e#2334#2335#0" expanded="true" />
+            <element signature="e#2357#2358#0" expanded="true" />
+            <element signature="e#2009#2010#0" expanded="true" />
+            <element signature="e#2027#2028#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/cim-server-sdk-mina-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="397">
+          <caret line="122" column="5" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
+          <folding>
+            <element signature="e#4800#4801#0" expanded="true" />
+            <element signature="e#4857#4858#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/cn/teaey/apns4j/apns4j/1.1.4/apns4j-1.1.4.jar!/cn/teaey/apns4j/protocol/ApnsPayload.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/cn/teaey/apns4j/apns4j/1.1.4/apns4j-1.1.4.jar!/cn/teaey/apns4j/protocol/Payload.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="227">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="76" column="13" lean-forward="true" selection-start-line="76" selection-start-column="13" selection-end-line="76" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/repository/SessionRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#670#671#0" expanded="true" />
+            <element signature="e#705#706#0" expanded="true" />
+            <element signature="e#745#746#0" expanded="true" />
+            <element signature="e#798#799#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="411">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar b/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar
index 1c6e9d5876cfaacbe377e743e5503286eaa1b52a..acb64a5493ea8a073c83ae26ab714221ee1357db 100644
GIT binary patch
delta 12721
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

delta 9911
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
T008{(AEA2y0Fpg?90UFzwxI)(

diff --git a/cim-boot-server/pom.xml b/cim-boot-server/pom.xml
index 6f92bd3..5e554d8 100644
--- a/cim-boot-server/pom.xml
+++ b/cim-boot-server/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>2.1.6.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -39,10 +39,10 @@
         <dependency>
             <groupId>com.farsunset</groupId>
             <artifactId>cim-server-sdk</artifactId>
-            <version>3.7</version>
+            <version>3.7.0</version>
             <scope>system</scope>
-            <!-- mina 、netty版本 sdk任选其一-->
-            <systemPath>${project.basedir}/lib/cim-server-sdk-mina-3.7.0.jar</systemPath>
+            <!-- mina 、netty版本 sdk任选其一 -->
+            <systemPath>${project.basedir}/lib/cim-server-sdk-netty-3.7.0.jar</systemPath>
         </dependency>
 
 
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
index ecf240b..c360cf0 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
@@ -21,13 +21,12 @@
  */
 package com.farsunset.cim.admin.controller;
 
-import javax.annotation.Resource;
-
+import com.farsunset.cim.service.CIMSessionService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.farsunset.cim.service.CIMSessionService;
+import javax.annotation.Resource;
 
 @Controller
 @RequestMapping("/console/session")
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
index c42ed85..6a98061 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
@@ -21,32 +21,23 @@
  */
 package com.farsunset.cim.api.controller;
 
-import javax.annotation.Resource;
-
+import com.farsunset.cim.api.controller.dto.MessageResult;
+import com.farsunset.cim.push.DefaultMessagePusher;
+import com.farsunset.cim.sdk.server.model.Message;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.farsunset.cim.api.controller.dto.MessageResult;
-import com.farsunset.cim.push.DefaultMessagePusher;
-import com.farsunset.cim.push.SystemMessagePusher;
-import com.farsunset.cim.sdk.server.model.Message;
-import com.farsunset.cim.util.Constants;
+import javax.annotation.Resource;
 
 
 @RestController
 @RequestMapping("/api/message")
 public class MessageController  {
 
-
-	 
-	@Resource
-	private SystemMessagePusher systemMessagePusher;
-	
 	@Resource
 	private DefaultMessagePusher defaultMessagePusher;
 
-	 
 	/**
 	 * 此方法仅仅在集群时，通过服务器调用
 	 * 
@@ -65,11 +56,9 @@ public class MessageController  {
 		MessageResult result = new MessageResult();
 
 		message.setId(System.currentTimeMillis());
-		if (Constants.MessageType.TYPE_2.equals(message.getAction())) {
-			systemMessagePusher.push(message);
-		} else {
-			defaultMessagePusher.push(message);
-		}
+
+		defaultMessagePusher.push(message);
+
 		result.id = message.getId();
 		result.timestamp = message.getTimestamp();
 		return result;
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
index 02b8198..1c45609 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
@@ -21,10 +21,10 @@
  */
 package com.farsunset.cim.api.controller.dto;
 
-import java.util.List;
-
 import org.springframework.http.HttpStatus;
 
+import java.util.List;
+
 
 public class BaseResult {
 	public int code = HttpStatus.OK.value();
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
similarity index 84%
rename from cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
index 84ecbde..96eefba 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
@@ -1,11 +1,11 @@
-package com.farsunset.cim;
+package com.farsunset.cim.config;
 
-import java.util.HashMap;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Qualifier;
+import com.farsunset.cim.handler.BindHandler;
+import com.farsunset.cim.handler.SessionClosedHandler;
+import com.farsunset.cim.sdk.server.handler.CIMNioSocketAcceptor;
+import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
+import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.SentBody;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationContext;
@@ -13,13 +13,9 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.farsunset.cim.handler.BindHandler;
-import com.farsunset.cim.handler.SessionClosedHandler;
-import com.farsunset.cim.sdk.server.handler.CIMNioSocketAcceptor;
-import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.service.CIMSessionService;
-import com.farsunset.cim.sdk.server.model.CIMSession;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.util.HashMap;
 
 @Configuration
 public class CIMConfig implements CIMRequestHandler, ApplicationListener<ApplicationStartedEvent> {
@@ -48,17 +44,6 @@ public class CIMConfig implements CIMRequestHandler, ApplicationListener<Applica
 		nioSocketAcceptor.setAppSentBodyHandler(this);
 		return nioSocketAcceptor;
 	}
-	
-	/**
-	 *   
-	 * @param memorySessionService 默认使用内存管理方案
-	 * @return
-	 */
-	@Bean(value = "cimSessionService")
-	public CIMSessionService getCIMSessionService(@Qualifier("memorySessionService") CIMSessionService memorySessionService) {
-		return memorySessionService;
-		
-	}
 
 	@Override
 	public void process(CIMSession session, SentBody body) {
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java b/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
index d684c48..ab51a70 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
@@ -21,23 +21,21 @@
  */
 package com.farsunset.cim.handler;
 
-import java.util.Objects;
-
-import javax.annotation.Resource;
-
+import com.farsunset.cim.push.CIMMessagePusher;
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
+import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.Message;
+import com.farsunset.cim.sdk.server.model.ReplyBody;
+import com.farsunset.cim.sdk.server.model.SentBody;
+import com.farsunset.cim.service.CIMSessionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.farsunset.cim.push.CIMMessagePusher;
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
-import com.farsunset.cim.sdk.server.model.Message;
-import com.farsunset.cim.sdk.server.model.ReplyBody;
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-import com.farsunset.cim.service.CIMSessionService;
+import javax.annotation.Resource;
+import java.util.Objects;
 
 
 /**
@@ -48,7 +46,7 @@ import com.farsunset.cim.service.CIMSessionService;
 @Component
 public class BindHandler implements CIMRequestHandler {
 
-	protected final Logger logger = LoggerFactory.getLogger(BindHandler.class);
+	private final Logger logger = LoggerFactory.getLogger(BindHandler.class);
 
 	@Resource
 	private CIMSessionService cimSessionService;
@@ -103,9 +101,9 @@ public class BindHandler implements CIMRequestHandler {
 			cimSessionService.save(newSession);
 			
 
-		} catch (Exception e) {
+		} catch (Exception exception) {
 			reply.setCode(CIMConstant.ReturnCode.CODE_500);
-			logger.error(e.getMessage());
+			logger.error("Bind has error",exception);
 		}
 	 
 		newSession.write(reply);
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java b/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
index 641c866..27b58ee 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
@@ -22,19 +22,15 @@
 package com.farsunset.cim.handler;
 
 
-import java.util.Objects;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import com.farsunset.cim.sdk.server.constant.CIMConstant;
 import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
-import com.farsunset.cim.sdk.server.model.SentBody;
 import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.SentBody;
 import com.farsunset.cim.service.CIMSessionService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Objects;
 
 
 /**
@@ -45,8 +41,6 @@ import com.farsunset.cim.service.CIMSessionService;
 @Component
 public class SessionClosedHandler implements CIMRequestHandler {
 
-	protected final Logger logger = LoggerFactory.getLogger(SessionClosedHandler.class);
-
 	@Resource
 	private CIMSessionService cimSessionService;
 	
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java b/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
index e95e0e9..1e6bed9 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
@@ -21,17 +21,15 @@
  */
 package com.farsunset.cim.push;
 
-import java.util.Objects;
-
-import javax.annotation.Resource;
-
+import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.Message;
+import com.farsunset.cim.service.ApnsService;
+import com.farsunset.cim.service.CIMSessionService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.farsunset.cim.sdk.server.model.Message;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-import com.farsunset.cim.service.ApnsService;
-import com.farsunset.cim.service.CIMSessionService;
+import javax.annotation.Resource;
+import java.util.Objects;
 
 /**
  * 消息发送实现类
@@ -55,7 +53,7 @@ public class DefaultMessagePusher implements CIMMessagePusher {
 	/**
 	 * 向用户发送消息
 	 * 
-	 * @param msg
+	 * @param message
 	 */
 	public void push(Message message) {
 		CIMSession session = cimSessionService.get(message.getReceiver());
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java b/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
deleted file mode 100644
index f1fe1cb..0000000
--- a/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- *                                                                                     *
- *                        Website : http://www.farsunset.com                           *
- *                                                                                     *
- ***************************************************************************************
- */
-package com.farsunset.cim.push;
-
-import org.springframework.stereotype.Component;
-
-import com.farsunset.cim.sdk.server.model.Message;
-
-@Component
-public class SystemMessagePusher extends DefaultMessagePusher {
-
-	@Override
-	public void push(Message message) {
-
-		message.setSender("system");
-		super.push(message);
-
-	}
-}
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/repository/SessionRepository.java b/cim-boot-server/src/main/java/com/farsunset/cim/repository/SessionRepository.java
new file mode 100644
index 0000000..08dca5c
--- /dev/null
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/repository/SessionRepository.java
@@ -0,0 +1,34 @@
+package com.farsunset.cim.repository;
+
+import com.farsunset.cim.sdk.server.model.CIMSession;
+import org.springframework.stereotype.Repository;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 正式场景下，使用redis或者数据库来存储session信息
+ */
+@Repository
+public class SessionRepository {
+
+    private ConcurrentHashMap<String, CIMSession> map = new ConcurrentHashMap<>();
+
+
+    public void save(CIMSession session){
+        map.put(session.getAccount(),session);
+    }
+
+    public CIMSession get(String account){
+        return map.get(account);
+    }
+
+    public void remove(String account){
+        map.remove(account);
+    }
+
+    public List<CIMSession> findAll(){
+        return new LinkedList<>(map.values());
+    }
+}
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
index 45fb9c8..50e355b 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
@@ -21,10 +21,10 @@
  */
 package com.farsunset.cim.service;
 
-import java.util.List;
-
 import com.farsunset.cim.sdk.server.model.CIMSession;
 
+import java.util.List;
+
 
 /**
  * 集群 session管理实现示例， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 服务器集群时
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java
similarity index 75%
rename from cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java
index 645df62..4ba00e7 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java
@@ -22,52 +22,55 @@
 package com.farsunset.cim.service.impl;
 
 
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
+import com.farsunset.cim.repository.SessionRepository;
 import com.farsunset.cim.sdk.server.handler.CIMNioSocketAcceptor;
 import com.farsunset.cim.sdk.server.model.CIMSession;
 import com.farsunset.cim.service.CIMSessionService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 
-/**
- * 集群情况下，数据库或者redis存储实现
- * 自行实现存储管理
- *
- */
-@Service("clusterSessionService")
-public class ClusterSessionServiceImpl implements CIMSessionService {
+@Service
+public class CIMSessionServiceImpl implements CIMSessionService {
 
  	@Resource
  	private CIMNioSocketAcceptor nioSocketAcceptor;
- 	
+
+ 	@Resource
+	private SessionRepository sessionRepository;
+
 	@Override
 	public void save(CIMSession session) {
-		
+		sessionRepository.save(session);
 	}
 
+	/**
+	 *
+	 * @param account 用户id
+	 * @return
+	 */
 	@Override
 	public CIMSession get(String account) {
 		 
-		/*
-		* CIMSession session = database.getSession(account);
-		* session.setIoSession(nioSocketAcceptor.getManagedSessions().get(session.getNid()));
-		* return session;
-		*/
-		
-		return null;
+		 CIMSession session = sessionRepository.get(account);
+
+		 if (session != null){
+			 session.setSession(nioSocketAcceptor.getManagedSession(session.getNid()));
+		 }
+
+		 return session;
 	}
  
 	@Override
 	public void remove(String account) {
+		sessionRepository.remove(account);
 	}
 
 	@Override
 	public List<CIMSession> list() {
-		return null;
+		return sessionRepository.findAll();
 	}
 	 
 }
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
index d82f591..b164bf5 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
@@ -21,26 +21,27 @@
  */
 package com.farsunset.cim.service.impl;
 
-import java.io.InputStream;
-import java.util.logging.Logger;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import com.farsunset.cim.sdk.server.model.Message;
-import com.farsunset.cim.service.ApnsService;
-import com.farsunset.cim.util.ApnsPayloadCompat;
-
 import cn.teaey.apns4j.Apns4j;
 import cn.teaey.apns4j.network.ApnsChannel;
 import cn.teaey.apns4j.network.ApnsChannelFactory;
 import cn.teaey.apns4j.network.ApnsGateway;
+import com.farsunset.cim.sdk.server.model.Message;
+import com.farsunset.cim.service.ApnsService;
+import com.farsunset.cim.util.ApnsPayloadCompat;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
 
 @Service
 public class JavaApnsServiceImpl implements ApnsService {
-	private final Logger logger = Logger.getLogger(JavaApnsServiceImpl.class.getName());
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(JavaApnsServiceImpl.class);
+
 	@Value("${apple.apns.p12.password}")
 	private String password;
 	@Value("${apple.apns.p12.file}")
@@ -73,11 +74,10 @@ public class JavaApnsServiceImpl implements ApnsService {
 			apnsPayload.setFormat(message.getFormat());
 			apnsPayload.setReceiver(message.getReceiver());
 			apnsChannel.send(deviceToken, apnsPayload);
-			
-			logger.info(deviceToken +"\r\ndata:" +apnsPayload.toJsonString());
-		}catch(Exception e) {
-			e.printStackTrace();
-			logger.severe(e.getLocalizedMessage());
+
+			LOGGER.info(deviceToken +"\r\ndata: {}",apnsPayload.toJsonString());
+		}catch(Exception exception) {
+			LOGGER.error("Apns has error",exception);
 		}finally {
 			apnsChannel.close();
 			IOUtils.closeQuietly(stream);
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
deleted file mode 100644
index 200b264..0000000
--- a/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- *                                                                                     *
- *                        Website : http://www.farsunset.com                           *
- *                                                                                     *
- ***************************************************************************************
- */
-package com.farsunset.cim.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.stereotype.Service;
-
-import com.farsunset.cim.sdk.server.model.CIMSession;
-import com.farsunset.cim.service.CIMSessionService;
-
-
-/**
- * 单机，内存存储实现
- *
- */
-@Service("memorySessionService")
-public class MemorySessionServiceImpl implements CIMSessionService {
-
-	private ConcurrentHashMap<String, CIMSession> sessionMap = new ConcurrentHashMap<String, CIMSession>();
-	
-	@Override
-	public void save(CIMSession session) {
-		if(session.getState() == CIMSession.STATE_DISABLED ) {
-			remove(session.getAccount());
-			return;
-		}
-		sessionMap.put(session.getAccount(), session);
-	}
-
-	@Override
-	public CIMSession get(String account) {
-		return sessionMap.get(account);
-	}
- 
-	@Override
-	public void remove(String account) {
-		sessionMap.remove(account);
-	}
-
-	@Override
-	public List<CIMSession> list() {
-		List<CIMSession> onlineList = new ArrayList<>();
-		onlineList.addAll(sessionMap.values());
-		return onlineList;
-	}
-	 
-}
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
index 2cb6566..0604407 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
@@ -25,7 +25,7 @@ import cn.teaey.apns4j.protocol.ApnsPayload;
 
 public class ApnsPayloadCompat extends ApnsPayload {
 
-	public static final String DATA = "{\"aps\": {\"message\": {\"action\":\"%s\",\"content\":\"%s\",\"sender\":\"%s\",\"receiver\":\"%s\",\"format\":\"%s\"},\"content-available\": 1}}";
+	private static final String DATA_FORMAT = "{\"aps\": {\"message\": {\"action\":\"%s\",\"content\":\"%s\",\"sender\":\"%s\",\"receiver\":\"%s\",\"format\":\"%s\"},\"content-available\": 1}}";
 
 	private String action;
 	private String content;
@@ -74,7 +74,8 @@ public class ApnsPayloadCompat extends ApnsPayload {
 		this.format = format;
 	}
 
+	@Override
 	public String toJsonString() {
-		return String.format(DATA, action, content, sender,receiver,format);
+		return String.format(DATA_FORMAT, action, content, sender,receiver,format);
 	}
 }
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
deleted file mode 100644
index 76fe196..0000000
--- a/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- *                                                                                     *
- *                        Website : http://www.farsunset.com                           *
- *                                                                                     *
- ***************************************************************************************
- */
-package com.farsunset.cim.util;
-
-public interface Constants {
-
-	public class Common {
-		public final static String STATUS_1 = "1";
-		public final static String STATUS_0 = "0";
-		public final static String STATUS_2 = "2";
-		public final static String STATUS_3 = "3";
-		public final static String TYPR_1 = "1";
-		public final static String TYPR_2 = "2";
-		public final static String TYPR_9 = "9";
-
-	}
-
-	public class User {
-		public final static Integer SUCCESS_CODE = 1;
-		public final static Integer ERROR_CODE = 0;
-		public final static String User = "User";
-
-	}
-
-	public class RequestParam {
-		public final static String CURRENTPAGE = "currentPage";
-		public final static String TYPE = "type";
-		public static final String SIZE = "size";
-
-	}
-
-	public class Number {
-
-		public final static Integer INT_0 = 0;
-		public final static Integer INT_10 = 10;
-		public final static Integer INT_403 = 403;
-
-	}
-
-	public static interface MessageType {
-
-		// 用户之间的普通消息
-		public static final String TYPE_0 = "0";
-
-		// 系统向用户发送的普通消息
-		public static final String TYPE_2 = "2";
-
-	}
-
-}
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java
deleted file mode 100644
index fdd07b9..0000000
--- a/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- *                                                                                     *
- *                        Website : http://www.farsunset.com                           *
- *                                                                                     *
- ***************************************************************************************
- */
-package com.farsunset.cim.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
-public class StringUtil {
-
-	public static boolean isEmpty(Object obj) {
-		if (null == obj)
-			return true;
-		if ("".equals(obj.toString().trim())) {
-			return true;
-		}
-		return false;
-	}
-
-	public static boolean isNotEmpty(Object obj) {
-
-		return !isEmpty(obj);
-	}
-
-	public static String getSequenceId() {
-		String mark = String.valueOf(System.currentTimeMillis());
-		return mark;
-	}
-
-	public static String getCurrentlyDateTime() {
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-		return dateFormat.format(new Date());
-	}
-
-	public static String transformDateTime(long t) {
-		Date date = new Date(t);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		return dateFormat.format(date);
-	}
-
-	public static String getCurrentlyDate() {
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-		return dateFormat.format(new Date());
-	}
-
-	public static String getUUID() {
-		return UUID.randomUUID().toString().replaceAll("-", "");
-	}
-
-}
diff --git a/cim-boot-server/src/main/resources/application.properties b/cim-boot-server/src/main/resources/application.properties
index 2ad65af..a30c355 100644
--- a/cim-boot-server/src/main/resources/application.properties
+++ b/cim-boot-server/src/main/resources/application.properties
@@ -1,5 +1,7 @@
 server.port=8080
-server.host=192.168.1.100
+server.host=127.0.0.1
+
+
 ##################################################################
 #                         Freemarker Config                      #
 ##################################################################
@@ -11,6 +13,8 @@ spring.freemarker.templateLoaderPath=classpath:/page/
 spring.freemarker.settings.auto_import = /ftl/spring.ftl as spring
 spring.messages.encoding=UTF-8
 spring.messages.basename=i18n/messages
+
+
 ##################################################################
 #                         CIM Config                             #
 ##################################################################
@@ -18,14 +22,6 @@ cim.server.port=23456
 apple.apns.debug=false
 apple.apns.p12.password= your p12 password
 apple.apns.p12.file= /apns/lvxin.p12
-##################################################################
-#                        Undertow Config                         #
-##################################################################
-server.undertow.accesslog.enabled=false
-server.undertow.worker-threads=16
-server.undertow.io-threads=8
-server.undertow.buffer-size=1024
-server.undertow.direct-buffers=true
 
 
 ##################################################################
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
index 7ed402c..82bb1ab 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
+++ b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
@@ -34,6 +34,7 @@ import android.net.Network;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
+import android.util.Log;
 
 import com.farsunset.cim.sdk.android.coder.CIMLogger;
 import com.farsunset.cim.sdk.android.constant.CIMConstant;
@@ -173,6 +174,11 @@ public class CIMPushService extends Service  {
 		String host = CIMCacheManager.getString(this, CIMCacheManager.KEY_CIM_SERVIER_HOST);
 		int port = CIMCacheManager.getInt(this, CIMCacheManager.KEY_CIM_SERVIER_PORT);
 	
+		if(host == null || host.trim().length() == 0 || port <= 0) {
+			Log.e(this.getClass().getSimpleName(), "Invalid hostname or port. host:" + host  + " port:" + port);
+			return;
+		}
+		
 		manager.connect(host, port);
 
 	}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java b/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
index 88bd1c4..49f870f 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
+++ b/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
@@ -73,7 +73,7 @@ public class CIMNioSocketAcceptor extends SimpleChannelInboundHandler<SentBody>
 
 	public void bind() {
 
-		/**
+		/*
 		 * 预制websocket握手请求的处理
 		 */
 		innerHandlerMap.put(CIMConstant.CLIENT_WEBSOCKET_HANDSHAKE, new WebsocketHandler());
@@ -135,7 +135,7 @@ public class CIMNioSocketAcceptor extends SimpleChannelInboundHandler<SentBody>
 		CIMSession session = new CIMSession(ctx.channel());
 
 		CIMRequestHandler handler = innerHandlerMap.get(body.getKey());
-		/**
+		/*
 		 * 如果有内置的特殊handler需要处理，则使用内置的
 		 */
 		if (handler != null) {
@@ -143,7 +143,7 @@ public class CIMNioSocketAcceptor extends SimpleChannelInboundHandler<SentBody>
 			return;
 		}
 
-		/**
+		/*
 		 * 有业务层去处理其他的sentbody
 		 */
 		outerRequestHandler.process(session, body);
@@ -172,7 +172,9 @@ public class CIMNioSocketAcceptor extends SimpleChannelInboundHandler<SentBody>
 			ctx.channel().writeAndFlush(HeartbeatRequest.getInstance());
 		}
 
-		// 如果心跳请求发出30秒内没收到响应，则关闭连接
+		/*
+		 * 如果心跳请求发出30秒内没收到响应，则关闭连接
+		 */
 		if (evt instanceof IdleStateEvent && ((IdleStateEvent) evt).state().equals(IdleState.READER_IDLE)) {
 
 			Long lastTime = (Long) ctx.channel().attr(AttributeKey.valueOf(CIMConstant.HEARTBEAT_KEY)).get();
@@ -189,7 +191,7 @@ public class CIMNioSocketAcceptor extends SimpleChannelInboundHandler<SentBody>
 	}
 
 	
-	public Channel getManagedChannel(String id) {
+	public Channel getManagedSession(String id) {
 		if (id == null) {
 			return null;
 		}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/CIMSession.java b/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/CIMSession.java
index 2c3b160..4bd338c 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/CIMSession.java
+++ b/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/CIMSession.java
@@ -84,6 +84,12 @@ public class CIMSession implements Serializable {
 
 	}
 
+	
+	public void setSession(Channel session) {
+		this.session = session;
+	}
+
+
 	public String getAccount() {
 		return account;
 	}