v3.2 发布，修正了若干bug！

JackJiang2011 · Jan 3, 2018 · b9edc22 · b9edc22
1 parent c8f64ea
commit b9edc22
Show file tree

Hide file tree

Showing 744 changed files with 15,286 additions and 13,654 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@
 * 可与姊妹工程 [MobileIMSDK-Web](http://www.52im.net/thread-959-1-1.html) 无缝互通实现网页端聊天或推送等；:point_left:
 * 可应用于跨设备、跨网络的聊天APP、企业OA、消息推送等各种场景。
 
-> MobileIMSDK工程始于2013年10月（2017年12月11日发布了最新版v3.1），起初用作某产品的即时通讯底层实现，完全从零开发。<br>
+> MobileIMSDK工程始于2013年10月（2018年01月03日发布了最新版v3.2），起初用作某产品的即时通讯底层实现，完全从零开发。<br>
 MobileIMSDK现已公开并免费供开发者使用，希望对需要的人有所启发和帮助。
 
 :point_right: 您可能需要：[查看更多关于MobileIMSDK的疑问及解答](http://www.52im.net/thread-60-1-1.html)。

diff --git a/demos/client/MobileIMSDKDemo-Android.apk b/demos/client/MobileIMSDKDemo-Android.apk
diff --git a/demos/client/MobileIMSDKDemo-Java.jar b/demos/client/MobileIMSDKDemo-Java.jar
diff --git a/...oy_v3.1b20171211/classes/log4j.properties → ...oy_v3.2b20180103/classes/log4j.properties b/...oy_v3.1b20171211/classes/log4j.properties → ...oy_v3.2b20180103/classes/log4j.properties
@@ -1,4 +1,4 @@
-#############################################################################
+#############################################################################
 # 本文件是Log4j的配置文件,你可以通过修改本文件中相应的键灵活配置Log4j的日志服务.#
 # author: Jack Jiang                                                        #
 # others: Autumn 2006                                                       #
@@ -62,5 +62,15 @@ log4j.appender.Dest3.ImmediateFlush=true
 #level is Level.INFO、destination is console and file
 log4j.rootLogger=DEBUG,Dest2,Dest1
 #log4j.additivity.rootLogger=false
+
+#Config another Logger in order to invoke later for system
+#level is Level.INFO、destination is console
+log4j.logger.myec.logger=INFO,Dest1,Dest3
+#Disable additivity
+log4j.additivity.myec.logger=false
+
+#Config Another logger only usage output info to console,
+#Appender inheriate from Logger myec.logger only
+log4j.logger.myec.logger.toConsoleOnly=INFO
 #---------Loggers config end--------#
 
diff --git a/.../demo/MessageQoSEventS2CListnerImpl.class → .../demo/MessageQoSEventS2CListnerImpl.class b/.../demo/MessageQoSEventS2CListnerImpl.class → .../demo/MessageQoSEventS2CListnerImpl.class
diff --git a/...server/demo/ServerEventListenerImpl.class → ...server/demo/ServerEventListenerImpl.class b/...server/demo/ServerEventListenerImpl.class → ...server/demo/ServerEventListenerImpl.class
diff --git a/...msdk/server/demo/ServerLauncherImpl.class → ...msdk/server/demo/ServerLauncherImpl.class b/...msdk/server/demo/ServerLauncherImpl.class → ...msdk/server/demo/ServerLauncherImpl.class
diff --git a/...mina/core/filterchain/IoFilterEvent.class → ...mina/core/filterchain/IoFilterEvent.class b/...mina/core/filterchain/IoFilterEvent.class → ...mina/core/filterchain/IoFilterEvent.class
diff --git a/...b20171211/lib/MobileIMSDKServerX_mina.jar → ...b20180103/lib/MobileIMSDKServerX_mina.jar b/...b20171211/lib/MobileIMSDKServerX_mina.jar → ...b20180103/lib/MobileIMSDKServerX_mina.jar
diff --git a/...ina_deploy_v3.1b20171211/lib/gson-2.7.jar → ...ina_deploy_v3.2b20180103/lib/gson-2.7.jar b/...ina_deploy_v3.1b20171211/lib/gson-2.7.jar → ...ina_deploy_v3.2b20180103/lib/gson-2.7.jar
diff --git a/...deploy_v3.1b20171211/lib/log4j-1.2.17.jar → ...deploy_v3.2b20180103/lib/log4j-1.2.17.jar b/...deploy_v3.1b20171211/lib/log4j-1.2.17.jar → ...deploy_v3.2b20180103/lib/log4j-1.2.17.jar
diff --git a/...oy_v3.1b20171211/lib/mina-core-2.0.14.jar → ...oy_v3.2b20180103/lib/mina-core-2.0.14.jar b/...oy_v3.1b20171211/lib/mina-core-2.0.14.jar → ...oy_v3.2b20180103/lib/mina-core-2.0.14.jar
diff --git a/...loy_v3.1b20171211/lib/rabbitmq-client.jar → ...loy_v3.2b20180103/lib/rabbitmq-client.jar b/...loy_v3.1b20171211/lib/rabbitmq-client.jar → ...loy_v3.2b20180103/lib/rabbitmq-client.jar
diff --git a/...oy_v3.1b20171211/lib/slf4j-api-1.7.21.jar → ...oy_v3.2b20180103/lib/slf4j-api-1.7.21.jar b/...oy_v3.1b20171211/lib/slf4j-api-1.7.21.jar → ...oy_v3.2b20180103/lib/slf4j-api-1.7.21.jar
diff --git a/...3.1b20171211/lib/slf4j-log4j12-1.7.21.jar → ...3.2b20180103/lib/slf4j-log4j12-1.7.21.jar b/...3.1b20171211/lib/slf4j-log4j12-1.7.21.jar → ...3.2b20180103/lib/slf4j-log4j12-1.7.21.jar
diff --git a/...erDemoX_mina_deploy_v3.1b20171211/run.bat → ...erDemoX_mina_deploy_v3.2b20180103/run.bat b/...erDemoX_mina_deploy_v3.1b20171211/run.bat → ...erDemoX_mina_deploy_v3.2b20180103/run.bat
@@ -1,6 +1,6 @@
 @echo off
 
-@echo 欢迎使用 MobileIMSDK v3.1 服务端-Mina版 (build20171211)
+@echo 欢迎使用 MobileIMSDK v3.2 服务端-Mina版 (build20180103)
 @echo.
 @echo IM核心服务器正在运行中...
 @echo.

diff --git a/...oy_v3.1b20171211/classes/log4j.properties → ...oy_v3.2b20180103/classes/log4j.properties b/...oy_v3.1b20171211/classes/log4j.properties → ...oy_v3.2b20180103/classes/log4j.properties
@@ -1,4 +1,4 @@
-#############################################################################
+#############################################################################
 # 本文件是Log4j的配置文件,你可以通过修改本文件中相应的键灵活配置Log4j的日志服务.#
 # author: Jack Jiang                                                        #
 # others: Autumn 2006                                                       #
@@ -62,5 +62,15 @@ log4j.appender.Dest3.ImmediateFlush=true
 #level is Level.INFO、destination is console and file
 log4j.rootLogger=DEBUG,Dest2,Dest1
 #log4j.additivity.rootLogger=false
+
+#Config another Logger in order to invoke later for system
+#level is Level.INFO、destination is console
+log4j.logger.myec.logger=INFO,Dest1,Dest3
+#Disable additivity
+log4j.additivity.myec.logger=false
+
+#Config Another logger only usage output info to console,
+#Appender inheriate from Logger myec.logger only
+log4j.logger.myec.logger.toConsoleOnly=INFO
 #---------Loggers config end--------#
 
diff --git a/.../demo/MessageQoSEventS2CListnerImpl.class → .../demo/MessageQoSEventS2CListnerImpl.class b/.../demo/MessageQoSEventS2CListnerImpl.class → .../demo/MessageQoSEventS2CListnerImpl.class
diff --git a/...server/demo/ServerEventListenerImpl.class → ...server/demo/ServerEventListenerImpl.class b/...server/demo/ServerEventListenerImpl.class → ...server/demo/ServerEventListenerImpl.class
diff --git a/...dk/server/demo/ServerLauncherImpl$1.class → ...dk/server/demo/ServerLauncherImpl$1.class b/...dk/server/demo/ServerLauncherImpl$1.class → ...dk/server/demo/ServerLauncherImpl$1.class
diff --git a/...msdk/server/demo/ServerLauncherImpl.class → ...msdk/server/demo/ServerLauncherImpl.class b/...msdk/server/demo/ServerLauncherImpl.class → ...msdk/server/demo/ServerLauncherImpl.class
diff --git a/...20171211/lib/MobileIMSDKServerX_netty.jar → ...20180103/lib/MobileIMSDKServerX_netty.jar b/...20171211/lib/MobileIMSDKServerX_netty.jar → ...20180103/lib/MobileIMSDKServerX_netty.jar
diff --git a/...tty_deploy_v3.1b20171211/lib/gson-2.7.jar → ...tty_deploy_v3.2b20180103/lib/gson-2.7.jar b/...tty_deploy_v3.1b20171211/lib/gson-2.7.jar → ...tty_deploy_v3.2b20180103/lib/gson-2.7.jar
diff --git a/...deploy_v3.1b20171211/lib/log4j-1.2.17.jar → ...deploy_v3.2b20180103/lib/log4j-1.2.17.jar b/...deploy_v3.1b20171211/lib/log4j-1.2.17.jar → ...deploy_v3.2b20180103/lib/log4j-1.2.17.jar
diff --git a/...1b20171211/lib/netty-all-4.1.17.Final.jar → ...2b20180103/lib/netty-all-4.1.17.Final.jar b/...1b20171211/lib/netty-all-4.1.17.Final.jar → ...2b20180103/lib/netty-all-4.1.17.Final.jar
diff --git a/...loy_v3.1b20171211/lib/rabbitmq-client.jar → ...loy_v3.2b20180103/lib/rabbitmq-client.jar b/...loy_v3.1b20171211/lib/rabbitmq-client.jar → ...loy_v3.2b20180103/lib/rabbitmq-client.jar
diff --git a/...oy_v3.1b20171211/lib/slf4j-api-1.7.21.jar → ...oy_v3.2b20180103/lib/slf4j-api-1.7.21.jar b/...oy_v3.1b20171211/lib/slf4j-api-1.7.21.jar → ...oy_v3.2b20180103/lib/slf4j-api-1.7.21.jar
diff --git a/...3.1b20171211/lib/slf4j-log4j12-1.7.21.jar → ...3.2b20180103/lib/slf4j-log4j12-1.7.21.jar b/...3.1b20171211/lib/slf4j-log4j12-1.7.21.jar → ...3.2b20180103/lib/slf4j-log4j12-1.7.21.jar
diff --git a/...rDemoX_netty_deploy_v3.1b20171211/run.bat → ...rDemoX_netty_deploy_v3.2b20180103/run.bat b/...rDemoX_netty_deploy_v3.1b20171211/run.bat → ...rDemoX_netty_deploy_v3.2b20180103/run.bat
@@ -1,6 +1,6 @@
 @echo off
 
-@echo 欢迎使用 MobileIMSDK v3.1 服务端-Netty版 (build20171211)
+@echo 欢迎使用 MobileIMSDK v3.2 服务端-Netty版 (build20180103)
 @echo.
 @echo IM核心服务器正在运行中...
 @echo.

diff --git a/dist/client/android/MobileIMSDK4a.jar b/dist/client/android/MobileIMSDK4a.jar
diff --git a/dist/client/ios/libMobileIMSDK4iX_common.a b/dist/client/ios/libMobileIMSDK4iX_common.a
diff --git a/dist/client/ios/usr/local/include/AutoReLoginDaemon.h b/dist/client/ios/usr/local/include/AutoReLoginDaemon.h
@@ -23,83 +23,16 @@
 #import <Foundation/Foundation.h>
 #import "CompletionDefine.h"
 
-/*!
- * 与服务端通信中断后的自动登陆（重连）独立线程。
- * <p>
- * 鉴于无线网络的不可靠性和特殊性，移动端的即时通讯经常存在网络通信断断续续的
- * 状况，可能的原因有（但不限于）：无线网络信号不稳定、WiFi与2G/3G/4G等同开情
- * 况下的网络切换、手机系统的省电策略等。这就使得即时通信框架拥有对上层透明且健
- * 壮的健康度探测和自动治愈机制非常有必要。
- * <p>
- * 本类的存在使得MobileIMSDK框架拥有通信自动治愈的能力。
- * <p>
- * <b>注意：</b>自动登陆（重连）只可能发生在登陆成功后与服务端的网络通信断开时。
- * <p>
- * <b>本线程的启停，目前属于MobileIMSDK算法的一部分，暂时无需也不建议由应用层自行调用。</b>
- *
- * @author Jack Jiang, 2014-10-24
- * @version 1.0
- */
 @interface AutoReLoginDaemon : NSObject
 
-/// 获取本类的单例。使用单例访问本类的所有资源是唯一的合法途径。
 + (AutoReLoginDaemon *)sharedInstance;
 
-/*!
- *  @Author Jack Jiang, 14-10-31 15:10:24
- *
- * 设置自动重新登陆时间间隔（单位：毫秒），默认2000毫秒。
- * <p>
- * 此参数只会影响断线后与服务器连接的即时性，不受任何配置参数
- * 的影响。请基于重连（重登陆）即时性和手机能耗上作出权衡。
- * <p>
- * 除非对MobileIMSDK的整个即时通讯算法非常了解，否则请勿尝试单独设置本参数。如
- * 需调整心跳频率请见 {@link [ConfigEntity.setSenseMode:SenseMode]}。
- *
- *  @param autoReLoginInterval
- */
 + (void) setAUTO_RE_LOGIN_INTERVAL:(int)autoReLoginInterval;
-
-/*!
- *  @Author Jack Jiang, 14-10-31 15:10:28
- *
- *  获取自动重新登陆时间间隔（单位：毫秒）.
- *
- *  @return
- */
 + (int) getAUTO_RE_LOGIN_INTERVAL;
 
-/*!
- * 无条件中断本线程的运行。
- *
- * @warning 本线程的启停，目前属于MobileIMSDK算法的一部分，暂时无需也不建议由应用层自行调用。
- */
 - (void) stop;
-
-/*!
- * 启动线程。
- * <p>
- * 无论本方法调用前线程是否已经在运行中，都会尝试首先调用 @link stop @/link 方法，
- * 以便确保线程被启动前是真正处于停止状态，这也意味着可无害调用本方法。
- * <p>
- *
- * @param immediately true表示立即执行线程作业，否则直到 {@link #AUTO_RE$LOGIN_INTERVAL}
- * 执行间隔的到来才进行首次作业的执行
- */
 - (void) start:(BOOL)immediately;
-
-/*!
- * 线程是否正在运行中。
- *
- * @return true表示是，否则线路处于停止状态
- */
 - (BOOL) isAutoReLoginRunning;
-
-/*!
- *  @Author Jack Jiang, 14-11-07 22:11:28
- *
- *  Just for DEBUG.
- */
 - (void) setDebugObserver:(ObserverCompletion)debugObserver;
 
 @end
diff --git a/dist/client/ios/usr/local/include/CharsetHelper.h b/dist/client/ios/usr/local/include/CharsetHelper.h
@@ -22,37 +22,10 @@
 
 #import <Foundation/Foundation.h>
 
-/*!
- * 数据交互的编解码实现类。
- *
- * @author Jack Jiang, 2014-10-22
- * @version 1.0
- */
 @interface CharsetHelper : NSObject
 
-/*!
- * 将byte数组按UTF-8编码组织成字符串并返回.
- *
- * @param data
- * @return 成功解码完成则返回字符串，否则返回nil
- */
 + (NSString *) getString:(NSData *)data;
-
-/*!
- * 将key-values对象转换成JSON表示的byte数组（以便网络传输待场景下）.
- *
- * @param keyValuesForJASON
- * @return 如果JSON转换成功则返回JSON表示的byte数组，否则返回nil
- */
 + (NSData *) getJSONBytesWithDictionary:(NSDictionary *)keyValuesForJASON;
-
-/*!
- *  将字符串按UTF-8编码成byte数组。
- *
- *  @param str 字符串
- *
- *  @return 编码后的byte数组结果
- */
 + (NSData *) getBytesWithString:(NSString *)str;
 
 @end
diff --git a/dist/client/ios/usr/local/include/ChatBaseEvent.h b/dist/client/ios/usr/local/include/ChatBaseEvent.h
@@ -22,36 +22,9 @@
 
 #import <Foundation/Foundation.h>
 
-/*! @protocol ChatBaseEvent
- * MobileIMSDK的基础通信消息的回调事件接口（如：登陆成功事件
- * 通知、掉线事件通知等）。
- * <br>
- * 实现此接口后，通过 [ClientCoreSDK setChatBaseEvent:]方法设置之，
- * 可实现回调事件的通知和处理。
- *
- * @author Jack Jiang, 2014-10-21
- * @version 1.0
- * @see ClientCoreSDK
- */
 @protocol ChatBaseEvent <NSObject>
 
-/*!
- * 本地用户的登陆结果回调事件通知。
- *
- * @param dwErrorCode 服务端反馈的登录结果：0 表示登陆成功，否则为服务端自定义的出错代码（按照约定通常为>=1025的数）
- */
 - (void) onLoginMessage:(int) dwErrorCode;
-
-/*!
- * 与服务端的通信断开的回调事件通知。
- *
- * <br>
- * 该消息只有在客户端连接服务器成功之后网络异常中断之时触发。
- * 导致与与服务端的通信断开的原因有（但不限于）：无线网络信号不稳定、WiFi与2G/3G/4G等同开情
- * 况下的网络切换、手机系统的省电策略等。
- *
- * @param dwErrorCode 本回调参数表示表示连接断开的原因，目前错误码没有太多意义，仅作保留字段，目前通常为-1
- */
 - (void) onLinkCloseMessage:(int)dwErrorCode;
 
 @end
diff --git a/dist/client/ios/usr/local/include/ChatTransDataEvent.h b/dist/client/ios/usr/local/include/ChatTransDataEvent.h
@@ -23,37 +23,9 @@
 #import <Foundation/Foundation.h>
 #import "ErrorCode.h"
 
-/*! @protocol ChatTransDataEvent
- * MobileIMSDK的通用数据通信消息的回调事件接口（如：收到聊天数据事件
- * 通知、服务端返回的错误信息事件通知等）。
- * <br>
- * 实现此接口后，通过 @link [ClientCoreSDK setChatTransDataEvent:] @/link
- * 方法设置之，可实现回调事件的通知和处理。
- *
- * @author Jack Jiang, 2014-10-21
- * @version 1.0
- * @see ClientCoreSDK
- */
 @protocol ChatTransDataEvent <NSObject>
 
-/*!
- * 收到普通消息的回调事件通知。
- * <br>
- * 应用层可以将此消息进一步按自已的IM协议进行定义，从而实现完整的即时通信软件逻辑。
- *
- * @param fingerPrintOfProtocal 当该消息需要QoS支持时本回调参数为该消息的特征指纹码，否则为null
- * @param userid 消息的发送者id（RainbowCore框架中规定发送者id=“0”即表示是由服务端主动发过的，否则表示的是其它客户端发过来的消息）
- * @param dataContent 消息内容的文本表示形式
- */
 - (void) onTransBuffer:(NSString*)fingerPrintOfProtocal withUserId:(NSString*)userid andContent:(NSString*)dataContent andTypeu:(int)typeu;
-
-/*!
- * 服务端反馈的出错信息回调事件通知。
- *
- * @param errorCode 错误码，定义在常量表 ErrorCode 中有关服务端错误码的定义
- * @param errorMsg 描述错误内容的文本信息
- * @see ErrorCode
- */
 - (void) onErrorResponse:(int)errorCode withErrorMsg:(NSString*)errorMsg;
 
 @end