diff --git a/broker/pom.xml b/broker/pom.xml index 2d91b294..c213c823 100755 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -37,6 +37,12 @@ ${project.version} + + cn.wildfirechat + common + ${project.version} + + log4j @@ -44,13 +50,6 @@ 1.2.14 - - - com.google.code.gson - gson - 2.8.2 - - mysql @@ -127,13 +126,6 @@ 3.2.2 - - - com.google.protobuf - protobuf-java - 2.5.0 - - com.librato.metrics metrics-librato diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java index acb9eec8..07119bb0 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputLoginData; -import io.moquette.spi.impl.Utils; -import io.moquette.spi.impl.security.TokenAuthenticator; +import cn.wildfirechat.pojos.InputUserLogin; +import cn.wildfirechat.pojos.OutputLoginData; 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") diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java index c41d81db..4024897e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputCreateGroup; -import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult; +import cn.wildfirechat.pojos.InputAddGroupMember; +import cn.wildfirechat.pojos.InputCreateGroup; +import cn.wildfirechat.pojos.OutputCreateGroupResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java index 24f742d4..55bf2d4e 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java +++ b/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 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 cn.wildfirechat.pojos.InputCreateUser; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java index 20b90b7f..ef431137 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java index 155a36a2..8ddffc77 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateUser; +import cn.wildfirechat.pojos.InputGetUserInfo; +import cn.wildfirechat.pojos.OutputCreateUser; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java index db8feb63..5582c25f 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateChatroom; +import cn.wildfirechat.pojos.InputCreateChatroom; +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") diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java index 571debb1..58640edb 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateGroupResult; +import cn.wildfirechat.pojos.InputCreateGroup; +import cn.wildfirechat.pojos.OutputCreateGroupResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java index beeda6e8..4ee5c8f7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateRobot; +import cn.wildfirechat.pojos.InputCreateRobot; +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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java index 5409361e..698333a7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateUser; +import cn.wildfirechat.pojos.InputCreateUser; +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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java index 1b958af9..4a2144a7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java index f38b2de7..4f7c2cd5 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputKickoffGroupMember; +import cn.wildfirechat.pojos.InputDismissGroupMember; +import cn.wildfirechat.pojos.InputKickoffGroupMember; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java index e970a8d1..86d47def 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateGroupResult; +import cn.wildfirechat.pojos.InputFriendRequest; +import cn.wildfirechat.pojos.OutputCreateGroupResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java index 32bd288a..ebd16d4e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputFriendRequest; -import com.xiaoleilu.loServer.pojos.InputGetFriendList; -import io.moquette.persistence.RPCCenter; -import io.moquette.persistence.TargetEntry; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import cn.wildfirechat.pojos.InputCreateGroup; +import cn.wildfirechat.pojos.InputFriendRequest; +import cn.wildfirechat.pojos.InputGetFriendList; 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") diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java index 54bc9784..97443883 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java index 81d03242..eaa2b3db 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputGetIMTokenData; +import cn.wildfirechat.pojos.InputGetToken; +import cn.wildfirechat.pojos.OutputGetIMTokenData; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java index 9fe0cf45..cc1eac06 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputGetUserInfo; -import com.xiaoleilu.loServer.pojos.OutputCreateUser; +import cn.wildfirechat.pojos.InputCreateUser; +import cn.wildfirechat.pojos.InputGetUserInfo; +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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java index b73fc024..488a7e66 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java +++ b/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 com.xiaoleilu.loServer.pojos.OutputCreateUser; -import com.xiaoleilu.loServer.pojos.OutputUserStatus; +import cn.wildfirechat.pojos.InputGetUserInfo; +import cn.wildfirechat.pojos.OutputCreateUser; +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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java index 6508119a..001bd04d 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputKickoffGroupMember; +import cn.wildfirechat.pojos.InputAddGroupMember; +import cn.wildfirechat.pojos.InputKickoffGroupMember; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java index 2ff8f136..cdf6faa5 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java index 5edb3c88..c321babd 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java +++ b/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 com.xiaoleilu.loServer.pojos.SendMessageResult; +import cn.wildfirechat.pojos.SendMessageData; +import cn.wildfirechat.pojos.SendMessageResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java index 79f59e0b..e2387cdd 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus; -import io.moquette.persistence.RPCCenter; -import io.moquette.persistence.TargetEntry; +import cn.wildfirechat.pojos.InputOutputSensitiveWords; +import cn.wildfirechat.pojos.InputOutputUserBlockStatus; 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") diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java index e634733e..193e5cdb 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java index b92526e5..c1c0dc12 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java index e40b5fc8..a08e8980 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputTransferGroup; +import cn.wildfirechat.pojos.InputDismissGroupMember; +import cn.wildfirechat.pojos.InputTransferGroup; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java index 39fc9700..f4e69598 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java +++ b/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 com.xiaoleilu.loServer.pojos.SendMessageData; -import com.xiaoleilu.loServer.pojos.SendMessageResult; +import cn.wildfirechat.pojos.Conversation; +import cn.wildfirechat.pojos.SendMessageData; +import cn.wildfirechat.pojos.SendMessageResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java index 43e00b09..12a12365 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java +++ b/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 com.xiaoleilu.loServer.pojos.InputGetUserInfo; -import com.xiaoleilu.loServer.pojos.OutputCreateUser; +import cn.wildfirechat.pojos.InputCreateUser; +import cn.wildfirechat.pojos.InputGetUserInfo; +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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java index f330b5ff..891261f8 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java +++ b/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 com.xiaoleilu.loServer.pojos.SendMessageResult; +import cn.wildfirechat.pojos.SendMessageData; +import cn.wildfirechat.pojos.SendMessageResult; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.buffer.ByteBuf; diff --git a/broker/src/main/java/io/moquette/BrokerConstants.java b/broker/src/main/java/io/moquette/BrokerConstants.java index 3d13b9b5..a11b287e 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/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() { } } diff --git a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java index 18921229..89462871 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java +++ b/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 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; diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java index be5cce4e..75dc0cfe 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java index 1a13de38..505d4ab4 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java +++ b/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) diff --git a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java index f84b8b51..053804de 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java +++ b/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 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 io.moquette.BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP; - @Handler(value = IMTopic.CreateGroupTopic) public class CreateGroupHandler extends GroupHandler { @Override diff --git a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java index dda3cd80..2e053af2 100644 --- a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java index 05a6436e..88e719bd 100644 --- a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java index 956ebdda..529a7de9 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java +++ b/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 { diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java index 1a182ca5..b34e40bd 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java index 24359303..991e7ac2 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java index 2a4d8ac7..8b8ca0fb 100644 --- a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java index f64db7e7..b9d5d6a4 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java +++ b/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 { @Override diff --git a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java index 7b934256..188ec279 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index aae763c7..af9a41f0 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java index 32a6db06..e8f4d6b8 100755 --- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java +++ b/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; diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index 2a1466ba..1d5cf7eb 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/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 com.xiaoleilu.loServer.pojos.SendMessageData; +import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus; +import cn.wildfirechat.pojos.SendMessageData; import io.moquette.persistence.*; import io.moquette.persistence.MemorySessionStore.Session; import io.moquette.server.ConnectionDescriptorStore; diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java index 1deb2284..b6996b4f 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/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; diff --git a/client/pom.xml b/client/pom.xml index 6962bbab..6951df6b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,6 +14,12 @@ client + + cn.wildfirechat + common + ${project.version} + + org.slf4j slf4j-api diff --git a/client/src/main/java/cn/wildfirechat/client/IMClient.java b/client/src/main/java/cn/wildfirechat/client/IMClient.java index acffa24b..69973916 100644 --- a/client/src/main/java/cn/wildfirechat/client/IMClient.java +++ b/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; diff --git a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java b/client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java index 3a7ee126..c0b59f9e 100755 --- a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java +++ b/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; diff --git a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputRoute.java b/client/src/main/java/com/xiaoleilu/loServer/pojos/InputRoute.java index 80b53dee..e69d398a 100755 --- a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputRoute.java +++ b/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 { diff --git a/client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java b/client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java index c5d3b1f2..8bb068d8 100644 --- a/client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java +++ b/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; diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 00000000..5c71faff --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,37 @@ + + + + wildfirechat-parent + cn.wildfirechat + 0.20 + + 4.0.0 + + cn.wildfirechat + common + + + + io.netty + netty-common + ${netty.version} + + + + + com.google.protobuf + protobuf-java + 2.5.0 + + + + + com.google.code.gson + gson + 2.8.2 + + + + diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/Conversation.java b/common/src/main/java/cn.wildfirechat.pojos/Conversation.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/Conversation.java rename to common/src/main/java/cn.wildfirechat.pojos/Conversation.java index 17581665..573a888e 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/Conversation.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java b/common/src/main/java/cn.wildfirechat.pojos/GroupNotificationBinaryContent.java similarity index 73% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java rename to common/src/main/java/cn.wildfirechat.pojos/GroupNotificationBinaryContent.java index 6d08b657..dc5bbbef 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java +++ b/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); } } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputAddGroupMember.java b/common/src/main/java/cn.wildfirechat.pojos/InputAddGroupMember.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputAddGroupMember.java rename to common/src/main/java/cn.wildfirechat.pojos/InputAddGroupMember.java index 42b7f3cc..5a839eee 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputAddGroupMember.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateChatroom.java b/common/src/main/java/cn.wildfirechat.pojos/InputCreateChatroom.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateChatroom.java rename to common/src/main/java/cn.wildfirechat.pojos/InputCreateChatroom.java index b9fa9715..6ea61504 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateChatroom.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateGroup.java b/common/src/main/java/cn.wildfirechat.pojos/InputCreateGroup.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateGroup.java rename to common/src/main/java/cn.wildfirechat.pojos/InputCreateGroup.java index 92bdff99..cb25a0c9 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateGroup.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateRobot.java b/common/src/main/java/cn.wildfirechat.pojos/InputCreateRobot.java similarity index 99% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateRobot.java rename to common/src/main/java/cn.wildfirechat.pojos/InputCreateRobot.java index 9d9b6431..8df29be2 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateRobot.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateUser.java b/common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java similarity index 99% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateUser.java rename to common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java index 348426a6..807c0f28 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputCreateUser.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDestoryChatroom.java b/common/src/main/java/cn.wildfirechat.pojos/InputDestoryChatroom.java similarity index 93% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDestoryChatroom.java rename to common/src/main/java/cn.wildfirechat.pojos/InputDestoryChatroom.java index 9c682699..ab9d17df 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDestoryChatroom.java +++ b/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 { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDismissGroupMember.java b/common/src/main/java/cn.wildfirechat.pojos/InputDismissGroupMember.java similarity index 97% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDismissGroupMember.java rename to common/src/main/java/cn.wildfirechat.pojos/InputDismissGroupMember.java index cad5a5b0..c1bc1586 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputDismissGroupMember.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputFriendRequest.java b/common/src/main/java/cn.wildfirechat.pojos/InputFriendRequest.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputFriendRequest.java rename to common/src/main/java/cn.wildfirechat.pojos/InputFriendRequest.java index 0ebd5d3e..04fd67ce 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputFriendRequest.java +++ b/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 { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetFriendList.java b/common/src/main/java/cn.wildfirechat.pojos/InputGetFriendList.java similarity index 94% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetFriendList.java rename to common/src/main/java/cn.wildfirechat.pojos/InputGetFriendList.java index 2c6e0416..f0eb389b 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetFriendList.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetUserInfo.java b/common/src/main/java/cn.wildfirechat.pojos/InputGetUserInfo.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetUserInfo.java rename to common/src/main/java/cn.wildfirechat.pojos/InputGetUserInfo.java index 3d3f5f5e..492a1179 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGetUserInfo.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGroupBase.java b/common/src/main/java/cn.wildfirechat.pojos/InputGroupBase.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGroupBase.java rename to common/src/main/java/cn.wildfirechat.pojos/InputGroupBase.java index 9444c3e2..ce24f948 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputGroupBase.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputKickoffGroupMember.java b/common/src/main/java/cn.wildfirechat.pojos/InputKickoffGroupMember.java similarity index 97% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputKickoffGroupMember.java rename to common/src/main/java/cn.wildfirechat.pojos/InputKickoffGroupMember.java index c6548920..4cd842ab 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputKickoffGroupMember.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputSensitiveWords.java b/common/src/main/java/cn.wildfirechat.pojos/InputOutputSensitiveWords.java similarity index 92% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputSensitiveWords.java rename to common/src/main/java/cn.wildfirechat.pojos/InputOutputSensitiveWords.java index 5b24bde3..3ff25e24 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputSensitiveWords.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputUserBlockStatus.java b/common/src/main/java/cn.wildfirechat.pojos/InputOutputUserBlockStatus.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputUserBlockStatus.java rename to common/src/main/java/cn.wildfirechat.pojos/InputOutputUserBlockStatus.java index f87b760a..fe3188b0 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputOutputUserBlockStatus.java +++ b/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 { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputTransferGroup.java b/common/src/main/java/cn.wildfirechat.pojos/InputTransferGroup.java similarity index 97% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputTransferGroup.java rename to common/src/main/java/cn.wildfirechat.pojos/InputTransferGroup.java index b03d824c..cb867536 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputTransferGroup.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputUserLogin.java b/common/src/main/java/cn.wildfirechat.pojos/InputUserLogin.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/InputUserLogin.java rename to common/src/main/java/cn.wildfirechat.pojos/InputUserLogin.java index 1bb2cd77..24dee729 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/InputUserLogin.java +++ b/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 { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/MessagePayload.java b/common/src/main/java/cn.wildfirechat.pojos/MessagePayload.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/MessagePayload.java rename to common/src/main/java/cn.wildfirechat.pojos/MessagePayload.java index ecd2dad2..e8dc22db 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/MessagePayload.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCheckUserOnline.java b/common/src/main/java/cn.wildfirechat.pojos/OutputCheckUserOnline.java similarity index 92% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCheckUserOnline.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputCheckUserOnline.java index 8eb620fd..b8ca2524 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCheckUserOnline.java +++ b/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 diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateChatroom.java b/common/src/main/java/cn.wildfirechat.pojos/OutputCreateChatroom.java similarity index 94% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateChatroom.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputCreateChatroom.java index 5e1c1f0d..3a4f49d3 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateChatroom.java +++ b/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 { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateGroupResult.java b/common/src/main/java/cn.wildfirechat.pojos/OutputCreateGroupResult.java similarity index 94% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateGroupResult.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputCreateGroupResult.java index 58e36c7a..00c9ee7e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateGroupResult.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateRobot.java b/common/src/main/java/cn.wildfirechat.pojos/OutputCreateRobot.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateRobot.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputCreateRobot.java index ce579d95..4ce722c0 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateRobot.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateUser.java b/common/src/main/java/cn.wildfirechat.pojos/OutputCreateUser.java similarity index 94% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateUser.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputCreateUser.java index 9307e701..4218ab4d 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputCreateUser.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetChatroomInfo.java b/common/src/main/java/cn.wildfirechat.pojos/OutputGetChatroomInfo.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetChatroomInfo.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputGetChatroomInfo.java index 99dee99b..ebd4b284 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetChatroomInfo.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetFriendList.java b/common/src/main/java/cn.wildfirechat.pojos/OutputGetFriendList.java similarity index 93% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetFriendList.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputGetFriendList.java index a62f3a38..cb66b1f4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetFriendList.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputLoginData.java b/common/src/main/java/cn.wildfirechat.pojos/OutputLoginData.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputLoginData.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputLoginData.java index 61d1eb9e..822ff6f4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputLoginData.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputNotifyChannelSubscribeStatus.java b/common/src/main/java/cn.wildfirechat.pojos/OutputNotifyChannelSubscribeStatus.java similarity index 96% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputNotifyChannelSubscribeStatus.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputNotifyChannelSubscribeStatus.java index a4f51277..a9e1fdd0 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputNotifyChannelSubscribeStatus.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputRouteData.java b/common/src/main/java/cn.wildfirechat.pojos/OutputRouteData.java similarity index 97% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputRouteData.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputRouteData.java index 74f02dc3..eeca924e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputRouteData.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputUserStatus.java b/common/src/main/java/cn.wildfirechat.pojos/OutputUserStatus.java similarity index 93% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputUserStatus.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputUserStatus.java index bf86e6bc..c527e09f 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/OutputUserStatus.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroup.java b/common/src/main/java/cn.wildfirechat.pojos/PojoGroup.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroup.java rename to common/src/main/java/cn.wildfirechat.pojos/PojoGroup.java index 12c37544..b1b609ea 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroup.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupInfo.java b/common/src/main/java/cn.wildfirechat.pojos/PojoGroupInfo.java similarity index 96% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupInfo.java rename to common/src/main/java/cn.wildfirechat.pojos/PojoGroupInfo.java index b923bc48..431783b1 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupInfo.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupMember.java b/common/src/main/java/cn.wildfirechat.pojos/PojoGroupMember.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupMember.java rename to common/src/main/java/cn.wildfirechat.pojos/PojoGroupMember.java index 34f3dc6b..7b593084 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/PojoGroupMember.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/RecallMessageData.java b/common/src/main/java/cn.wildfirechat.pojos/RecallMessageData.java similarity index 95% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/RecallMessageData.java rename to common/src/main/java/cn.wildfirechat.pojos/RecallMessageData.java index 8e20c261..0680b4b8 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/RecallMessageData.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageData.java b/common/src/main/java/cn.wildfirechat.pojos/SendMessageData.java similarity index 98% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageData.java rename to common/src/main/java/cn.wildfirechat.pojos/SendMessageData.java index bf217e38..55a362cc 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageData.java +++ b/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; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageResult.java b/common/src/main/java/cn.wildfirechat.pojos/SendMessageResult.java similarity index 96% rename from broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageResult.java rename to common/src/main/java/cn.wildfirechat.pojos/SendMessageResult.java index b9ee7bcc..d2a9f96a 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/SendMessageResult.java +++ b/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; diff --git a/client/src/main/java/cn/wildfirechat/proto/ProtoConstants.java b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java similarity index 83% rename from client/src/main/java/cn/wildfirechat/proto/ProtoConstants.java rename to common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java index cdcfb3d3..7bc8b86d 100644 --- a/client/src/main/java/cn/wildfirechat/proto/ProtoConstants.java +++ b/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; } diff --git a/client/src/main/java/cn/wildfirechat/proto/WFCMessage.java b/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java similarity index 99% rename from client/src/main/java/cn/wildfirechat/proto/WFCMessage.java rename to common/src/main/java/cn/wildfirechat/proto/WFCMessage.java index b45b9e6f..8fd7e06f 100644 --- a/client/src/main/java/cn/wildfirechat/proto/WFCMessage.java +++ b/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; } diff --git a/pom.xml b/pom.xml index 7cd7e403..b9a19bf6 100755 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ wildfire_jmeter client distribution + common diff --git a/wildfire_jmeter/src/main/java/net/xmeter/samplers/AbstractMQTTSampler.java b/wildfire_jmeter/src/main/java/net/xmeter/samplers/AbstractMQTTSampler.java index d5ad8978..001f3337 100755 --- a/wildfire_jmeter/src/main/java/net/xmeter/samplers/AbstractMQTTSampler.java +++ b/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 com.xiaoleilu.loServer.pojos.InputGetToken; -import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData; +import cn.wildfirechat.pojos.InputRoute; +import cn.wildfirechat.pojos.InputGetToken; +import cn.wildfirechat.pojos.OutputGetIMTokenData; import io.moquette.spi.impl.security.AES; import net.xmeter.IMResult; import net.xmeter.Util;