mirror of
https://gitee.com/farsunset/cim.git
synced 2025-08-02 04:42:35 +08:00
修改服务端sdk一处可能出现空指针的问题
This commit is contained in:
远方夕阳
parent
cada6b890e
commit
c9c317d6c8
@ -143,6 +143,8 @@
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.62.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.62.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.62.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.62.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.62.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.teaey.apns4j:apns4j:1.1.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
|
||||
|
||||
@ -483,6 +483,28 @@
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.62.Final/netty-resolver-4.1.62.Final-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.62.Final">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.62.Final/netty-transport-native-epoll-4.1.62.Final-linux-x86_64.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.62.Final/netty-transport-native-epoll-4.1.62.Final-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.62.Final/netty-transport-native-epoll-4.1.62.Final-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: io.netty:netty-transport-native-unix-common:4.1.62.Final">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.62.Final/netty-transport-native-unix-common-4.1.62.Final.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.62.Final/netty-transport-native-unix-common-4.1.62.Final-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.62.Final/netty-transport-native-unix-common-4.1.62.Final-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: io.netty:netty-transport:4.1.62.Final">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.62.Final/netty-transport-4.1.62.Final.jar!/" />
|
||||
|
||||
@ -8,229 +8,11 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="bed47126-03b3-4370-a6c1-08503492974f" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/jar.bat" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/jar.sh" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/libs/cim-server-sdk-netty-4.0.0.jar" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/run.bat" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/run.sh" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/BootApplication.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/handler/BindHandler.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/handler/annotation/CIMHandler.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/message/BindMessageListener.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/message/PushMessageListener.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/redis/KeyValueRedisTemplate.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/redis/SignalRedisTemplate.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/RedisConfig.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/SwaggerConfig.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/mvc/controller/api/APNsController.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/SessionService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/SessionServiceImpl.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/resources/apns/app.p12" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../3.8.0.VERSION" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../README.md" beforeDir="false" afterPath="$PROJECT_DIR$/../README.md" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cim-boot-server.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cim-boot-server.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cim-boot-server.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/cim-boot-server.ipr" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cim-boot-server.iws" beforeDir="false" afterPath="$PROJECT_DIR$/cim-boot-server.iws" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/libs/cim-server-sdk-mina-3.8.0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/libs/cim-server-sdk-netty-3.8.0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/ServerLauncher.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/mvc/controller/admin/NavigationController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/admin/controller/SessionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/mvc/controller/admin/SessionController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/api/controller/MessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/mvc/controller/api/MessageController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/CIMConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/config/CIMConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/BindHandler.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/handler/ClosedHandler.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/push/CIMMessagePusher.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/push/DefaultMessagePusher.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/repository/SessionRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/repository/SessionRepository.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/ApnsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/APNsService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/CIMSessionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/constants/Constants.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/CIMSessionServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/service/impl/APNsServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/i18n/messages.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/i18n/messages.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/page/console/nav.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/page/console/nav.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/page/console/session/manage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/page/console/session/manage.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/page/console/webclient/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/page/console/webclient/index.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/cim/cim.web.sdk.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/cim/cim.web.sdk.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk-libs/android/cim-android-sdk-3.8.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk-libs/java/cim-java-sdk-3.8.0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk-libs/js/cim.web.sdk.js" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk-libs/js/cim.web.sdk.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMListenerManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMListenerManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/constant/CIMConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/constant/CIMConstant.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/logger/CIMLogger.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/logger/CIMLogger.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Message.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Ping.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Ping.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Pong.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Pong.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-ios-sdk/CIMKit/CIMKit/Handler/CIMSendMessageData.m" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-client-sdk/cim-ios-sdk/CIMKit/CIMKit/Handler/CIMSendMessageData.m" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/cim-java-sdk.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/jar.bat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/jar.sh" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/pom.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMCacheManager.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMConnectorManager.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventListener.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMListenerManager.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushManager.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/CIMLogger.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/constant/CIMConstant.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Intent.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Message.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Protobufable.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/ReplyBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/SentBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/Message.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/MessageProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-vue/Auto.vue" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-vue/websocket/cim.web.sdk.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-vue/websocket/message.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-vue/websocket/replybody.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-client-vue/websocket/sentbody.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/cim-server-sdk-mina.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/jar.bat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/jar.sh" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/pom.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageCodecFactory.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageDecoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageEncoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageCodecFactory.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageDecoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/constant/CIMConstant.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/CIMSession.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HandshakerResponse.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Message.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/ReplyBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/SentBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Transportable.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/Message.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/MessageProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/SentBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/Session.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/SessionProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/cim-server-sdk-netty.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/jar.bat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/jar.sh" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/pom.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageDecoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageEncoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageDecoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/constant/CIMConstant.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/handler/HeartbeatHandler.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/CIMSession.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/Message.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/ReplyBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/SentBody.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/Transportable.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/Message.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/MessageProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/SentBody.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/Session.proto" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/cim-server-sdk-netty/src/main/java/com/farsunset/cim/sdk/server/model/proto/SessionProto.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.gitignore" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/caches/build_file_checksums.ser" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/caches/gradle_models.ser" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/encodings.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/gradle.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/modules.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/runConfigurations.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/.idea/vcs.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/.gitignore" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.8.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/proguard-rules.pro" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/proguard-rules.pro" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/AndroidManifest.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/adapter/MessageTimeDescComparator.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/adapter/SystemMsgListViewAdapter.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/app/CIMMonitorActivity.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/app/Constant.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/receiver/CIMPushManagerReceiver.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/ui/LoginActivity.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/ui/SplashActivity.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/java/com/farsunset/ichat/example/ui/SystemMessageActivity.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/color/login_text_button_selector.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/icon.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/login_bg.jpg" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/login_default_avatar.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/login_input.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_common_btn_blue_bg_pressed.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_common_btn_blue_unpressed.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_header_bar_bg.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_header_btn_back_normal.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_header_btn_back_press.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_msgbox_bg_nor.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_msgbox_bg_pressed.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/skin_msgbox_bg_top.9.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable-hdpi/splash_bg.jpg" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable/common_button_blue.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable/common_msgbox_bg.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/drawable/top_back_left_selector.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/activity_login.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/activity_splansh.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/activity_system_chat.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/item_chat_sysmsg.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/layout/layout_global_top_header.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/values/colors.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/values/strings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/app/src/main/res/values/styles.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradle.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradlew" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradlew.bat" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/gradlew.bat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-android/settings.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/cim-client-java.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/cim-java-client.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/libs/cim-java-sdk-3.8.0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/pom.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-java/src/main/java/CIMJavaClient.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-web/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-web/index.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-use-examples/cim-client-web/js/cim/cim.web.sdk.js" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-use-examples/cim-client-web/js/cim/cim.web.sdk.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../doc/AndroidSDK使用文档.doc" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../doc/IOS或PC客户端等SDK开发文档.doc" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../doc/JavaSDK使用文档.doc" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/handler/ClosedHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/handler/ClosedHandler.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/group/SessionGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/../cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/group/SessionGroup.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -308,17 +90,6 @@
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
|
||||
<option name="arquillianRunConfiguration">
|
||||
<value>
|
||||
<option name="containerStateName" value="" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="BootApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
|
||||
<module name="cim-boot-server" />
|
||||
<extension name="coverage">
|
||||
@ -375,6 +146,9 @@
|
||||
<workItem from="1619014134954" duration="548000" />
|
||||
<workItem from="1619185841584" duration="14228000" />
|
||||
<workItem from="1619619256370" duration="6445000" />
|
||||
<workItem from="1621948445182" duration="764000" />
|
||||
<workItem from="1621956423905" duration="116000" />
|
||||
<workItem from="1622640308758" duration="60000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
Binary file not shown.
@ -50,6 +50,10 @@ public class ClosedHandler implements CIMRequestHandler {
|
||||
|
||||
String uid = channel.attr(ChannelAttr.UID).get();
|
||||
|
||||
if (uid == null){
|
||||
return;
|
||||
}
|
||||
|
||||
String nid = channel.attr(ChannelAttr.ID).get();
|
||||
|
||||
sessionGroup.remove(channel);
|
||||
|
||||
@ -20,9 +20,7 @@ public class SessionGroup extends ConcurrentHashMap<String, Collection<Channel>>
|
||||
@Override
|
||||
public void operationComplete(ChannelFuture future){
|
||||
future.removeListener(this);
|
||||
|
||||
remove(future.channel());
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
@ -34,6 +32,10 @@ public class SessionGroup extends ConcurrentHashMap<String, Collection<Channel>>
|
||||
|
||||
String uid = getKey(channel);
|
||||
|
||||
if(uid == null){
|
||||
return;
|
||||
}
|
||||
|
||||
Collection<Channel> collections = getOrDefault(uid,EMPTY_LIST);
|
||||
|
||||
collections.remove(channel);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user