diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml
index e9a3876..41bd885 100644
--- a/cim-boot-server/cim-boot-server.iml
+++ b/cim-boot-server/cim-boot-server.iml
@@ -1,29 +1,22 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -31,78 +24,78 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
+
@@ -123,7 +116,7 @@
-
+
@@ -137,18 +130,18 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr
index 07d4d24..1a65ac8 100644
--- a/cim-boot-server/cim-boot-server.ipr
+++ b/cim-boot-server/cim-boot-server.ipr
@@ -2,6 +2,7 @@
+
@@ -14,14 +15,12 @@
-
+
-
-
-
@@ -69,133 +67,12 @@
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
-
+
@@ -263,70 +140,70 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -340,15 +217,15 @@
-
+
-
+
-
+
-
+
@@ -362,26 +239,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -406,125 +283,125 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -780,15 +657,15 @@
-
+
-
+
-
+
-
+
@@ -802,48 +679,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -879,37 +767,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -923,15 +800,15 @@
-
+
-
+
-
+
-
+
@@ -945,15 +822,15 @@
-
+
-
+
-
+
-
+
@@ -989,202 +866,213 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1209,169 +1097,169 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws
index e4dad74..9570d1b 100644
--- a/cim-boot-server/cim-boot-server.iws
+++ b/cim-boot-server/cim-boot-server.iws
@@ -1,51 +1,30 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -61,114 +40,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1557734989980
+ 1627465791411
- 1557734989980
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 1627465791411
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -185,42 +91,24 @@
+
- jar://$PROJECT_DIR$/lib/cim-server-sdk-mina-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class
- 72
-
-
-
- jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.class
- 22
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/message/PushMessageListener.java
- 24
-
+ file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/APNsServiceImpl.java
+ 49
+
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-boot-server/pom.xml b/cim-boot-server/pom.xml
index 14047dc..c273733 100644
--- a/cim-boot-server/pom.xml
+++ b/cim-boot-server/pom.xml
@@ -11,14 +11,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.4.4
+ 2.5.2
1.8
- 4.1.62.Final
- 3.11.1
+ 4.1.65.Final
+ 3.17.0
8.0.22
2.8.0
3.0.0
@@ -47,6 +47,13 @@
org.springframework.boot
spring-boot-starter-data-jpa
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
io.springfox
springfox-boot-starter
@@ -134,7 +141,6 @@
org.apache.commons
commons-lang3
- 3.8.1
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/BootApplication.java b/cim-boot-server/src/main/java/com/farsunset/cim/BootApplication.java
index 6c2dc67..eb79c0f 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/BootApplication.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/BootApplication.java
@@ -21,10 +21,16 @@
*/
package com.farsunset.cim;
+import com.farsunset.cim.config.properties.APNsProperties;
+import com.farsunset.cim.config.properties.CIMProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
@SpringBootApplication
+@EnableConfigurationProperties({
+ APNsProperties.class,
+ CIMProperties.class})
public class BootApplication {
public static void main(String[] args) {
SpringApplication.run(BootApplication.class, args);
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
index 73f3e2e..9a12c01 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
@@ -1,6 +1,7 @@
package com.farsunset.cim.config;
import com.farsunset.cim.component.handler.annotation.CIMHandler;
+import com.farsunset.cim.config.properties.CIMProperties;
import com.farsunset.cim.sdk.server.group.SessionGroup;
import com.farsunset.cim.sdk.server.group.TagSessionGroup;
import com.farsunset.cim.sdk.server.handler.CIMNioSocketAcceptor;
@@ -42,12 +43,11 @@ public class CIMConfig implements CIMRequestHandler, ApplicationListener