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 7bfc1e5e..06bb7335 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java @@ -47,7 +47,7 @@ abstract public class Action { return ERROR_CODE_SUCCESS; } - public boolean doAction(Request request, Response response) { + public boolean doAction(Request request) { ErrorCode errorCode = preAction(request, response); boolean isSync = true; if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { @@ -63,7 +63,7 @@ abstract public class Action { // throw e; // } // } else { - isSync = action(request, response); + isSync = action(request); // } } else { response.setStatus(HttpResponseStatus.OK); @@ -81,7 +81,7 @@ abstract public class Action { public boolean isTransactionAction() { return false; } - abstract public boolean action(Request request, Response response); + abstract public boolean action(Request request); protected T getRequestBody(HttpRequest request, Class cls) { if (request instanceof FullHttpRequest) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/CheckTokenAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/CheckTokenAction.java index 837c3432..1da8d5d0 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/CheckTokenAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/CheckTokenAction.java @@ -29,7 +29,7 @@ import java.io.IOException; public class CheckTokenAction extends Action { private final RateLimiter mLimitCounter = new RateLimiter(10, 1); @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setStatus(HttpResponseStatus.OK); String userId = request.getParam("userId"); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/DefaultIndexAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/DefaultIndexAction.java index 3ba2fbfc..d1c7b686 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/DefaultIndexAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/DefaultIndexAction.java @@ -12,7 +12,7 @@ import io.moquette.spi.IMessagesStore; */ public class DefaultIndexAction extends Action{ @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { response.setContent("Welcome to LoServer."); return true; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java index 94940089..0caa425e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java @@ -34,7 +34,7 @@ public class FileAction extends Action { private static final org.slf4j.Logger Logger = LoggerFactory.getLogger(FileAction.class); @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { response.setHeader("Access-Control-Allow-Origin", "*"); if (false == Request.METHOD_GET.equalsIgnoreCase(request.getMethod())) { response.sendError(HttpResponseStatus.METHOD_NOT_ALLOWED, "Please use GET method to request file!"); 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 7e9e399a..aabaeca2 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java @@ -35,7 +35,7 @@ import java.util.concurrent.Executor; public class IMAction extends Action { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java index 607facf9..95d22345 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java @@ -27,7 +27,7 @@ public class NotFoundAction extends Action{ private final static String TEMPLATE_ERROR = "LoServer - Error report

HTTP Status {} - {}


{}


LoServer

"; @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { response.sendError(HttpResponseStatus.NOT_FOUND, "404 Not found!"); return true; } 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 1d490e3f..09aaaaf6 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java @@ -37,7 +37,7 @@ public class RouteAction extends Action { private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class); @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setContentType("application/octet-stream"); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java index d0eaf109..6e23c872 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java @@ -27,7 +27,7 @@ public class UnknownErrorAction extends Action{ private final static String TEMPLATE_ERROR = "LoServer - Error report

HTTP Status {} - {}


{}


LoServer

"; @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); return true; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java index 9933d891..691a7440 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java @@ -73,7 +73,7 @@ public class UploadFileAction extends Action { } @Override - public boolean action(Request r, Response response) { + public boolean action(Request r) { if (r.getNettyRequest() instanceof FullHttpRequest) { FullHttpRequest request = (FullHttpRequest) r.getNettyRequest(); 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 bce1a08c..840de041 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java @@ -28,7 +28,7 @@ public class VersionAction extends Action { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddFriendRequestAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddFriendRequestAction.java index 6c20a76f..36671da9 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddFriendRequestAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddFriendRequestAction.java @@ -36,7 +36,7 @@ public class AddFriendRequestAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputAddFriendRequest input = getRequestBody(request.getNettyRequest(), InputAddFriendRequest.class); 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 65998447..72b79768 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 @@ -38,7 +38,7 @@ public class AddGroupMemberAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class); if (inputAddGroupMember.isValide()) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasGetAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasGetAction.java index 1225f260..e544cbdd 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasGetAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasGetAction.java @@ -36,7 +36,7 @@ public class AliasGetAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetAlias input = getRequestBody(request.getNettyRequest(), InputGetAlias.class); List dataList = messagesStore.getFriendList(input.getOperator(), null, 0); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasPutAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasPutAction.java index ccc6253c..ac515399 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasPutAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AliasPutAction.java @@ -36,7 +36,7 @@ public class AliasPutAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUpdateAlias input = getRequestBody(request.getNettyRequest(), InputUpdateAlias.class); ErrorCode errorCode = messagesStore.setFriendAliasRequest(input.getOperator(), input.getTargetId(), input.getAlias(), new long[1]); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistAction.java index 0b9fbfed..0b5cebfb 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistAction.java @@ -39,7 +39,7 @@ public class BlacklistAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputBlacklistRequest inputData = getRequestBody(request.getNettyRequest(), InputBlacklistRequest.class); if (inputData != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistGetAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistGetAction.java index a661aade..f8bdc547 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistGetAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlacklistGetAction.java @@ -35,7 +35,7 @@ public class BlacklistGetAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class); List dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0); 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 ab3d825a..145536c3 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 @@ -33,7 +33,7 @@ public class BlockUserAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputOutputUserBlockStatus inputUserBlock = getRequestBody(request.getNettyRequest(), InputOutputUserBlockStatus.class); if (inputUserBlock != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BroadcastMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BroadcastMessageAction.java index eff2a5e9..9528ed9e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BroadcastMessageAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/BroadcastMessageAction.java @@ -40,7 +40,7 @@ public class BroadcastMessageAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { BroadMessageData sendMessageData = getRequestBody(request.getNettyRequest(), BroadMessageData.class); if (BroadMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) { 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 27d07481..ce42f675 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 @@ -34,7 +34,7 @@ public class CheckUserOnlineAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class); if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java index cc53b92f..345dd092 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java @@ -38,7 +38,7 @@ public class CreateChannelAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputCreateChannel inputCreateChannel = getRequestBody(request.getNettyRequest(), InputCreateChannel.class); if (inputCreateChannel != null 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 c0a3edd1..78fb6e58 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 @@ -34,7 +34,7 @@ public class CreateChatroomAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest(); byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content()); 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 153295e7..6036c2df 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 @@ -39,7 +39,7 @@ public class CreateGroupAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class); if (inputCreateGroup.isValide()) { 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 910affda..4e92000d 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 @@ -39,7 +39,7 @@ public class CreateRobotAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputCreateRobot inputCreateRobot = getRequestBody(request.getNettyRequest(), InputCreateRobot.class); if (inputCreateRobot != null 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 163d71f1..c9a68be2 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 @@ -40,7 +40,7 @@ public class CreateUserAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class); if (inputCreateUser != null 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 46061728..d93ecec3 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 @@ -32,7 +32,7 @@ public class DestoryChatroomAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest(); byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestroyUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestroyUserAction.java index e6d3cd83..5016afae 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestroyUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestroyUserAction.java @@ -38,7 +38,7 @@ public class DestroyUserAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputDestroyUser inputDestroyUser = getRequestBody(request.getNettyRequest(), InputDestroyUser.class); if (inputDestroyUser != null 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 ab5ec629..1254f0bb 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 @@ -38,7 +38,7 @@ public class DismissGroupAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class); if (inputDismissGroup.isValide()) { 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 cd2fe3f8..91e6d610 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 @@ -39,7 +39,7 @@ public class FriendRelationAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUpdateFriendStatusRequest friendAdd = getRequestBody(request.getNettyRequest(), InputUpdateFriendStatusRequest.class); if (friendAdd != null 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 6f13ca73..b91349b9 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 @@ -36,7 +36,7 @@ public class FriendRelationGetAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class); List dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0); 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 4390df5c..b9895382 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 @@ -32,7 +32,7 @@ public class GetChatroomInfoAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class); String chatroomid = getChatroomInfo.getChatroomId(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomMembersAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomMembersAction.java index 385eef2e..31eb7a7f 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomMembersAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomMembersAction.java @@ -39,7 +39,7 @@ public class GetChatroomMembersAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class); String chatroomid = getChatroomInfo.getChatroomId(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java index de97781c..f3aa1f25 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java @@ -35,7 +35,7 @@ public class GetGroupInfoAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class); if (inputGetGroup != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupMembersAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupMembersAction.java index 12b2ae8f..6cfb906c 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupMembersAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupMembersAction.java @@ -39,7 +39,7 @@ public class GetGroupMembersAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class); if (inputGetGroup != null 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 bf29649f..fb9ca92a 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 @@ -35,7 +35,7 @@ public class GetIMTokenAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetToken input = getRequestBody(request.getNettyRequest(), InputGetToken.class); String userId = input.getUserId(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetSystemSettingAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetSystemSettingAction.java index 735cc010..d5006b09 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetSystemSettingAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetSystemSettingAction.java @@ -34,7 +34,7 @@ public class GetSystemSettingAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class); if (inputUserId != null) { 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 2e8748d1..4eed6d03 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 @@ -33,7 +33,7 @@ public class GetUserAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class); if (inputUserId != null 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 0b09ed34..0e401332 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 @@ -29,7 +29,7 @@ public class GetUserBlockListAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setStatus(HttpResponseStatus.OK); OutputUserBlockStatusList list = new OutputUserBlockStatusList(); 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 9cd76f17..c3fed263 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 @@ -32,7 +32,7 @@ public class GetUserBlockStatusAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class); if (inputUserId != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.java index dfae593e..ff211a55 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.java @@ -38,7 +38,7 @@ public class GetUserGroupsAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class); if (inputUserId != null 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 5390352f..3262179b 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 @@ -38,7 +38,7 @@ public class KickoffGroupMemberAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class); if (inputKickoffGroupMember.isValide()) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffUserClientAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffUserClientAction.java index 9d07eee1..3a2a4060 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffUserClientAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffUserClientAction.java @@ -31,7 +31,7 @@ public class KickoffUserClientAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { StringPairPojo pojo = getRequestBody(request.getNettyRequest(), StringPairPojo.class); if (pojo != null && !StringUtil.isNullOrEmpty(pojo.getFirst())) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java index 41179505..46958bcc 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java @@ -38,7 +38,7 @@ public class ModifyGroupInfoAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class); if (inputAddGroupMember.isValide()) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupMemberAliasAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupMemberAliasAction.java index bd1919fc..328604e9 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupMemberAliasAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupMemberAliasAction.java @@ -38,7 +38,7 @@ public class ModifyGroupMemberAliasAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class); if (inputSetGroupMemberAlias.isValide()) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/MulticastMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/MulticastMessageAction.java index 3a0187e0..4a9bdeb5 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/MulticastMessageAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/MulticastMessageAction.java @@ -39,7 +39,7 @@ public class MulticastMessageAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { MulticastMessageData sendMessageData = getRequestBody(request.getNettyRequest(), MulticastMessageData.class); if (MulticastMessageData.isValide(sendMessageData)) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/PutSystemSettingAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/PutSystemSettingAction.java index 7b4b66f0..5afd01ae 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/PutSystemSettingAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/PutSystemSettingAction.java @@ -34,7 +34,7 @@ public class PutSystemSettingAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class); if (inputUserId != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/QuitGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/QuitGroupMemberAction.java index fae66ad1..f287002f 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/QuitGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/QuitGroupMemberAction.java @@ -38,7 +38,7 @@ public class QuitGroupMemberAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class); if (inputQuitGroup.isValide()) { 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 7455860a..0260790c 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 @@ -39,7 +39,7 @@ public class RecallMessageAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { RecallMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMessageData.class); if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.getOperator())) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMultiCastMessageAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMultiCastMessageAction.java index 4763ec0c..ad4157b7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMultiCastMessageAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMultiCastMessageAction.java @@ -39,7 +39,7 @@ public class RecallMultiCastMessageAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { RecallMultiCastMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMultiCastMessageData.class); if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.operator)) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RelationGetAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RelationGetAction.java index 05a31132..f1033cf3 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RelationGetAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/RelationGetAction.java @@ -37,7 +37,7 @@ public class RelationGetAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { StringPairPojo input = getRequestBody(request.getNettyRequest(), StringPairPojo.class); FriendData data = messagesStore.getFriendData(input.getFirst(), input.getSecond()); 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 b5a9a0be..8600d237 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 @@ -40,7 +40,7 @@ public class SendMessageAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class); if (SendMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) { 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 8ce479fa..2bbc5151 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 @@ -30,7 +30,7 @@ public class SensitiveWordAddAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class); if (input != null && input.getWords() != null && !input.getWords().isEmpty()) { 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 41545339..70c81924 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 @@ -30,7 +30,7 @@ public class SensitiveWordDeleteAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class); if (input != null && input.getWords() != null && !input.getWords().isEmpty()) { 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 5416a979..ed090d94 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 @@ -29,7 +29,7 @@ public class SensitiveWordQueryAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { List words = messagesStore.getAllSensitiveWords(); InputOutputSensitiveWords out = new InputOutputSensitiveWords(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SetGroupManagerAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SetGroupManagerAction.java index fc3064ea..a66cc4ce 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SetGroupManagerAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/SetGroupManagerAction.java @@ -38,7 +38,7 @@ public class SetGroupManagerAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputSetGroupManager inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputSetGroupManager.class); if (inputAddGroupMember.isValide()) { 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 0f2534dc..97797d86 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 @@ -38,7 +38,7 @@ public class TransferGroupAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class); if (inputDismissGroup.isValide()) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/UpdateUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/UpdateUserAction.java index f214adb7..ddcc338c 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/UpdateUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/UpdateUserAction.java @@ -41,7 +41,7 @@ public class UpdateUserAction extends AdminAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputUpdateUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputUpdateUserInfo.class); if (inputCreateUser != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelAction.java index ed925478..5fa08fcc 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelAction.java @@ -29,7 +29,7 @@ import io.netty.util.internal.StringUtil; public class GetChannelAction extends ChannelAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setStatus(HttpResponseStatus.OK); RestResult result = RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java index ad56d208..d3650b77 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java @@ -31,7 +31,7 @@ import java.util.ArrayList; public class GetChannelSubscribersAction extends ChannelAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { OutputStringList outputStringList = new OutputStringList(); outputStringList.setList(new ArrayList<>()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java index 899f851b..2d8b6b69 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java @@ -31,7 +31,7 @@ import io.netty.util.internal.StringUtil; public class GetUserAction extends ChannelAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class); if (inputUserId != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java index eebcb57a..c3aacba4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java @@ -28,7 +28,7 @@ import win.liyufan.im.IMTopic; @HttpMethod("POST") public class ModifyChannelProfileAction extends ChannelAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputModifyChannelInfo input = getRequestBody(request.getNettyRequest(), InputModifyChannelInfo.class); if (input != null) { 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 86f230b5..077b46b8 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 @@ -39,7 +39,7 @@ public class SendMessageAction extends ChannelAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { SendChannelMessageData sendChannelMessageData = getRequestBody(request.getNettyRequest(), SendChannelMessageData.class); SendMessageData sendMessageData = new SendMessageData(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java index f16c212e..fa6f4a18 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java @@ -31,7 +31,7 @@ import win.liyufan.im.IMTopic; public class SubscriberChannelAction extends ChannelAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputChannelSubscribe input = getRequestBody(request.getNettyRequest(), InputChannelSubscribe.class); if (input != null && !StringUtil.isNullOrEmpty(input.getTarget())) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java index d8fc1d83..0b74ae49 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java @@ -34,7 +34,7 @@ public class AddGroupMemberAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class); inputAddGroupMember.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java index f302d671..1d0e967c 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java @@ -37,7 +37,7 @@ public class CreateGroupAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class); inputCreateGroup.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java index e00533fe..8efe5d5a 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java @@ -26,7 +26,7 @@ import io.netty.util.internal.StringUtil; public class DeleteCallbackAction extends RobotAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { if(!StringUtil.isNullOrEmpty(robot.getCallback())) { robot = robot.toBuilder().clearCallback().setState(0).build(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java index 7ff0516d..1a96d7af 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java @@ -34,7 +34,7 @@ public class DismissGroupAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class); inputDismissGroup.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java index 04117436..f4d2ff75 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java @@ -29,7 +29,7 @@ import io.netty.util.internal.StringUtil; public class GetCallbackAction extends RobotAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { RobotCallbackPojo out = new RobotCallbackPojo(); out.setUrl(robot.getCallback()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java index 2ee770aa..b551287e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java @@ -34,7 +34,7 @@ public class GetGroupInfoAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class); if (inputGetGroup != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java index 8f4fbbea..b5bf9c72 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java @@ -39,7 +39,7 @@ public class GetGroupMembersAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class); String robotId = robot.getUid(); 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 f3432a1a..81b27e7b 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 @@ -28,7 +28,7 @@ import cn.wildfirechat.common.ErrorCode; public class GetUserAction extends RobotAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class); if (inputUserId != null diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java index 747997ce..a0c08d37 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java @@ -34,7 +34,7 @@ public class KickoffGroupMemberAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class); inputKickoffGroupMember.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java index 1ca2b1ac..1fac8f4b 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java @@ -34,7 +34,7 @@ public class ModifyGroupInfoAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class); inputAddGroupMember.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java index 83f311fc..8011fc8e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java @@ -34,7 +34,7 @@ public class ModifyGroupMemberAliasAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class); inputSetGroupMemberAlias.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java index 30b5163b..4e8c2242 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java @@ -34,7 +34,7 @@ public class QuitGroupMemberAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class); inputQuitGroup.setOperator(robot.getUid()); 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 034befb1..e0dead38 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 @@ -35,7 +35,7 @@ public class SendMessageAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class); sendMessageData.setSender(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java index 74d5cb11..92ee0210 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java @@ -27,7 +27,7 @@ import io.netty.util.internal.StringUtil; public class SetCallbackAction extends RobotAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { RobotCallbackPojo input = getRequestBody(request.getNettyRequest(), RobotCallbackPojo.class); if(!StringUtil.isNullOrEmpty(input.getUrl())) { diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java index 30b5deb7..8f611d8e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java @@ -34,7 +34,7 @@ public class TransferGroupAction extends RobotAction { } @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class); inputDismissGroup.setOperator(robot.getUid()); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java index 31064c5a..407d0103 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java @@ -28,7 +28,7 @@ import static cn.wildfirechat.pojos.MyInfoType.*; public class UpdateProfileAction extends RobotAction { @Override - public boolean action(Request request, Response response) { + public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { IntStringPairPojo input = getRequestBody(request.getNettyRequest(), IntStringPairPojo.class); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java index 6a661478..d24482b4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java @@ -53,7 +53,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler