version and release note

broker/config/wildfirechat.conf

@@ -291,7 +291,10 @@ server.multi_endpoint false
 ## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
 server.multi_pc_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
+## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
+server.multi_pad_endpoint false
+
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true
 
 # 当pc或者web在线时，手机是否默认静音，默认为true。注意仅影响默认值，用户可以手动切换是否静音。

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -37,14 +37,14 @@
         <!--用于与slf4j保持桥接-->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.2</version>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>2.22.1</version>
         </dependency>
         <!-- slf4j核心包-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>2.0.12</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
@@ -65,6 +65,18 @@
             <version>1.1.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.25.3</version>
+        </dependency>
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
@@ -129,37 +141,18 @@
             <version>3.11.5</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.xiaoleilu/hutool -->
         <dependency>
-            <groupId>com.xiaoleilu</groupId>
-            <artifactId>hutool</artifactId>
-            <version>2.15.11</version>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.26</version>
         </dependency>
 
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-
-
-        <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
             <version>0.9.5.4</version>
         </dependency>
 
-        <!-- needs extra dependencies: objenesis & hamcrest -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.9.0</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.fusesource.mqtt-client</groupId>
             <artifactId>mqtt-client</artifactId>
@@ -172,28 +165,6 @@
             <version>1.2.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-client</artifactId>
-            <version>9.2.0.M1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <!-- use 2.6.0 for Java 7 projects -->
-            <version>2.6.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.191</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
@@ -214,14 +185,12 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.13.1</version>
+            <version>4.12.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>

broker/src/main/java/cn/wildfirechat/push/PushServer.java

@@ -95,9 +95,15 @@ public class PushServer {
         pushMessage.deviceToken = session.getDeviceToken();
         pushMessage.unReceivedMsg = badge;
         pushMessage.userId = session.getUsername();
-        if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_Android) {
+        if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_iPad ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_Android ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_APad ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_Harmony ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+        ) {
             String url = androidPushServerUrl;
-            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_iPad) {
                 url = iOSPushServerUrl;
                 pushMessage.voipDeviceToken = session.getVoipDeviceToken();
             }

broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java

@@ -1,8 +1,6 @@
 package com.xiaoleilu.loServer;
 
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.DateUtil;
+import cn.hutool.core.date.DateUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.ClassUtil;
 import com.xiaoleilu.loServer.annotation.Route;

broker/src/main/java/com/xiaoleilu/loServer/LoServer.java

@@ -1,6 +1,6 @@
 package com.xiaoleilu.loServer;
 
-import com.xiaoleilu.hutool.util.DateUtil;
+import cn.hutool.core.date.DateUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.AdminActionHandler;

broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java

@@ -5,11 +5,9 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.xiaoleilu.hutool.lang.Singleton;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.FileUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.lang.Singleton;
+import cn.hutool.core.util.StrUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.DefaultIndexAction;
 import com.xiaoleilu.loServer.action.UnknownErrorAction;
@@ -189,7 +187,7 @@ public class ServerSetting {
 	 * @param filterClass Filter类
 	 */
 	public static void setFilter(String path, Class<? extends Filter> filterClass) {
-		setFilter(path, (Filter)Singleton.get(filterClass));
+		setFilter(path, (Filter) Singleton.get(filterClass));
 	}
 	//----------------------------------------------------------------------------------------------- Filter end
 	

broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java

@@ -8,13 +8,11 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.FileUtil;
-import com.xiaoleilu.hutool.util.ReUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
@@ -24,6 +22,8 @@ import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.LoggerFactory;
 
+import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN;
+
 /**
  * 默认的主页Action，当访问主页且没有定义主页Action时，调用此Action
  * 
@@ -96,7 +96,7 @@ public class FileAction extends Action {
     }
 
     private static final Pattern INSECURE_URI = Pattern.compile(".*[<>&\"].*");
-	private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US);
+	private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US);
 
 	
 	/**

broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java

@@ -1,9 +1,6 @@
 package com.xiaoleilu.loServer.action;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import io.moquette.spi.IMessagesStore;

broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java

@@ -4,9 +4,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 

broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java

@@ -1,31 +1,32 @@
-package com.xiaoleilu.loServer.exception;
-
-import com.xiaoleilu.hutool.util.StrUtil;
-
-/**
- * 设置异常
- * @author xiaoleilu
- */
-public class ServerSettingException extends RuntimeException{
-	private static final long serialVersionUID = -4134588858314744501L;
-
-	public ServerSettingException(Throwable e) {
-		super(e);
-	}
-	
-	public ServerSettingException(String message) {
-		super(message);
-	}
-	
-	public ServerSettingException(String messageTemplate, Object... params) {
-		super(StrUtil.format(messageTemplate, params));
-	}
-	
-	public ServerSettingException(String message, Throwable throwable) {
-		super(message, throwable);
-	}
-	
-	public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) {
-		super(StrUtil.format(messageTemplate, params), throwable);
-	}
-}
+package com.xiaoleilu.loServer.exception;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * 设置异常
+ * @author xiaoleilu
+ */
+public class ServerSettingException extends RuntimeException{
+	private static final long serialVersionUID = -4134588858314744501L;
+
+	public ServerSettingException(Throwable e) {
+		super(e);
+	}
+	
+	public ServerSettingException(String message) {
+		super(message);
+	}
+	
+	public ServerSettingException(String messageTemplate, Object... params) {
+		super(StrUtil.format(messageTemplate, params));
+	}
+	
+	public ServerSettingException(String message, Throwable throwable) {
+		super(message, throwable);
+	}
+	
+	public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) {
+		super(StrUtil.format(messageTemplate, params), throwable);
+	}
+}

broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java

@@ -1,7 +1,7 @@
 package com.xiaoleilu.loServer.handler;
 
+import cn.hutool.core.lang.Singleton;
 import cn.wildfirechat.common.IMExceptionEvent;
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.UnknownErrorAction;

broker/src/main/java/com/xiaoleilu/loServer/handler/AdminActionHandler.java

@@ -8,7 +8,6 @@
 
 package com.xiaoleilu.loServer.handler;
 
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.FileAction;

broker/src/main/java/com/xiaoleilu/loServer/handler/HttpChunkContentCompressor.java

@@ -1,28 +1,27 @@
-package com.xiaoleilu.loServer.handler;
-
-import com.xiaoleilu.hutool.log.StaticLog;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.FileRegion;
-import io.netty.handler.codec.http.DefaultHttpResponse;
-import io.netty.handler.codec.http.HttpContentCompressor;
-
-/**
- * 解决大文件传输与Gzip压缩冲突问题
- * @author Looly
- *
- */
-public class HttpChunkContentCompressor extends HttpContentCompressor {
-	@Override
-	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-		StaticLog.debug("Write object [{}]", msg);
-		
-		if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) {
-			//文件传输不经过Gzip压缩
-			ctx.write(msg, promise);
-		}else{
-			super.write(ctx, msg, promise);
-		}
-	}
-}
+package com.xiaoleilu.loServer.handler;
+
+import cn.hutool.log.StaticLog;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpContentCompressor;
+
+/**
+ * 解决大文件传输与Gzip压缩冲突问题
+ * @author Looly
+ *
+ */
+public class HttpChunkContentCompressor extends HttpContentCompressor {
+	@Override
+	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+		StaticLog.debug("Write object [{}]", msg);
+		
+		if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) {
+			//文件传输不经过Gzip压缩
+			ctx.write(msg, promise);
+		}else{
+			super.write(ctx, msg, promise);
+		}
+	}
+}

broker/src/main/java/com/xiaoleilu/loServer/handler/HttpResponseHelper.java

@@ -1,7 +1,6 @@
 package com.xiaoleilu.loServer.handler;
 
 import io.netty.util.internal.StringUtil;
-import com.xiaoleilu.hutool.util.FileUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

broker/src/main/java/com/xiaoleilu/loServer/handler/IMActionHandler.java

@@ -8,7 +8,6 @@
 
 package com.xiaoleilu.loServer.handler;
 
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.FileAction;

broker/src/main/java/com/xiaoleilu/loServer/handler/Request.java

@@ -10,15 +10,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.xiaoleilu.hutool.http.HttpUtil;
-import com.xiaoleilu.hutool.lang.Conver;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.CharsetUtil;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
-import com.xiaoleilu.hutool.util.URLUtil;
-
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaderNames;
@@ -261,7 +258,7 @@ public class Request {
 	 * @return 获得Integer类型请求参数
 	 */
 	public Integer getIntParam(String name, Integer defaultValue) {
-		return Conver.toInt(getParam(name), defaultValue);
+		return Convert.toInt(getParam(name), defaultValue);
 	}
 
 	/**
@@ -270,7 +267,7 @@ public class Request {
 	 * @return 获得long类型请求参数
 	 */
 	public Long getLongParam(String name, Long defaultValue) {
-		return Conver.toLong(getParam(name), defaultValue);
+		return Convert.toLong(getParam(name), defaultValue);
 	}
 
 	/**
@@ -279,7 +276,7 @@ public class Request {
 	 * @return 获得Double类型请求参数
 	 */
 	public Double getDoubleParam(String name, Double defaultValue) {
-		return Conver.toDouble(getParam(name), defaultValue);
+		return Convert.toDouble(getParam(name), defaultValue);
 	}
 
 	/**
@@ -288,7 +285,7 @@ public class Request {
 	 * @return 获得Float类型请求参数
 	 */
 	public Float getFloatParam(String name, Float defaultValue) {
-		return Conver.toFloat(getParam(name), defaultValue);
+		return Convert.toFloat(getParam(name), defaultValue);
 	}
 
 	/**
@@ -297,7 +294,7 @@ public class Request {
 	 * @return 获得Boolean类型请求参数
 	 */
 	public Boolean getBoolParam(String name, Boolean defaultValue) {
-		return Conver.toBool(getParam(name), defaultValue);
+		return Convert.toBool(getParam(name), defaultValue);
 	}
 
 	/**
@@ -477,7 +474,7 @@ public class Request {
 	protected void putIp(ChannelHandlerContext ctx) {
 		String ip = getHeader("X-Forwarded-For");
 		if (StrUtil.isNotBlank(ip)) {
-			ip = HttpUtil.getMultistageReverseProxyIp(ip);
+			ip = NetUtil.getMultistageReverseProxyIp(ip);
 		} else {
 			final InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
 			ip = insocket.getAddress().getHostAddress();

broker/src/main/java/com/xiaoleilu/loServer/handler/Response.java

@@ -13,12 +13,9 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TimeZone;
 
-import com.xiaoleilu.hutool.http.HttpUtil;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.CharsetUtil;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.listener.FileProgressiveFutureListener;
 
@@ -44,6 +41,8 @@ import io.netty.handler.codec.http.cookie.ServerCookieEncoder;
 import org.apache.tika.Tika;
 import org.slf4j.LoggerFactory;
 
+import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN;
+
 /**
  * 响应对象
  * 
@@ -332,7 +331,7 @@ public class Response {
 	 * @param httpCacheSeconds 缓存时间，单位秒
 	 */
 	public void setDateAndCache(long lastModify, int httpCacheSeconds) {
-		SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US);
+		SimpleDateFormat formatter = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US);
 		formatter.setTimeZone(TimeZone.getTimeZone("GMT"));
 
 		// Date header

broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java

@@ -2,10 +2,7 @@ package com.xiaoleilu.loServer.listener;
 
 import java.io.RandomAccessFile;
 
-import com.xiaoleilu.hutool.io.IoUtil;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-
+import cn.hutool.core.io.IoUtil;
 import io.netty.channel.ChannelProgressiveFuture;
 import io.netty.channel.ChannelProgressiveFutureListener;
 import org.slf4j.LoggerFactory;

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -135,6 +135,7 @@ public final class BrokerConstants {
 
     public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
     public static final String SERVER_MULTI_PC_ENDPOINT = "server.multi_pc_endpoint";
+    public static final String SERVER_MULTI_PAD_ENDPOINT = "server.multi_pad_endpoint";
     public static final String SERVER_MULTI_PLATFROM_NOTIFICATION = "server.multi_platform_notification";
     public static final String SERVER_MOBILE_DEFAULT_SILENT_WHEN_PC_ONLINE = "server.mobile_default_silent_when_pc_online";
     public static final String SERVER_CLIENT_SUPPORT_KICKOFF_EVENT = "server.client_support_kickoff_event";

broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java

@@ -10,7 +10,6 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.hutool.system.UserInfo;
 import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.moquette.spi.impl.security.TokenAuthenticator;

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -1798,10 +1798,12 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql;
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_Harmony) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
-            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
-                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
             } else {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and `_platform` = ? and `_cid` <> ? and `_deleted` = 0";
             }
@@ -1816,13 +1818,19 @@ public class DatabaseStore {
 
             statement.setString(index++, uid);
 
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Windows);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_OSX);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_LINUX);
-            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyPC);
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_Harmony) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_iOS);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Android);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_Harmony);
+            } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_iPad);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_APad);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyPad);
             } else {
                 statement.setInt(index++, platform);
             }

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -23,7 +23,6 @@ import com.google.gson.Gson;
 import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.hutool.system.UserInfo;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.model.FriendData;
@@ -2764,6 +2763,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         String pcValue = null;
+        String padValue = null;
         for (MemorySessionStore.Session s : m_Server.getStore().sessionsStore().sessionForUser(session.username)) {
             if (s.getDeleted() != 0 || !m_Server.getConnectionsManager().isConnected(s.getClientID())) {
                 continue;
@@ -2773,8 +2773,14 @@ public class MemoryMessagesStore implements IMessagesStore {
                 case Platform_LINUX:
                 case Platform_Windows:
                 case Platform_OSX:
+                case Platform_HarmonyPC:
                     pcValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
                     break;
+                case Platform_iPad:
+                case Platform_APad:
+                case Platform_HarmonyPad:
+                    padValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
+                    break;
                 default:
                     break;
             }
@@ -2784,6 +2790,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (!isOnlineValueEqual(pcentry, pcValue)) {
             updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue==null?"":pcValue).build(), session.clientID);
         }
+
+        WFCMessage.UserSettingEntry padentry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "Pad");
+        if (!isOnlineValueEqual(padentry, padValue)) {
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("Pad").setValue(padValue==null?"":padValue).build(), session.clientID);
+        }
     }
 
     @Override

broker/src/main/java/io/moquette/persistence/MemorySessionStore.java

@@ -40,6 +40,7 @@ public class MemorySessionStore implements ISessionsStore {
 
     private boolean supportMultiEndpoint = false;
     private boolean supportMultiPCEndpoint = false;
+    private boolean supportMultiPadEndpoint = false;
     private boolean clientSupportKickoff = false;
 
     public static class Session implements Comparable<Session>{
@@ -292,6 +293,10 @@ public class MemorySessionStore implements ISessionsStore {
             supportMultiPCEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PC_ENDPOINT, "false"));
         } catch (Exception e) {
         }
+        try {
+            supportMultiPadEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PAD_ENDPOINT, "false"));
+        } catch (Exception e) {
+        }
 
         try {
             clientSupportKickoff = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_CLIENT_SUPPORT_KICKOFF_EVENT, "false"));
@@ -396,6 +401,10 @@ public class MemorySessionStore implements ISessionsStore {
             && !(platform == ProtoConstants.Platform.Platform_Windows && supportMultiPCEndpoint)
             && !(platform == ProtoConstants.Platform.Platform_LINUX && supportMultiPCEndpoint)
             && !(platform == ProtoConstants.Platform.Platform_OSX && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyPC && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_iPad && supportMultiPadEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_APad && supportMultiPadEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyPad && supportMultiPadEndpoint)
         ) {
             databaseStore.clearMultiEndpoint(username, clientID, platform);
             if (userSessions.get(username) != null) {
@@ -410,15 +419,19 @@ public class MemorySessionStore implements ISessionsStore {
                         }
 
                         boolean remove = false;
-                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS) {
-                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Harmony) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS || s.getPlatform() == ProtoConstants.Platform.Platform_Harmony) {
                                 remove = true;
                             }
-                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_LINUX) {
-                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows || s.getPlatform() == ProtoConstants.Platform.Platform_LINUX) {
+                        } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_iPad || s.getPlatform() == ProtoConstants.Platform.Platform_APad || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad) {
                                 remove = true;
                             }
-                        } else {
+                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows || s.getPlatform() == ProtoConstants.Platform.Platform_LINUX || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC) {
+                                remove = true;
+                            }
+                        } else { //web, microapp
                             if (s.getPlatform() ==platform) {
                                 remove = true;
                             }
@@ -747,7 +760,12 @@ public class MemorySessionStore implements ISessionsStore {
             if (session.getPlatform() == ProtoConstants.Platform.Platform_LINUX
                 || session.getPlatform() == ProtoConstants.Platform.Platform_WEB
                 || session.getPlatform() == ProtoConstants.Platform.Platform_Windows
-                || session.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                || session.getPlatform() == ProtoConstants.Platform.Platform_OSX
+                || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC
+                || session.getPlatform() == ProtoConstants.Platform.Platform_iPad
+                || session.getPlatform() == ProtoConstants.Platform.Platform_APad
+                || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+            ) {
                 databaseStore.updateSessionDeleted(operator, pcClientId, 1);
                 sessions.remove(pcClientId);
                 mServer.getProcessor().kickoffSession(session);

broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java

@@ -223,7 +223,12 @@ public class MessagesPublisher {
                     if (targetSession.getPlatform() == ProtoConstants.Platform.Platform_WEB
                         || targetSession.getPlatform() == ProtoConstants.Platform.Platform_Windows
                         || targetSession.getPlatform() == ProtoConstants.Platform.Platform_LINUX
-                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_iPad
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_APad
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+                    ) {
                         boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
                         if (targetIsActive) {
                             isPcOnline = true;
@@ -469,6 +474,33 @@ public class MessagesPublisher {
                         LOG.info("the target {} of user {} is not active", targetSession.getClientID(), targetSession.getUsername());
                     }
                 }
+
+                if(sessions.isEmpty() && message.getContent().getType() == 403 && !user.equals(message.getFromUser())) {
+                    WFCMessage.User userInfo = m_messagesStore.getUserInfo(user);
+                    if (userInfo != null && userInfo.getType() == ProtoConstants.UserType.UserType_Robot) {
+                        WFCMessage.Robot robot = m_messagesStore.getRobot(user);
+                        if (robot != null && !StringUtil.isNullOrEmpty(robot.getCallback())) {
+                            OutputClient outputClient = null;
+                            if(m_messagesStore.isRobotCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) {
+                                Session session = m_sessionsStore.getSession(exceptClientId);
+                                if(session != null && session.getUsername().equals(message.getFromUser())) {
+                                    outputClient = new OutputClient(session.getPlatform(), exceptClientId);
+                                }
+                            }
+
+                            final WFCMessage.Message finalMsg = message;
+                            OutputClient finalOutputClient = outputClient;
+                            Server.getServer().getCallbackScheduler().execute(() -> {
+                                try {
+                                    HttpUtils.httpJsonPost(robot.getCallback(), GsonUtil.gson.toJson(OutputMessageData.fromProtoMessage(finalMsg, finalOutputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
+                                }
+                            });
+                        }
+                    }
+                }
             }
         }
     }

broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.zip.GZIPOutputStream;
 
+import cn.hutool.core.util.ReflectUtil;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
@@ -92,7 +93,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
             for (Class cls:ClassUtil.getAllAssignedClass(IMHandler.class)) {
                 Handler annotation = (Handler)cls.getAnnotation(Handler.class);
                 if(annotation != null) {
-                    IMHandler handler = (IMHandler) com.xiaoleilu.hutool.util.ClassUtil.newInstance(cls);
+                    IMHandler handler = (IMHandler) ReflectUtil.newInstance(cls);
                     m_imHandlers.put(annotation.value(), handler);
                 }
             }

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -91,7 +91,7 @@ public interface APIPath {
     String Check_User_Subscribe_Channel = "/admin/channel/is_subscribed";
     String Get_System_Setting = "/admin/system/get_setting";
     String Put_System_Setting = "/admin/system/put_setting";
-
+    String GET_CUSTOMER = "/admin/customer";
     String Health = "/admin/health";
 
     String Conference_List = "/admin/conference/list";
@@ -138,4 +138,6 @@ public interface APIPath {
     String Robot_Group_Member_Quit = "/robot/group/member/quit";
     String Robot_Group_Transfer = "/robot/group/transfer";
     String Robot_Group_Set_Manager = "/robot/group/manager/set";
+
+    String Robot_Conference_Request = "/robot/conference/request";
 }

common/src/main/java/cn/wildfirechat/pojos/InputConferenceRequest.java

@@ -0,0 +1,24 @@
+package cn.wildfirechat.pojos;
+
+public class InputConferenceRequest {
+    public String userId;
+    public String clientId;
+    public String request;
+    public long sessionId;
+    public String roomId;
+    public String data;
+    public boolean advance;
+
+    public InputConferenceRequest() {
+    }
+
+    public InputConferenceRequest(String userId, String clientId, String request, long sessionId, String roomId, String data, boolean advance) {
+        this.userId = userId;
+        this.clientId = clientId;
+        this.request = request;
+        this.sessionId = sessionId;
+        this.roomId = roomId;
+        this.data = data;
+        this.advance = advance;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/OutputReadData.java

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+public class OutputReadData {
+    public String user;
+    public Conversation conversation;
+    public long readTime;
+}

common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java

@@ -53,6 +53,10 @@ public class ProtoConstants {
         int Platform_LINUX = 7;
         int Platform_iPad = 8;
         int Platform_APad = 9;
+        int Platform_Harmony = 10;
+        int Platform_HarmonyPad = 11;
+        int Platform_HarmonyPC = 12;
+        int Platform_MAX = Platform_HarmonyPC;
     }
 
     //message NotifyMessage & PullMessageRequest -> type

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/resources/wildfirechat.conf

@@ -289,7 +289,10 @@ server.multi_endpoint false
 ## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
 server.multi_pc_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
+## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
+server.multi_pad_endpoint false
+
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true
 
 # 当pc或者web在线时，手机是否默认静音，默认为true。注意仅影响默认值，用户可以手动切换是否静音。

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

release_note.md

@@ -12,6 +12,13 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.3:
+1. 同步专业版IM服务server SDK。
+2. 添加对鸿蒙平台的支持。
+3. 解决server端音视频SDK信令支持问题。
+4. 升级部分依赖，解决漏洞问题
+
 --------------
 Release note 1.2.2:
 1. 解决搜索特殊字符时的转义问题。

sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sdk/src/main/java/cn/wildfirechat/sdk/GeneralAdmin.java

@@ -97,4 +97,8 @@ public class GeneralAdmin {
     public static IMResult<HealthCheckResult> healthCheck() throws Exception {
         return AdminHttpUtils.httpGet(APIPath.Health, HealthCheckResult.class);
     }
+
+    public static IMResult<String> getCustomer() throws Exception {
+        return AdminHttpUtils.httpJsonPost(APIPath.GET_CUSTOMER, null, String.class);
+    }
 }

sdk/src/main/java/cn/wildfirechat/sdk/RobotService.java

@@ -268,5 +268,10 @@ public class RobotService {
         return configData;
     }
 
+    public IMResult<String> sendConferenceRequest(String robotId, String clientId, String request, long sessionId, String roomId, String data, boolean advance) throws Exception {
+        String path = APIPath.Robot_Conference_Request;
+        InputConferenceRequest input = new InputConferenceRequest(robotId, clientId, request, sessionId, roomId, data, advance);
+        return robotHttpUtils.httpJsonPost(path, input, String.class);
+    }
 
 }