diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr
index 1a65ac8..0ee9871 100644
--- a/cim-boot-server/cim-boot-server.ipr
+++ b/cim-boot-server/cim-boot-server.ipr
@@ -21,37 +21,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -72,7 +41,7 @@
-
+
diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws
index ac9d9d1..5453894 100644
--- a/cim-boot-server/cim-boot-server.iws
+++ b/cim-boot-server/cim-boot-server.iws
@@ -4,149 +4,66 @@
-
-<<<<<<< HEAD
-
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> bcb7a59ef440a21ae7f3d7778e84f49e971e162f
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 1627465791411
+
+ 1632398352014
-<<<<<<< HEAD
- 1557734989980
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
- 1627465791411
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> bcb7a59ef440a21ae7f3d7778e84f49e971e162f
+ 1632398352014
+
-
-
-
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/APNsServiceImpl.java
- 49
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar b/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar
index ffcbccf..f446a41 100644
Binary files a/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar and b/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar differ