diff --git a/broker/src/main/java/com/xiaoleilu/loServer/RestResult.java b/broker/src/main/java/com/xiaoleilu/loServer/RestResult.java index 2ca0d50b..167dfa29 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/RestResult.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/RestResult.java @@ -8,7 +8,7 @@ package com.xiaoleilu.loServer; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; public class RestResult { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java b/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java index 55a1911e..ebe69ada 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java @@ -20,9 +20,9 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; /** * 请求处理接口
diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java index b1e30245..a3e5d6d9 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java @@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.Base64; import java.util.concurrent.Executor; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java index d10edc2c..846e7f78 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java @@ -26,7 +26,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.Base64; import java.util.concurrent.Executor; 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 1d396d16..08db3180 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -22,12 +23,12 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/group/member") +@Route(APIPath.Group_Member_Add) @HttpMethod("POST") public class AddGroupMemberAction extends AdminAction { 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 adcb7b7e..e6090c45 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 @@ -16,7 +16,7 @@ import com.xiaoleilu.loServer.handler.Response; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.RateLimiter; abstract public class AdminAction extends Action { 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 07e039c1..68159743 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -20,9 +21,9 @@ import io.moquette.persistence.TargetEntry; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/user/status") +@Route(APIPath.User_Status) @HttpMethod("POST") public class BlockUserAction extends AdminAction { 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 76e6e50f..db9ed3fc 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.xiaoleilu.loServer.annotation.HttpMethod; import com.xiaoleilu.loServer.annotation.Route; import com.xiaoleilu.loServer.handler.Request; @@ -17,9 +18,9 @@ import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("/admin/user/onlinestatus") +@Route(APIPath.User_Online_Status) @HttpMethod("POST") public class CheckUserOnlineAction extends AdminAction { 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 ffcc15c0..c0a3edd1 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -21,10 +22,10 @@ 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 common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("/admin/chatroom") -@HttpMethod("PUT") +@Route(APIPath.Create_Chatroom) +@HttpMethod("POST") public class CreateChatroomAction extends AdminAction { @Override 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 f707835a..cdcf3233 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -23,13 +24,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/group") -@HttpMethod("PUT") +@Route(APIPath.Create_Group) +@HttpMethod("POST") public class CreateGroupAction extends AdminAction { @Override 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 33b2f668..db0ec833 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -20,10 +21,10 @@ 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; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.UUIDGenerator; -@Route("admin/robot/create") +@Route(APIPath.Create_Robot) @HttpMethod("POST") public class CreateRobotAction extends AdminAction { 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 b2a31161..f114b180 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -15,15 +16,15 @@ 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 cn.wildfirechat.pojos.InputCreateUser; +import cn.wildfirechat.pojos.InputOutputUserInfo; 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; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.UUIDGenerator; -@Route("admin/user/create") +@Route(APIPath.Create_User) @HttpMethod("POST") public class CreateUserAction extends AdminAction { @@ -35,7 +36,7 @@ public class CreateUserAction extends AdminAction { @Override public boolean action(Request request, Response response) { if (request.getNettyRequest() instanceof FullHttpRequest) { - InputCreateUser inputCreateUser = getRequestBody(request.getNettyRequest(), InputCreateUser.class); + InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class); if (inputCreateUser != null && !StringUtil.isNullOrEmpty(inputCreateUser.getName())) { 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 020708e0..46061728 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -19,10 +20,10 @@ 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 common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("/admin/chatroom") -@HttpMethod("DELETE") +@Route(APIPath.Chatroom_Destroy) +@HttpMethod("POST") public class DestoryChatroomAction extends AdminAction { @Override 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 c73c12c1..7ef950e9 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -22,13 +23,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/group") -@HttpMethod("DELETE") +@Route(APIPath.Group_Dismiss) +@HttpMethod("POST") public class DismissGroupAction extends AdminAction { @Override 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 3b89155e..177e3a95 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/friend/status") +@Route(APIPath.Friend_Status) @HttpMethod("POST") public class FriendRelationAction extends AdminAction { 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 ebd16d4e..714c4851 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,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -15,8 +16,6 @@ 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 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; @@ -24,7 +23,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; import java.util.ArrayList; import java.util.List; -@Route("admin/friend/list") +@Route(APIPath.Friend_List) @HttpMethod("POST") public class FriendRelationGetAction extends AdminAction { 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 757c8705..05e5c741 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -19,9 +20,9 @@ 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; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("/admin/chatroom") +@Route(APIPath.Chatroom_Info) @HttpMethod("GET") public class GetChatroomInfoAction extends AdminAction { 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 efba5303..2b677a34 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.xiaoleilu.loServer.annotation.HttpMethod; import com.xiaoleilu.loServer.annotation.Route; @@ -18,13 +19,13 @@ import cn.wildfirechat.pojos.OutputGetIMTokenData; import io.moquette.persistence.RPCCenter; import io.moquette.persistence.TargetEntry; import io.netty.handler.codec.http.FullHttpRequest; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.Base64; import java.util.concurrent.Executor; -@Route("/admin/user/token") +@Route(APIPath.User_Token) @HttpMethod("POST") public class GetIMTokenAction extends AdminAction { 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 e63eaecd..25c08873 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -15,14 +16,14 @@ 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 cn.wildfirechat.pojos.InputCreateUser; +import cn.wildfirechat.pojos.InputOutputUserInfo; import cn.wildfirechat.pojos.InputGetUserInfo; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/user/info") +@Route(APIPath.User_Info) @HttpMethod("POST") public class GetUserAction extends AdminAction { @@ -52,7 +53,7 @@ public class GetUserAction extends AdminAction { if (user == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { - result = RestResult.ok(InputCreateUser.fromPbUser(user)); + result = RestResult.ok(InputOutputUserInfo.fromPbUser(user)); } response.setContent(new Gson().toJson(result)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java index 7c01c1f3..0c4bcaa2 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -17,7 +18,7 @@ import com.xiaoleilu.loServer.handler.Response; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -@Route("admin/user/statuslist") +@Route(APIPath.User_Status_List) @HttpMethod("POST") public class GetUserBlockListAction extends AdminAction { 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 1abb45a4..1263076c 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -19,9 +20,9 @@ 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; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/user/checkstatus") +@Route(APIPath.User_Check_Status) @HttpMethod("POST") public class GetUserBlockStatusAction extends AdminAction { 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 fdc585b4..85a9f7ac 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -22,13 +23,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/group/member") -@HttpMethod("DELETE") +@Route(APIPath.Group_Member_Kickoff) +@HttpMethod("POST") public class KickoffGroupMemberAction extends AdminAction { @Override 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 ead483d3..4346bcb8 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/message/recall") +@Route(APIPath.Msg_Recall) @HttpMethod("POST") public class RecallMessageAction extends AdminAction { 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 2f244a66..94466da8 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.hazelcast.util.StringUtil; import com.xiaoleilu.loServer.RestResult; @@ -24,12 +25,12 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/message/send") +@Route(APIPath.Msg_Send) @HttpMethod("POST") public class SendMessageAction extends AdminAction { 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 98d6b2ef..8ce479fa 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -17,9 +18,9 @@ import com.xiaoleilu.loServer.handler.Response; import cn.wildfirechat.pojos.InputOutputSensitiveWords; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/sensitive/add") +@Route(APIPath.Sensitive_Add) @HttpMethod("POST") public class SensitiveWordAddAction extends AdminAction { 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 eab64355..41545339 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -17,9 +18,9 @@ import com.xiaoleilu.loServer.handler.Response; import cn.wildfirechat.pojos.InputOutputSensitiveWords; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/sensitive/del") +@Route(APIPath.Sensitive_Del) @HttpMethod("POST") public class SensitiveWordDeleteAction extends AdminAction { 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 5cdfcb10..5416a979 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,17 +8,18 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; 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 cn.wildfirechat.pojos.InputOutputSensitiveWords; import io.netty.handler.codec.http.FullHttpRequest; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.List; -@Route("admin/sensitive/query") +@Route(APIPath.Sensitive_Query) @HttpMethod("POST") public class SensitiveWordQueryAction extends AdminAction { 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 c7163de9..bb4638a3 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -22,13 +23,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/group/owner") -@HttpMethod("PUT") +@Route(APIPath.Group_Owner) +@HttpMethod("POST") public class TransferGroupAction extends AdminAction { @Override diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java index c5227afd..d312076e 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java @@ -20,7 +20,7 @@ import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.RateLimiter; abstract public class ChannelAction extends Action { 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 ded36852..4a69af88 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.channel; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -24,14 +25,14 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Channel; -@Route("channel/message/send") +@Route(APIPath.Channel_Message_Send) @HttpMethod("POST") public class SendMessageAction extends ChannelAction { 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 7d0323cc..eea5bd34 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 @@ -8,6 +8,7 @@ package com.xiaoleilu.loServer.action.robot; +import cn.wildfirechat.common.APIPath; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; @@ -15,14 +16,14 @@ 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 cn.wildfirechat.pojos.InputCreateUser; +import cn.wildfirechat.pojos.InputOutputUserInfo; import cn.wildfirechat.pojos.InputGetUserInfo; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; -@Route("admin/robot/user_info") +@Route(APIPath.Robot_User_Info) @HttpMethod("POST") public class GetUserAction extends RobotAction { @@ -47,7 +48,7 @@ public class GetUserAction extends RobotAction { if (user == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { - result = RestResult.ok(InputCreateUser.fromPbUser(user)); + result = RestResult.ok(InputOutputUserInfo.fromPbUser(user)); } response.setContent(new Gson().toJson(result)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java index 455082bd..b10073b5 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java @@ -20,7 +20,7 @@ import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.RateLimiter; import java.io.UnsupportedEncodingException; 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 c3b8531b..30646410 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,6 +9,7 @@ package com.xiaoleilu.loServer.action.robot; +import cn.wildfirechat.common.APIPath; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.annotation.HttpMethod; @@ -23,12 +24,12 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.concurrent.Executor; -@Route("admin/robot/send") +@Route(APIPath.Robot_Message_Send) @HttpMethod("POST") public class SendMessageAction extends RobotAction { diff --git a/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java b/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java index e9903fca..13252b92 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java @@ -12,10 +12,10 @@ import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; import static win.liyufan.im.IMTopic.HandleFriendRequestTopic; @Handler(IMTopic.AddFriendRequestTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java index bac1452e..55aadb33 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java @@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(value = IMTopic.AddGroupMemberTopic) public class AddGroupMember extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java index ffb731f9..02ae4529 100644 --- a/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java @@ -11,10 +11,10 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.BlackListUserTopic) public class BlackListRequestHandler extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java index 52839ec3..e0eb0ea8 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java +++ b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import static win.liyufan.im.IMTopic.PutUserSettingTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java b/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java index c220e072..cea54c4f 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.List; diff --git a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java index ca7b6c55..bcc7d937 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java @@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage; import com.hazelcast.util.StringUtil; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import static win.liyufan.im.IMTopic.PutUserSettingTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java index 1532c573..cf4e2abb 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java @@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(value = IMTopic.CreateGroupTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java b/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java index 95a2cd7e..a24fbd55 100644 --- a/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.DeleteFriendTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java index e838f744..3433c03c 100644 --- a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java @@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import static win.liyufan.im.IMTopic.DismissGroupTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java index ac0501d6..fea12640 100644 --- a/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import static win.liyufan.im.IMTopic.PutUserSettingTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java index 0966acfc..c6bbae71 100644 --- a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java @@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage; import com.xiaoleilu.loServer.model.FriendData; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.List; diff --git a/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java b/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java index 7cf45b5f..327c7e95 100644 --- a/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.List; diff --git a/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java index eb79c72a..dee07c52 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.ChannelPullTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java index 522f5970..b5be03d9 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.GetChatroomInfoTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java index c7a3b4a4..e5e4b70a 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.GetChatroomMemberTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java index bdf622f7..57eb0c65 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.List; diff --git a/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java b/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java index 6d48f193..f76237df 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java @@ -11,13 +11,13 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.ArrayList; import java.util.List; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetGroupMemberTopic) public class GetGroupMemberHandler extends IMHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java index ec597e26..5b27a9b1 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java @@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.action.UploadFileAction; import io.moquette.server.config.MediaServerConfig; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.GetQiniuUploadTokenTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java index 54616f16..c70ad714 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java @@ -13,7 +13,7 @@ import io.moquette.persistence.MemorySessionStore; import io.moquette.spi.impl.Qos1PublishHandler; import io.moquette.spi.impl.security.TokenAuthenticator; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.GetTokenTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java index ec0a4e90..d8836070 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java @@ -11,10 +11,10 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetUserInfoTopic) public class GetUserInfoHandler extends IMHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java b/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java index 15c1a952..c85e5251 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java @@ -11,10 +11,10 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetUserSettingTopic) public class GetUserSettingHandler extends IMHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java index cf06afed..119218f2 100644 --- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java @@ -12,11 +12,11 @@ import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import win.liyufan.im.MessageShardingUtil; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.HandleFriendRequestTopic) public class HandleFriendRequestHandler extends IMHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/IMHandler.java b/broker/src/main/java/io/moquette/imhandler/IMHandler.java index f60bade1..db6334dc 100755 --- a/broker/src/main/java/io/moquette/imhandler/IMHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/IMHandler.java @@ -23,7 +23,7 @@ import io.netty.buffer.Unpooled; import io.netty.util.internal.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.RateLimiter; import win.liyufan.im.Utility; @@ -34,8 +34,8 @@ import java.lang.reflect.Method; import java.util.LinkedHashSet; import java.util.Set; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_OVER_FREQUENCY; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; /** * 请求处理接口
diff --git a/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java b/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java index 28e46c6b..bf645e7e 100644 --- a/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java index 68a05004..fff5a4d7 100644 --- a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java @@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic; @Handler(value = KickoffGroupMemberTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java index 012d0c5b..7dd099a5 100644 --- a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(value = IMTopic.LoadRemoteMessagesTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java index f4be4436..f27bb885 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import static win.liyufan.im.IMTopic.ModifyChannelInfoTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java index 71f30385..a701150b 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java @@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.ModifyGroupAliasTopic) public class ModifyGroupAliasHandler extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java index 4aff8108..10ae6462 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java @@ -12,11 +12,11 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name; import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic; @Handler(value = ModifyGroupInfoTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java index 998c3d4d..8482dac1 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.ModifyMyInfoTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java index 8f89fbf5..3bc85708 100644 --- a/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java @@ -12,7 +12,7 @@ import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(value = IMTopic.PullMessageTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java b/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java index b20522e0..26f6ed11 100644 --- a/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.PutUserSettingTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java b/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java index 802c2afa..571be8e4 100644 --- a/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.QuitChatroomTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java index 5e1ddd39..e36e66b4 100644 --- a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java @@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import static win.liyufan.im.IMTopic.QuitGroupTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java index d8a00c6f..f6674a0e 100644 --- a/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.LinkedHashSet; diff --git a/broker/src/main/java/io/moquette/imhandler/RouteHandler.java b/broker/src/main/java/io/moquette/imhandler/RouteHandler.java index 7eec7c55..f79aa965 100644 --- a/broker/src/main/java/io/moquette/imhandler/RouteHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/RouteHandler.java @@ -13,7 +13,7 @@ import com.hazelcast.core.Member; import io.moquette.spi.ClientSession; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_IP; diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java index 0f88e72c..e1f8cdfe 100644 --- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java @@ -14,7 +14,7 @@ import com.hazelcast.util.StringUtil; import io.moquette.BrokerConstants; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import win.liyufan.im.MessageShardingUtil; diff --git a/broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java index 8f3b93ae..065a56cc 100644 --- a/broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java @@ -11,10 +11,10 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.SetFriendAliasTopic) public class SetFriendAliasRequestHandler extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java b/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java index 4664d618..b2ddafe2 100644 --- a/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java @@ -11,10 +11,10 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.RriendRequestUnreadSyncTopic) public class SyncFriendRequestUnreadHandler extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java index 94605663..be4aaaee 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; @Handler(IMTopic.TransferChannelInfoTopic) diff --git a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java index f3ceb6e0..b00deff7 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java @@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage; import cn.wildfirechat.pojos.GroupNotificationBinaryContent; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.TransferGroupTopic) public class TransferGroupHandler extends GroupHandler { diff --git a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java index c884b17e..a23d27c2 100644 --- a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java @@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage; import io.moquette.persistence.MemorySessionStore; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; diff --git a/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java b/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java index 9b29679c..8b08cf0c 100644 --- a/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java @@ -11,7 +11,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import java.util.List; diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 702dd74c..330e9c27 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -23,7 +23,7 @@ import com.hazelcast.core.*; import com.hazelcast.util.StringUtil; import com.xiaoleilu.loServer.model.FriendData; import cn.wildfirechat.pojos.InputOutputUserBlockStatus; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import io.moquette.server.Server; import io.moquette.spi.IMatchingCondition; import io.moquette.spi.IMessagesStore; diff --git a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java index ee8e0b1e..55e27a8c 100755 --- a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java @@ -25,7 +25,7 @@ import io.moquette.spi.ISessionsStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.*; import java.util.concurrent.*; diff --git a/broker/src/main/java/io/moquette/persistence/RPCCenter.java b/broker/src/main/java/io/moquette/persistence/RPCCenter.java index e6159d82..2796b3a7 100644 --- a/broker/src/main/java/io/moquette/persistence/RPCCenter.java +++ b/broker/src/main/java/io/moquette/persistence/RPCCenter.java @@ -12,7 +12,7 @@ import io.moquette.persistence.remote.*; import io.moquette.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/broker/src/main/java/io/moquette/server/ConnectionDescriptorStore.java b/broker/src/main/java/io/moquette/server/ConnectionDescriptorStore.java index 6f02d73d..9dba3e2c 100644 --- a/broker/src/main/java/io/moquette/server/ConnectionDescriptorStore.java +++ b/broker/src/main/java/io/moquette/server/ConnectionDescriptorStore.java @@ -27,7 +27,7 @@ import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.ArrayList; import java.util.Collection; diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java index b72240e8..019a696a 100755 --- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java @@ -25,7 +25,7 @@ import io.moquette.spi.impl.subscriptions.Topic; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.mqtt.MqttQoS; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.Collection; import java.util.List; diff --git a/broker/src/main/java/io/moquette/spi/ISessionsStore.java b/broker/src/main/java/io/moquette/spi/ISessionsStore.java index fc035767..f0c6b9fe 100755 --- a/broker/src/main/java/io/moquette/spi/ISessionsStore.java +++ b/broker/src/main/java/io/moquette/spi/ISessionsStore.java @@ -19,7 +19,7 @@ package io.moquette.spi; import cn.wildfirechat.proto.WFCMessage; import io.moquette.persistence.MemorySessionStore.Session; import io.moquette.spi.IMessagesStore.StoredMessage; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import java.util.Collection; import java.util.Queue; 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 8c296309..e95dd44b 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java @@ -19,9 +19,9 @@ package io.moquette.spi.impl; import static io.moquette.spi.impl.Utils.readBytesAndRewind; import static io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader.from; import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_NOT_IMPLEMENT; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_OVER_FREQUENCY; -import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IMPLEMENT; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY; +import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; import java.io.IOException; import java.util.*; @@ -56,7 +56,7 @@ import io.netty.channel.Channel; import io.netty.handler.codec.mqtt.MqttFixedHeader; import io.netty.handler.codec.mqtt.MqttMessageType; import io.netty.handler.codec.mqtt.MqttPublishMessage; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; import win.liyufan.im.IMTopic; import win.liyufan.im.RateLimiter; import win.liyufan.im.Utility; diff --git a/client/pom.xml b/client/pom.xml index 6951df6b..1b5999ea 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - cn.wildfirechat client diff --git a/common/pom.xml b/common/pom.xml index 5c71faff..9d5c365a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -9,7 +9,6 @@ 4.0.0 - cn.wildfirechat common diff --git a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java b/common/src/main/java/cn.wildfirechat.pojos/InputGetToken.java similarity index 82% rename from client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java rename to common/src/main/java/cn.wildfirechat.pojos/InputGetToken.java index c0b59f9e..87e5e1a4 100755 --- a/client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java +++ b/common/src/main/java/cn.wildfirechat.pojos/InputGetToken.java @@ -4,9 +4,9 @@ public class InputGetToken { private String userId; private String clientId; - public InputGetToken(String userId, String name) { + public InputGetToken(String userId, String clientId) { this.userId = userId; - this.clientId = name; + this.clientId = clientId; } public String getUserId() { diff --git a/common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java b/common/src/main/java/cn.wildfirechat.pojos/InputOutputUserInfo.java similarity index 95% rename from common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java rename to common/src/main/java/cn.wildfirechat.pojos/InputOutputUserInfo.java index 807c0f28..a62ec30d 100755 --- a/common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java +++ b/common/src/main/java/cn.wildfirechat.pojos/InputOutputUserInfo.java @@ -11,7 +11,7 @@ package cn.wildfirechat.pojos; import cn.wildfirechat.proto.WFCMessage; -public class InputCreateUser { +public class InputOutputUserInfo { private String userId; private String name; private String password; @@ -26,8 +26,8 @@ public class InputCreateUser { private String extra; private long updateDt; - public static InputCreateUser fromPbUser(WFCMessage.User pbUser) { - InputCreateUser inputCreateUser = new InputCreateUser(); + public static InputOutputUserInfo fromPbUser(WFCMessage.User pbUser) { + InputOutputUserInfo inputCreateUser = new InputOutputUserInfo(); inputCreateUser.userId = pbUser.getUid(); inputCreateUser.name = pbUser.getName(); inputCreateUser.displayName = pbUser.getDisplayName(); diff --git a/client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java b/common/src/main/java/cn.wildfirechat.pojos/OutputGetIMTokenData.java similarity index 100% rename from client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java rename to common/src/main/java/cn.wildfirechat.pojos/OutputGetIMTokenData.java diff --git a/common/src/main/java/cn/wildfirechat/common/APIPath.java b/common/src/main/java/cn/wildfirechat/common/APIPath.java new file mode 100644 index 00000000..6cb5c6d0 --- /dev/null +++ b/common/src/main/java/cn/wildfirechat/common/APIPath.java @@ -0,0 +1,41 @@ +package cn.wildfirechat.common; + +public interface APIPath { + String Create_Chatroom = "/admin/chatroom/create"; + String Create_Group = "/admin/group/create"; + String Create_Robot = "/admin/robot/create"; + String Create_User = "/admin/user/create"; + + String Chatroom_Destroy = "/admin/chatroom/del"; + String Chatroom_Info = "/admin/chatroom/info"; + + + String Sensitive_Add = "/admin/sensitive/add"; + String Sensitive_Del = "/admin/sensitive/del"; + String Sensitive_Query = "/admin/sensitive/query"; + + String User_Token = "/admin/user/token"; + String User_Status = "/admin/user/status"; + String User_Info = "/admin/user/info"; + String User_Status_List = "/admin/user/statuslist"; + String User_Check_Status = "/admin/user/checkstatus"; + String User_Online_Status = "/admin/user/onlinestatus"; + + + String Friend_Status = "/admin/friend/status"; + String Friend_List = "/admin/friend/list"; + + String Msg_Send = "/admin/message/send"; + String Msg_Recall = "/admin/message/recall"; + + String Group_Dismiss = "/admin/group/del"; + String Group_Member_Add = "/admin/group/member/add"; + String Group_Member_Kickoff = "/admin/group/member/del"; + String Group_Owner = "/admin/group/owner"; + + + String Channel_Message_Send = "/channel/message/send"; + + String Robot_User_Info = "/robot/user_info"; + String Robot_Message_Send = "/robot/message/send"; +} diff --git a/common/src/main/java/common/cn/wildfirechat/ErrorCode.java b/common/src/main/java/cn/wildfirechat/common/ErrorCode.java similarity index 98% rename from common/src/main/java/common/cn/wildfirechat/ErrorCode.java rename to common/src/main/java/cn/wildfirechat/common/ErrorCode.java index 48b42786..0d7421ac 100755 --- a/common/src/main/java/common/cn/wildfirechat/ErrorCode.java +++ b/common/src/main/java/cn/wildfirechat/common/ErrorCode.java @@ -6,7 +6,7 @@ * file that was distributed with this source code. */ -package common.cn.wildfirechat; +package cn.wildfirechat.common; public enum ErrorCode { //General error diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml index 311ee15b..fda99d71 100755 --- a/distribution/src/main/assembly/assembly.xml +++ b/distribution/src/main/assembly/assembly.xml @@ -78,6 +78,30 @@ lib/ moquette-broker-${project.version}.jar + + + ../client/target/client-${project.version}.jar + java_client/ + client-${project.version}.jar + + + + ../common/target/common-${project.version}.jar + java_client/ + common-${project.version}.jar + + + + ../sdk/target/sdk-${project.version}.jar + server_sdk/ + sdk-${project.version}.jar + + + + ../common/target/common-${project.version}.jar + server_sdk/ + common-${project.version}.jar + diff --git a/sdk/pom.xml b/sdk/pom.xml index 03d6ac95..22c1b655 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -56,13 +56,6 @@ test - - com.google.code.findbugs - annotations - 2.0.3 - provided - - org.mockito mockito-all @@ -72,9 +65,9 @@ - com.github.qcloudsms - qcloudsms - 1.0.5 + org.apache.httpcomponents + httpclient + 4.5.3 diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/ChatAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/ChatAdmin.java index 8455cb29..5c95a477 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/ChatAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/ChatAdmin.java @@ -1,5 +1,6 @@ package cn.wildfirechat.sdk; +import cn.wildfirechat.pojos.*; import cn.wildfirechat.sdk.model.*; public class ChatAdmin { @@ -7,19 +8,20 @@ public class ChatAdmin { HttpUtils.init(url, secret); } - public static IMResult getUserByName(String mobile) throws Exception { + public static IMResult getUserByName(String mobile) throws Exception { String path = "/admin/user/info"; - UserName name = new UserName(mobile); - return HttpUtils.httpJsonPost(path, name, User.class); + InputGetUserInfo getUserInfo = new InputGetUserInfo(null, mobile); + return HttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class); } - public static IMResult createUser(User user) throws Exception { + public static IMResult createUser(InputOutputUserInfo user) throws Exception { String path = "/admin/user/create"; - return HttpUtils.httpJsonPost(path, user, UserId.class); + return HttpUtils.httpJsonPost(path, user, OutputCreateUser.class); } - public static IMResult getUserToken(String userId, String clientId) throws Exception { + public static IMResult getUserToken(String userId, String clientId) throws Exception { String path = "/admin/user/token"; - return HttpUtils.httpJsonPost(path, new GetTokenRequest(userId, clientId), Token.class); + InputGetToken getToken = new InputGetToken(userId, clientId); + return HttpUtils.httpJsonPost(path, getToken, OutputGetIMTokenData.class); } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/GetTokenRequest.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/GetTokenRequest.java deleted file mode 100755 index 885ff81f..00000000 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/GetTokenRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.wildfirechat.sdk.model; - -public class GetTokenRequest { - private String userId; - private String clientId; - - public GetTokenRequest(String userId, String clientId) { - this.userId = userId; - this.clientId = clientId; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } -} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/IMResult.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/IMResult.java index b3001549..79401173 100755 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/IMResult.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/model/IMResult.java @@ -1,6 +1,6 @@ package cn.wildfirechat.sdk.model; -import common.cn.wildfirechat.ErrorCode; +import cn.wildfirechat.common.ErrorCode; public class IMResult { diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/Token.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/Token.java deleted file mode 100644 index 69a7443a..00000000 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/Token.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.wildfirechat.sdk.model; - -public class Token { - private String token; - private String userId; - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } -} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/User.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/User.java deleted file mode 100644 index 20e59fe0..00000000 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/User.java +++ /dev/null @@ -1,121 +0,0 @@ -package cn.wildfirechat.sdk.model; - -public class User { - private String userId; - private String name; - private String password; - private String displayName; - private String portrait; - private int gender; - private String mobile; - private String email; - private String address; - private String company; - private String social; - private String extra; - private long updateDt; - - public String getSocial() { - return social; - } - - public void setSocial(String social) { - this.social = social; - } - - public long getUpdateDt() { - return updateDt; - } - - public void setUpdateDt(long updateDt) { - this.updateDt = updateDt; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public String getPortrait() { - return portrait; - } - - public void setPortrait(String portrait) { - this.portrait = portrait; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCompany() { - return company; - } - - public void setCompany(String company) { - this.company = company; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } - - public int getGender() { - return gender; - } - - public void setGender(int gender) { - this.gender = gender; - } -} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/UserId.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/UserId.java deleted file mode 100755 index 283375d2..00000000 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/UserId.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.wildfirechat.sdk.model; - -public class UserId { - private String userId; - - public UserId(String userId) { - this.userId = userId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } -} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/model/UserName.java b/sdk/src/main/java/cn/wildfirechat/sdk/model/UserName.java deleted file mode 100755 index 58d97028..00000000 --- a/sdk/src/main/java/cn/wildfirechat/sdk/model/UserName.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.wildfirechat.sdk.model; - -public class UserName { - private String name; - - public UserName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -}