From 418c26f6f9bad4ec1070d7e2f49ccfd7a9a9c477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= Date: Thu, 23 Sep 2021 20:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ChannelAttr.LANGUAGE=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim-boot-server/cim-boot-server.ipr | 33 +--- cim-boot-server/cim-boot-server.iws | 149 ++++-------------- .../libs/cim-server-sdk-netty-4.0.0.jar | Bin 79349 -> 79382 bytes 3 files changed, 34 insertions(+), 148 deletions(-) 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 - - - - - - - - file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/APNsServiceImpl.java - 49 - - - - - - -