调整代码目录结构

broker/pom.xml

@@ -37,6 +37,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.wildfirechat</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/log4j/log4j -->
         <dependency>
             <groupId>log4j</groupId>
@@ -44,13 +50,6 @@
             <version>1.2.14</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
         <dependency>
             <groupId>mysql</groupId>
@@ -127,13 +126,6 @@
             <version>3.2.2</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.librato.metrics</groupId>
             <artifactId>metrics-librato</artifactId>

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

@@ -9,23 +9,17 @@
 package com.xiaoleilu.loServer.action;
 
 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputUserLogin;
+import cn.wildfirechat.pojos.InputUserLogin;
-import com.xiaoleilu.loServer.pojos.OutputLoginData;
+import cn.wildfirechat.pojos.OutputLoginData;
-import io.moquette.spi.impl.Utils;
-import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
 import win.liyufan.im.GitRepositoryState;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 @Route("/api/version")
 @HttpMethod("GET")

broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java

@@ -15,9 +15,9 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputAddGroupMember;
+import cn.wildfirechat.pojos.InputAddGroupMember;
-import com.xiaoleilu.loServer.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java

@@ -13,11 +13,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
+import cn.wildfirechat.pojos.InputCreateUser;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.spi.impl.Utils;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java

@@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java

@@ -12,8 +12,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java

@@ -15,14 +15,13 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateChatroom;
+import cn.wildfirechat.pojos.InputCreateChatroom;
-import com.xiaoleilu.loServer.pojos.OutputCreateChatroom;
+import cn.wildfirechat.pojos.OutputCreateChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import win.liyufan.im.ErrorCode;
-import win.liyufan.im.UUIDGenerator;
 
 @Route("/admin/chatroom")
 @HttpMethod("PUT")

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateRobot;
+import cn.wildfirechat.pojos.InputCreateRobot;
-import com.xiaoleilu.loServer.pojos.OutputCreateRobot;
+import cn.wildfirechat.pojos.OutputCreateRobot;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
+import cn.wildfirechat.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java

@@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputDestoryChatroom;
+import cn.wildfirechat.pojos.InputDestoryChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputDismissGroupMember;
+import cn.wildfirechat.pojos.InputDismissGroupMember;
-import com.xiaoleilu.loServer.pojos.InputKickoffGroupMember;
+import cn.wildfirechat.pojos.InputKickoffGroupMember;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputFriendRequest;
+import cn.wildfirechat.pojos.InputFriendRequest;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java

@@ -8,7 +8,6 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
-import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -16,22 +15,14 @@ import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import com.xiaoleilu.loServer.model.FriendData;
-import com.xiaoleilu.loServer.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.InputFriendRequest;
+import cn.wildfirechat.pojos.InputFriendRequest;
-import com.xiaoleilu.loServer.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.InputGetFriendList;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.IMTopic;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
 
 @Route("admin/friend/list")
 @HttpMethod("POST")

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java

@@ -15,7 +15,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.OutputGetChatroomInfo;
+import cn.wildfirechat.pojos.OutputGetChatroomInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java

@@ -13,8 +13,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetToken;
+import cn.wildfirechat.pojos.InputGetToken;
-import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java

@@ -15,9 +15,9 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
+import cn.wildfirechat.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java

@@ -14,9 +14,9 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputUserStatus;
+import cn.wildfirechat.pojos.OutputUserStatus;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputAddGroupMember;
+import cn.wildfirechat.pojos.InputAddGroupMember;
-import com.xiaoleilu.loServer.pojos.InputKickoffGroupMember;
+import cn.wildfirechat.pojos.InputKickoffGroupMember;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java

@@ -15,7 +15,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.RecallMessageData;
+import cn.wildfirechat.pojos.RecallMessageData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java

@@ -16,8 +16,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java

@@ -14,13 +14,10 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.util.internal.StringUtil;
 import win.liyufan.im.ErrorCode;
 
 @Route("admin/sensitive/add")

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java

@@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import win.liyufan.im.ErrorCode;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java

@@ -8,15 +8,12 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
-import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpResponseStatus;
 import win.liyufan.im.ErrorCode;
 
 import java.util.List;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java

@@ -15,8 +15,8 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputDismissGroupMember;
+import cn.wildfirechat.pojos.InputDismissGroupMember;
-import com.xiaoleilu.loServer.pojos.InputTransferGroup;
+import cn.wildfirechat.pojos.InputTransferGroup;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java

@@ -11,14 +11,13 @@ package com.xiaoleilu.loServer.action.channel;
 
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.Conversation;
+import cn.wildfirechat.pojos.Conversation;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java

@@ -15,9 +15,9 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
+import cn.wildfirechat.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;

broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java

@@ -9,16 +9,14 @@
 package com.xiaoleilu.loServer.action.robot;
 
 
-import cn.wildfirechat.proto.ProtoConstants;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;

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

@@ -115,17 +115,6 @@ public final class BrokerConstants {
 
 
 
-
-
-    public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
-    public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
-    public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;
-    public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP = 107;
-    public static final int MESSAGE_CONTENT_TYPE_DISMISS_GROUP = 108;
-    public static final int MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER = 109;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME = 110;
-    public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS = 111;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT = 112;
     private BrokerConstants() {
     }
 }

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

@@ -9,8 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -9,13 +9,12 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
 import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 

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

@@ -10,16 +10,13 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;
-import win.liyufan.im.IDUtils;
 import win.liyufan.im.IMTopic;
-import win.liyufan.im.UUIDGenerator;
 
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
-import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels;
 
 @Handler(value = IMTopic.CreateChannelTopic)

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

@@ -9,15 +9,12 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static io.moquette.BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP;
-
 @Handler(value = IMTopic.CreateGroupTopic)
 public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupRequest> {
     @Override

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

@@ -10,7 +10,7 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -10,7 +10,7 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -9,16 +9,12 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;
 
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyChannelInfoTopic;
-import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyChannelInfoTopic)
 public class ModifyChannelInfoHandler extends GroupHandler<WFCMessage.ModifyChannelInfo> {

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

@@ -9,7 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -9,7 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -9,7 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -9,14 +9,12 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
-
 @Handler(IMTopic.TransferChannelInfoTopic)
 public class TransferChannelHandler extends GroupHandler<WFCMessage.TransferChannel> {
     @Override

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

@@ -9,7 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.ErrorCode;

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

@@ -22,11 +22,10 @@ import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.server.Server;
 import io.moquette.spi.IMatchingCondition;
 import io.moquette.spi.IMessagesStore;
-import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
 import org.slf4j.Logger;
@@ -34,8 +33,6 @@ import org.slf4j.LoggerFactory;
 import sun.misc.BASE64Encoder;
 import win.liyufan.im.*;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -18,9 +18,8 @@ package io.moquette.spi;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.DatabaseStore;
-import io.moquette.persistence.MemoryMessagesStore;
 import io.moquette.persistence.UserClientEntry;
 import io.moquette.spi.impl.subscriptions.Topic;
 import io.netty.buffer.ByteBuf;
@@ -28,7 +27,6 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import win.liyufan.im.ErrorCode;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;

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

@@ -21,8 +21,8 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.loServer.pojos.OutputNotifyChannelSubscribeStatus;
+import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
 import io.moquette.persistence.*;
 import io.moquette.persistence.MemorySessionStore.Session;
 import io.moquette.server.ConnectionDescriptorStore;

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

@@ -30,7 +30,7 @@ import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.ClassUtil;
-import com.xiaoleilu.loServer.pojos.OutputCheckUserOnline;
+import cn.wildfirechat.pojos.OutputCheckUserOnline;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.imhandler.Handler;
 import io.moquette.imhandler.IMHandler;

client/pom.xml

@@ -14,6 +14,12 @@
     <artifactId>client</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.wildfirechat</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

client/src/main/java/cn/wildfirechat/client/IMClient.java

@@ -3,7 +3,7 @@ package cn.wildfirechat.client;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.InputRoute;
+import cn.wildfirechat.pojos.InputRoute;
 import io.moquette.spi.impl.security.AES;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java

@@ -1,4 +1,4 @@
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class InputGetToken {
     private String userId;

client/src/main/java/com/xiaoleilu/loServer/pojos/InputRoute.java

@@ -1,4 +1,4 @@
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class InputRoute {

client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java

@@ -1,4 +1,4 @@
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputGetIMTokenData {
     private String userId;

common/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>wildfirechat-parent</artifactId>
+        <groupId>cn.wildfirechat</groupId>
+        <version>0.20</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.wildfirechat</groupId>
+    <artifactId>common</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class Conversation {
     private int type;

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

@@ -6,12 +6,12 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.google.protobuf.ByteString;
-import io.moquette.BrokerConstants;
 
 import java.util.List;
 
@@ -90,38 +90,38 @@ public class GroupNotificationBinaryContent {
     }
 
     public WFCMessage.MessageContent getAddGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER);
     }
 
     public WFCMessage.MessageContent getCreateGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP);
     }
 
     public WFCMessage.MessageContent getDismissGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_DISMISS_GROUP);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_DISMISS_GROUP);
     }
 
     public WFCMessage.MessageContent getKickokfMemberGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER);
     }
 
     public WFCMessage.MessageContent getQuitGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_QUIT_GROUP);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_QUIT_GROUP);
     }
 
     public WFCMessage.MessageContent getTransferGroupNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER);
     }
 
     public WFCMessage.MessageContent getChangeGroupNameNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME);
     }
 
     public WFCMessage.MessageContent getChangeGroupPortraitNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT);
     }
 
     public WFCMessage.MessageContent getModifyGroupMemberAliasNotifyContent() {
-        return getGroupNotifyContent(BrokerConstants.MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS);
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS);
     }
 }

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.ProtoConstants;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.ProtoConstants;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class InputDestoryChatroom {

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class InputFriendRequest {

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class InputGetUserInfo {
     private String userId;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import java.util.List;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import java.util.List;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class InputOutputUserBlockStatus {

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class InputUserLogin {

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

@@ -6,11 +6,11 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.protobuf.ByteString;
-import com.hazelcast.util.StringUtil;
+import io.netty.util.internal.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Base64;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputCheckUserOnline {
     private int status; //0 online, 1 have session offline, 2 no session

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 public class OutputCreateChatroom {

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputCreateRobot {
     private String userId;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputCreateUser {
     private String userId;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 
 import java.util.List;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import java.util.List;
 

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputNotifyChannelSubscribeStatus {
     private String userId;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import java.util.List;
 

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class OutputUserStatus {
     private int status;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import java.util.List;
 

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class PojoGroupInfo {
     String target_id;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 public class PojoGroupMember {
     String member_id;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import cn.wildfirechat.proto.WFCMessage;
 import io.netty.util.internal.StringUtil;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;
 
 import cn.wildfirechat.proto.WFCMessage;
 import io.netty.util.internal.StringUtil;

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

@@ -121,5 +121,20 @@ public class ProtoConstants {
         int UserType_Robot = 1;
         int UserType_Device = 2;
     }
+
+
+
+
+
+
+    public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
+    public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
+    public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;
+    public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP = 107;
+    public static final int MESSAGE_CONTENT_TYPE_DISMISS_GROUP = 108;
+    public static final int MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER = 109;
+    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME = 110;
+    public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS = 111;
+    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT = 112;
 }
 

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

@@ -414,7 +414,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.AddFriendRequest build() {
         cn.wildfirechat.proto.WFCMessage.AddFriendRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -1070,7 +1070,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Conversation build() {
         cn.wildfirechat.proto.WFCMessage.Conversation result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -2097,7 +2097,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GroupInfo build() {
         cn.wildfirechat.proto.WFCMessage.GroupInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -3231,7 +3231,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GroupMember build() {
         cn.wildfirechat.proto.WFCMessage.GroupMember result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -3965,7 +3965,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Group build() {
         cn.wildfirechat.proto.WFCMessage.Group result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -5424,7 +5424,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ChannelInfo build() {
         cn.wildfirechat.proto.WFCMessage.ChannelInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -6742,7 +6742,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ModifyChannelInfo build() {
         cn.wildfirechat.proto.WFCMessage.ModifyChannelInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -7429,7 +7429,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.TransferChannel build() {
         cn.wildfirechat.proto.WFCMessage.TransferChannel result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -8040,7 +8040,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullChannelInfo build() {
         cn.wildfirechat.proto.WFCMessage.PullChannelInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -8653,7 +8653,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullChannelListener build() {
         cn.wildfirechat.proto.WFCMessage.PullChannelListener result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -9309,7 +9309,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullChannelListenerResult build() {
         cn.wildfirechat.proto.WFCMessage.PullChannelListenerResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -9943,7 +9943,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ListenChannel build() {
         cn.wildfirechat.proto.WFCMessage.ListenChannel result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -10559,7 +10559,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.SearchChannelResult build() {
         cn.wildfirechat.proto.WFCMessage.SearchChannelResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -11860,7 +11860,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.MessageContent build() {
         cn.wildfirechat.proto.WFCMessage.MessageContent result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -13179,7 +13179,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.AddGroupMemberRequest build() {
         cn.wildfirechat.proto.WFCMessage.AddGroupMemberRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -14295,7 +14295,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.CreateGroupRequest build() {
         cn.wildfirechat.proto.WFCMessage.CreateGroupRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -15184,7 +15184,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.DismissGroupRequest build() {
         cn.wildfirechat.proto.WFCMessage.DismissGroupRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -16192,7 +16192,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.FriendRequest build() {
         cn.wildfirechat.proto.WFCMessage.FriendRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -16969,7 +16969,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GeneralResult build() {
         cn.wildfirechat.proto.WFCMessage.GeneralResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -17600,7 +17600,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetUploadTokenResult build() {
         cn.wildfirechat.proto.WFCMessage.GetUploadTokenResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -18338,7 +18338,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.HandleFriendRequest build() {
         cn.wildfirechat.proto.WFCMessage.HandleFriendRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -18861,7 +18861,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.IDBuf build() {
         cn.wildfirechat.proto.WFCMessage.IDBuf result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -19338,7 +19338,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.IDListBuf build() {
         cn.wildfirechat.proto.WFCMessage.IDListBuf result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -20236,7 +20236,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Message build() {
         cn.wildfirechat.proto.WFCMessage.Message result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -22079,7 +22079,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.User build() {
         cn.wildfirechat.proto.WFCMessage.User result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -23794,7 +23794,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Robot build() {
         cn.wildfirechat.proto.WFCMessage.Robot result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -24680,7 +24680,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetRobotsResult build() {
         cn.wildfirechat.proto.WFCMessage.GetRobotsResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -25635,7 +25635,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Thing build() {
         cn.wildfirechat.proto.WFCMessage.Thing result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -26442,7 +26442,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetThingsResult build() {
         cn.wildfirechat.proto.WFCMessage.GetThingsResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -27280,7 +27280,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.UploadDeviceTokenRequest build() {
         cn.wildfirechat.proto.WFCMessage.UploadDeviceTokenRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -28202,7 +28202,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ModifyGroupInfoRequest build() {
         cn.wildfirechat.proto.WFCMessage.ModifyGroupInfoRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -29072,7 +29072,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.InfoEntry build() {
         cn.wildfirechat.proto.WFCMessage.InfoEntry result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -29610,7 +29610,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ModifyMyInfoRequest build() {
         cn.wildfirechat.proto.WFCMessage.ModifyMyInfoRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -30367,7 +30367,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.NotifyMessage build() {
         cn.wildfirechat.proto.WFCMessage.NotifyMessage result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -30984,7 +30984,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullMessageRequest build() {
         cn.wildfirechat.proto.WFCMessage.PullMessageRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -31610,7 +31610,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullMessageResult build() {
         cn.wildfirechat.proto.WFCMessage.PullMessageResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -32386,7 +32386,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullGroupInfoResult build() {
         cn.wildfirechat.proto.WFCMessage.PullGroupInfoResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -33102,7 +33102,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullGroupMemberRequest build() {
         cn.wildfirechat.proto.WFCMessage.PullGroupMemberRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -33640,7 +33640,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullGroupMemberResult build() {
         cn.wildfirechat.proto.WFCMessage.PullGroupMemberResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -34352,7 +34352,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.UserRequest build() {
         cn.wildfirechat.proto.WFCMessage.UserRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -34886,7 +34886,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullUserRequest build() {
         cn.wildfirechat.proto.WFCMessage.PullUserRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -35597,7 +35597,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.UserResult build() {
         cn.wildfirechat.proto.WFCMessage.UserResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -36184,7 +36184,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.PullUserResult build() {
         cn.wildfirechat.proto.WFCMessage.PullUserResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -37001,7 +37001,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.QuitGroupRequest build() {
         cn.wildfirechat.proto.WFCMessage.QuitGroupRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -37917,7 +37917,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.RemoveGroupMemberRequest build() {
         cn.wildfirechat.proto.WFCMessage.RemoveGroupMemberRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -38943,7 +38943,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.TransferGroupRequest build() {
         cn.wildfirechat.proto.WFCMessage.TransferGroupRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -39947,7 +39947,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ModifyGroupMemberAlias build() {
         cn.wildfirechat.proto.WFCMessage.ModifyGroupMemberAlias result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -40895,7 +40895,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.UserSettingEntry build() {
         cn.wildfirechat.proto.WFCMessage.UserSettingEntry result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -41671,7 +41671,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ModifyUserSettingReq build() {
         cn.wildfirechat.proto.WFCMessage.ModifyUserSettingReq result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -42249,7 +42249,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Version build() {
         cn.wildfirechat.proto.WFCMessage.Version result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -42700,7 +42700,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetUserSettingResult build() {
         cn.wildfirechat.proto.WFCMessage.GetUserSettingResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -43534,7 +43534,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.Friend build() {
         cn.wildfirechat.proto.WFCMessage.Friend result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -44199,7 +44199,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetFriendsResult build() {
         cn.wildfirechat.proto.WFCMessage.GetFriendsResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -44885,7 +44885,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetFriendRequestResult build() {
         cn.wildfirechat.proto.WFCMessage.GetFriendRequestResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -45798,7 +45798,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ConnectAckPayload build() {
         cn.wildfirechat.proto.WFCMessage.ConnectAckPayload result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -46708,7 +46708,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.IMHttpWrapper build() {
         cn.wildfirechat.proto.WFCMessage.IMHttpWrapper result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -47486,7 +47486,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.SearchUserRequest build() {
         cn.wildfirechat.proto.WFCMessage.SearchUserRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -48060,7 +48060,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.SearchUserResult build() {
         cn.wildfirechat.proto.WFCMessage.SearchUserResult result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -48772,7 +48772,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetChatroomInfoRequest build() {
         cn.wildfirechat.proto.WFCMessage.GetChatroomInfoRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -49674,7 +49674,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ChatroomInfo build() {
         cn.wildfirechat.proto.WFCMessage.ChatroomInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -50603,7 +50603,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetChatroomMemberInfoRequest build() {
         cn.wildfirechat.proto.WFCMessage.GetChatroomMemberInfoRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -51162,7 +51162,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.ChatroomMemberInfo build() {
         cn.wildfirechat.proto.WFCMessage.ChatroomMemberInfo result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -51671,7 +51671,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.INT64Buf build() {
         cn.wildfirechat.proto.WFCMessage.INT64Buf result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -52152,7 +52152,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.NotifyRecallMessage build() {
         cn.wildfirechat.proto.WFCMessage.NotifyRecallMessage result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -52720,7 +52720,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.BlackUserRequest build() {
         cn.wildfirechat.proto.WFCMessage.BlackUserRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -53832,7 +53832,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.RouteRequest build() {
         cn.wildfirechat.proto.WFCMessage.RouteRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -55058,7 +55058,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.RouteResponse build() {
         cn.wildfirechat.proto.WFCMessage.RouteResponse result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -55702,7 +55702,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.GetTokenRequest build() {
         cn.wildfirechat.proto.WFCMessage.GetTokenRequest result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }
@@ -56353,7 +56353,7 @@ public final class WFCMessage {
       public cn.wildfirechat.proto.WFCMessage.LoadRemoteMessages build() {
         cn.wildfirechat.proto.WFCMessage.LoadRemoteMessages result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw Builder.newUninitializedMessageException(result);
         }
         return result;
       }

pom.xml

@@ -36,6 +36,7 @@
         <module>wildfire_jmeter</module>
         <module>client</module>
         <module>distribution</module>
+        <module>common</module>
     </modules>
 
     <build>

wildfire_jmeter/src/main/java/net/xmeter/samplers/AbstractMQTTSampler.java

@@ -2,9 +2,9 @@ package net.xmeter.samplers;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.pojos.InputRoute;
+import cn.wildfirechat.pojos.InputRoute;
-import com.xiaoleilu.loServer.pojos.InputGetToken;
+import cn.wildfirechat.pojos.InputGetToken;
-import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
 import io.moquette.spi.impl.security.AES;
 import net.xmeter.IMResult;
 import net.xmeter.Util;