From d2e9727df79e15f3f63ec3debf88da03d3fb3e61 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, 18 Aug 2022 15:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=84=E5=BB=BAmaven?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim-client-sdk/cim-android-sdk/pom.xml | 134 ++++++++++++++++-- cim-client-sdk/cim-android-sdk/release.sh | 1 + .../cim/sdk/android/CIMEventListener.java | 7 +- .../cim/sdk/android/CIMPushManager.java | 80 ++++++++++- cim-server-sdk/pom.xml | 130 +++++++++++++++-- cim-server-sdk/release.sh | 1 + .../cim/acceptor/AppSocketAcceptor.java | 5 +- .../cim/acceptor/NioSocketAcceptor.java | 2 +- .../cim/acceptor/WebsocketAcceptor.java | 5 +- .../cim/acceptor/config/AppSocketConfig.java | 9 ++ .../cim/acceptor/config/WebsocketConfig.java | 18 +++ .../cim/coder/json/TextMessageEncoder.java | 2 +- .../cim/coder/json/TransmitBody.java | 2 +- .../cim/coder/protobuf/AppMessageDecoder.java | 2 +- .../cim/coder/protobuf/AppMessageEncoder.java | 2 +- .../cim/coder/protobuf/WebMessageDecoder.java | 2 +- .../cim/coder/protobuf/WebMessageEncoder.java | 2 +- .../farsunset/cim/constant/CIMConstant.java | 2 +- .../com/farsunset/cim/constant/DataType.java | 2 +- .../cim/constant/WebsocketProtocol.java | 2 +- .../exception/ReadInvalidTypeException.java | 2 +- .../com/farsunset/cim/group/SessionGroup.java | 4 + .../farsunset/cim/group/TagSessionGroup.java | 5 + .../cim/handler/CIMRequestHandler.java | 2 +- .../farsunset/cim/handler/LoggingHandler.java | 2 +- .../cim/handshake/HandshakeEvent.java | 2 +- .../cim/handshake/HandshakeHandler.java | 2 +- .../java/com/farsunset/cim/model/Message.java | 2 +- .../java/com/farsunset/cim/model/Ping.java | 2 +- .../java/com/farsunset/cim/model/Pong.java | 2 +- .../com/farsunset/cim/model/ReplyBody.java | 2 +- .../com/farsunset/cim/model/SentBody.java | 2 +- .../farsunset/cim/model/Transportable.java | 2 +- 33 files changed, 377 insertions(+), 64 deletions(-) create mode 100755 cim-client-sdk/cim-android-sdk/release.sh create mode 100755 cim-server-sdk/release.sh diff --git a/cim-client-sdk/cim-android-sdk/pom.xml b/cim-client-sdk/cim-android-sdk/pom.xml index 145616b..bb485ca 100755 --- a/cim-client-sdk/cim-android-sdk/pom.xml +++ b/cim-client-sdk/cim-android-sdk/pom.xml @@ -9,6 +9,22 @@ 4.2.0 jar + ${project.groupId}:${project.artifactId} + Netty based instant messaging android sdk + https://github.com/farsunset/cim + + + + Apache License + http://www.apache.org/licenses/ + + + + https://github.com/farsunset/cim.git + https://github.com/farsunset/cim + + + UTF-8 UTF-8 @@ -18,8 +34,6 @@ - - com.google.protobuf protobuf-lite @@ -35,17 +49,107 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 8 - 8 - - - - + + + + + release + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + private + true + UTF-8 + UTF-8 + UTF-8 + -Xdoclint:none + + + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + true + true + UTF-8 + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Jun Xia + 3979434@qq.com + + Developer + + +8 + + \ No newline at end of file diff --git a/cim-client-sdk/cim-android-sdk/release.sh b/cim-client-sdk/cim-android-sdk/release.sh new file mode 100755 index 0000000..ce3a0a0 --- /dev/null +++ b/cim-client-sdk/cim-android-sdk/release.sh @@ -0,0 +1 @@ +mvn clean install deploy -P release \ No newline at end of file diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java index a947838..9ea9b24 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java @@ -33,35 +33,30 @@ public interface CIMEventListener { /** * 当收到服务端推送过来的消息时调用 - * * @param message */ void onMessageReceived(Message message); /** - * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用 - * + * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得服务端响应时调用 * @param body */ void onReplyReceived(ReplyBody body); /** * 当调用CIMPushManager.sendRequest()向服务端发送请求成功时 - * * @param body */ void onSendFinished(SentBody body); /** * 当手机网络发生变化时调用 - * * @param info */ void onNetworkChanged(NetworkInfo info); /** * 当连接服务器成功时回调 - * * @param hasAutoBind true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount */ void onConnectFinished(boolean hasAutoBind); diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java index e83fcf4..130bc18 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java @@ -38,7 +38,7 @@ import java.util.Locale; import java.util.UUID; /** - * CIM 功能接口 + * CIM客户端sdk功能接口 */ public class CIMPushManager { @@ -63,6 +63,9 @@ public class CIMPushManager { /** * 初始化,连接服务端，在程序启动页或者 在Application里调用 + * @param context + * @param host cim服务端IP或者域名 + * @param port cim服务端端口 */ public static void connect(Context context, String host, int port) { @@ -84,6 +87,11 @@ public class CIMPushManager { } + /** + * 设置SDK日志打印开关 + * @param context + * @param enable + */ public static void setLoggerEnable(Context context, boolean enable) { Intent serviceIntent = new Intent(context, CIMPushService.class); serviceIntent.putExtra(CIMPushService.KEY_LOGGER_ENABLE, enable); @@ -91,6 +99,14 @@ public class CIMPushManager { startService(context, serviceIntent); } + + /** + * 开启常驻通知栏 + * @param context + * @param icon 通知图标 + * @param channel 通知channel + * @param message 显示内容 + */ public static void startForeground(Context context,int icon, String channel , String message) { Intent serviceIntent = new Intent(context, CIMPushService.class); serviceIntent.putExtra(CIMPushService.KEY_NOTIFICATION_MESSAGE, message); @@ -100,6 +116,10 @@ public class CIMPushManager { startService(context, serviceIntent); } + /** + * 关闭常驻通知栏 + * @param context + */ public static void cancelForeground(Context context) { Intent serviceIntent = new Intent(context, CIMPushService.class); serviceIntent.setAction(ACTION_HIDE_PERSIST_NOTIFICATION); @@ -107,12 +127,21 @@ public class CIMPushManager { } /** - * 设置一个账号登录到服务端 + * bind账户 + * 通知服务端 长连接和uid进行关联 + * @param context + * @param uid 用户标识 */ - public static void bind(Context context, long uid) { bind(context,String.valueOf(uid)); } + + /** + * bind账户 + * 通知服务端 长连接和uid进行关联 + * @param context + * @param uid 用户标识 + */ public static void bind(Context context, String uid) { if (isDestroyed(context)) { @@ -122,6 +151,11 @@ public class CIMPushManager { sendBindRequest(context, uid); } + /** + * 通知服务端给当前长连接设置tag + * @param context + * @param tag 标识 + */ public static void setTag(Context context, String tag) { SentBody sent = new SentBody(); @@ -131,6 +165,10 @@ public class CIMPushManager { } + /** + * 通知服务端清除tag + * @param context + */ public static void removeTag(Context context) { SentBody sent = new SentBody(); @@ -139,6 +177,10 @@ public class CIMPushManager { } + /** + * 长连接发送一次心跳响应 + * @param context + */ public static void pong(Context context) { if (isDestroyed(context) || isStopped(context)) { return; @@ -149,6 +191,8 @@ public class CIMPushManager { startService(context, serviceIntent); } + + private static void sendBindRequest(Context context, String uid) { CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false); @@ -182,7 +226,9 @@ public class CIMPushManager { } /** - * 发送一个CIM请求 + * 向服务端发送一次自定义业务请求 + * @param context + * @param body 请求体 */ public static void sendRequest(Context context, SentBody body) { @@ -240,29 +286,50 @@ public class CIMPushManager { autoBindAccount(context); } + /** + * 获取sdk是否已经销毁的 + * @param context + * @return + */ public static boolean isDestroyed(Context context) { return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED); } + /** + * 判断是否暂停接收消息 + * @param context + * @return + */ public static boolean isStopped(Context context) { return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP); } + /** + * 判断于服务端连接是否正常 + * @param context + */ public static boolean isConnected(Context context) { return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE); } + /** + * 判断客户端网络连接是否正常 + * @param context + */ public static boolean isNetworkConnected(Context context) { NetworkInfo networkInfo = getNetworkInfo(context); return networkInfo != null && networkInfo.isConnected(); } + /** + * 获取服务端网络信息 + * @param context + */ public static NetworkInfo getNetworkInfo(Context context) { return ((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo(); } - - public static void startService(Context context, Intent intent) { + protected static void startService(Context context, Intent intent) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { context.startForegroundService(intent); } else { @@ -270,7 +337,6 @@ public class CIMPushManager { } } - private static String getVersionName(Context context) { try { diff --git a/cim-server-sdk/pom.xml b/cim-server-sdk/pom.xml index a05b896..c34d35d 100644 --- a/cim-server-sdk/pom.xml +++ b/cim-server-sdk/pom.xml @@ -9,6 +9,21 @@ 4.2.0 jar + ${project.groupId}:${project.artifactId} + Netty based instant messaging server sdk for java + https://github.com/farsunset/cim + + + + Apache License + http://www.apache.org/licenses/ + + + + https://github.com/farsunset/cim.git + https://github.com/farsunset/cim + + UTF-8 UTF-8 @@ -81,17 +96,106 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 8 - 8 - - - - + + + + release + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + private + true + UTF-8 + UTF-8 + UTF-8 + -Xdoclint:none + + + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + true + true + UTF-8 + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Jun Xia + 3979434@qq.com + + Developer + + +8 + + diff --git a/cim-server-sdk/release.sh b/cim-server-sdk/release.sh new file mode 100755 index 0000000..ce3a0a0 --- /dev/null +++ b/cim-server-sdk/release.sh @@ -0,0 +1 @@ +mvn clean install deploy -P release \ No newline at end of file diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/AppSocketAcceptor.java b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/AppSocketAcceptor.java index bad1617..04b0d20 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/AppSocketAcceptor.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/AppSocketAcceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,9 @@ public class AppSocketAcceptor extends NioSocketAcceptor { } + /** + * bind基于tlv协议的socket端口 + */ public void bind(){ if (!config.isEnable()){ diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/NioSocketAcceptor.java b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/NioSocketAcceptor.java index 1356373..eb8e88b 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/NioSocketAcceptor.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/NioSocketAcceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/WebsocketAcceptor.java b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/WebsocketAcceptor.java index f924e72..6fd9002 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/WebsocketAcceptor.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/WebsocketAcceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,6 +79,9 @@ public class WebsocketAcceptor extends NioSocketAcceptor { this.handshakeHandler = new HandshakeHandler(config.getHandshakePredicate()); } + /** + * bind基于websocket协议的socket端口 + */ public void bind(){ if (!config.isEnable()){ diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/AppSocketConfig.java b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/AppSocketConfig.java index cab402c..404c3cd 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/AppSocketConfig.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/AppSocketConfig.java @@ -6,10 +6,19 @@ public class AppSocketConfig { private static final int DEFAULT_PORT = 23456; + /* + TVL协议socket端口 + */ private Integer port; + /* + * socket消息处理器 + */ private CIMRequestHandler outerRequestHandler; + /* + 是否启用TVL协议socket + */ private boolean enable; public Integer getPort() { diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/WebsocketConfig.java b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/WebsocketConfig.java index d784834..fcba304 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/WebsocketConfig.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/acceptor/config/WebsocketConfig.java @@ -6,6 +6,9 @@ import com.farsunset.cim.handshake.HandshakeEvent; import java.util.function.Predicate; +/** + * 基于websocket的服务配置 + */ public class WebsocketConfig { private static final int DEFAULT_PORT = 34567; @@ -16,9 +19,24 @@ public class WebsocketConfig { private Integer port; private String path; + + /* + * 消息体协议，JSON 或者 Protobuf + */ private WebsocketProtocol protocol; + /* + * socket消息处理器 + */ private CIMRequestHandler outerRequestHandler; + + /* + * websocket鉴权实现 + */ private Predicate handshakePredicate; + + /* + * 是否启用websocket + */ private boolean enable; public Integer getPort() { diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TextMessageEncoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TextMessageEncoder.java index fd48d8c..6d54c01 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TextMessageEncoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TextMessageEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TransmitBody.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TransmitBody.java index 2901cea..7487b19 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TransmitBody.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/json/TransmitBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java index 8b2241a..8121a5a 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageEncoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageEncoder.java index b5d2519..7912f54 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageEncoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java index cb9ae01..b4b7692 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageEncoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageEncoder.java index a06b5a9..14dbe2c 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageEncoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/CIMConstant.java b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/CIMConstant.java index 29ad5ee..dcd51c2 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/CIMConstant.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/CIMConstant.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/DataType.java b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/DataType.java index ae799f9..616e875 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/DataType.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/DataType.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/WebsocketProtocol.java b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/WebsocketProtocol.java index 6f1a88c..5878bb1 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/constant/WebsocketProtocol.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/constant/WebsocketProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java b/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java index 4e66f2f..2eb6778 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/group/SessionGroup.java b/cim-server-sdk/src/main/java/com/farsunset/cim/group/SessionGroup.java index 7e96b53..1d31bfa 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/group/SessionGroup.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/group/SessionGroup.java @@ -13,6 +13,10 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Predicate; import java.util.stream.Collectors; +/** + * 基于内存管理的channel组 + * 根据UID管理 + */ public class SessionGroup extends ConcurrentHashMap> { private static final Collection EMPTY_LIST = new LinkedList<>(); diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/group/TagSessionGroup.java b/cim-server-sdk/src/main/java/com/farsunset/cim/group/TagSessionGroup.java index f56c0de..acf4297 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/group/TagSessionGroup.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/group/TagSessionGroup.java @@ -4,6 +4,11 @@ package com.farsunset.cim.group; import com.farsunset.cim.constant.ChannelAttr; import io.netty.channel.Channel; + +/** + * 基于内存管理的channel组 + * 根据tag管理 + */ public class TagSessionGroup extends SessionGroup { @Override diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/CIMRequestHandler.java b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/CIMRequestHandler.java index 58ffef3..10f6b07 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/CIMRequestHandler.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/CIMRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java index ac3b9ce..8e43a7a 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeEvent.java b/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeEvent.java index 3665be1..101d26d 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeEvent.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeHandler.java b/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeHandler.java index 8c8acf4..3f97abf 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeHandler.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/handshake/HandshakeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Message.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Message.java index ad245a9..22ff4ab 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Message.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Message.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Ping.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Ping.java index 09025ab..f06167b 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Ping.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Ping.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Pong.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Pong.java index d7b758f..2866269 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Pong.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Pong.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/ReplyBody.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/ReplyBody.java index 38e4611..350c3a5 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/ReplyBody.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/ReplyBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java index 9bf5b51..357112a 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Transportable.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Transportable.java index d39e249..0448cbd 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/Transportable.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/Transportable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * Copyright 2013-2022 Xia Jun(3979434@qq.com). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.