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 06bb7335..ee37e42a 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/Action.java @@ -40,6 +40,32 @@ abstract public class Action { public ChannelHandlerContext ctx; public Response response; + protected class Result { + Object data; + ErrorCode errorCode; + + public Result(ErrorCode errorCode) { + this.errorCode = errorCode; + } + + public Result(ErrorCode errorCode, Object data) { + this.data = data; + this.errorCode = errorCode; + } + + public Object getData() { + return data; + } + + public ErrorCode getErrorCode() { + return errorCode; + } + } + + protected interface ApiCallback { + Result onResult(byte[] response); + } + public ErrorCode preAction(Request request, Response response) { if (getClass().getAnnotation(RequireAuthentication.class) != null) { //do authentication @@ -94,4 +120,9 @@ abstract public class Action { } return null; } + + protected void setResponseContent(RestResult result) { + response.setStatus(HttpResponseStatus.OK); + response.setContent(new Gson().toJson(result)); + } } 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 4c500355..7b1fc2c9 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 @@ -45,11 +45,7 @@ public class AddFriendRequestAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } 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 4cd70e5f..c4116d38 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 @@ -41,17 +41,11 @@ public class AddGroupMemberAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 c64421d2..1c06b362 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 @@ -33,10 +33,6 @@ abstract public class AdminAction extends Action { SECRET_KEY = secretKey; } - protected interface Callback { - void onSuccess(byte[] response); - } - public static void setNoCheckTime(String noCheckTime) { try { NO_CHECK_TIME = Boolean.parseBoolean(noCheckTime); @@ -97,12 +93,13 @@ abstract public class AdminAction extends Action { response.send(); } - protected void sendApiMessage(String fromUser, String topic, byte[] message, Callback callback) { + protected void sendApiMessage(String fromUser, String topic, byte[] message, ApiCallback callback) { ServerAPIHelper.sendRequest(fromUser, null, topic, message, new ServerAPIHelper.Callback() { @Override public void onSuccess(byte[] result) { if(callback != null) { - callback.onSuccess(result); + Result r = callback.onResult(result); + sendResponse(response, r.getErrorCode(), r.getData()); } } 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 e544cbdd..5b2911d1 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 @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; import cn.wildfirechat.common.APIPath; +import cn.wildfirechat.common.ErrorCode; import cn.wildfirechat.pojos.InputGetAlias; import cn.wildfirechat.pojos.InputGetFriendList; import cn.wildfirechat.pojos.OutputGetAlias; @@ -49,9 +50,8 @@ public class AliasGetAction extends AdminAction { break; } } - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(out); - response.setContent(new Gson().toJson(result)); + + setResponseContent(RestResult.ok(out)); } return true; } 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 ac515399..eae113e3 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 @@ -40,9 +40,7 @@ public class AliasPutAction extends AdminAction { 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]); - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(errorCode); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(errorCode)); } return true; } 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 18fee70d..a23ed8e7 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 @@ -46,17 +46,11 @@ public class BlacklistAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 f8bdc547..679e7338 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 @@ -45,9 +45,7 @@ public class BlacklistGetAction extends AdminAction { list.add(data.getFriendUid()); } } - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputStringList(list)); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(new OutputStringList(list))); } return true; } 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 0430b9a9..13b2b6dd 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 @@ -49,9 +49,7 @@ public class BlockUserAction extends AdminAction { sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 dfb16526..e1ff6bc1 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 @@ -46,16 +46,14 @@ public class BroadcastMessageAction extends AdminAction { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { long messageId = byteBuf.readLong(); long count = byteBuf.readLong(); - sendResponse(response, null, new BroadMessageResult(messageId, count)); + return new Result(errorCode, new BroadMessageResult(messageId, count)); } else { - sendResponse(response, errorCode, null); + return new Result(errorCode); } }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 4ac5ea5f..5b63a195 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 @@ -36,7 +36,7 @@ public class CheckUserOnlineAction extends AdminAction { if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) { sendApiMessage(inputUserId.getUserId(), ServerAPIHelper.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), res -> { OutputCheckUserOnline out = new Gson().fromJson(new String(res), OutputCheckUserOnline.class); - sendResponse(response, null, out); + return new Result(ErrorCode.ERROR_CODE_SUCCESS, out); }); return false; } else { 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 b416dbe5..2d017a83 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 @@ -53,16 +53,14 @@ public class CreateChannelAction extends AdminAction { byte[] data = new byte[byteBuf.readableBytes()]; byteBuf.readBytes(data); String channelId = new String(data); - sendResponse(response, null, new OutputCreateChannel(channelId)); + return new Result(ErrorCode.ERROR_CODE_SUCCESS, new OutputCreateChannel(channelId)); } else { - sendResponse(response, errorCode, null); + return new Result(errorCode); } }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 78fb6e58..bc88688a 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 @@ -53,17 +53,10 @@ public class CreateChatroomAction extends AdminAction { } WFCMessage.ChatroomInfo info = inputCreateChatroom.toChatroomInfo(); - messagesStore.createChatroom(inputCreateChatroom.getChatroomId(), info); - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())); - response.setContent(new Gson().toJson(result)); - + setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId()))); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 322623c5..5de641b2 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 @@ -46,16 +46,14 @@ public class CreateGroupAction extends AdminAction { byte[] data = new byte[byteBuf.readableBytes()]; byteBuf.readBytes(data); String groupId = new String(data); - sendResponse(response, null, new OutputCreateGroupResult(groupId)); + return new Result(ErrorCode.ERROR_CODE_SUCCESS, new OutputCreateGroupResult(groupId)); } else { - sendResponse(response, errorCode, null); + return new Result(errorCode); } }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 4e92000d..b8442b76 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 @@ -78,16 +78,10 @@ public class CreateRobotAction extends AdminAction { if (StringUtil.isNullOrEmpty(inputCreateRobot.getSecret())) { inputCreateRobot.setSecret(UUIDGenerator.getUUID()); } - messagesStore.addRobot(inputCreateRobot.toRobot()); - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret())); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret()))); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 c9a68be2..869b0551 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 @@ -89,19 +89,13 @@ public class CreateUserAction extends AdminAction { } catch (Exception e) { e.printStackTrace(); Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception); - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage())); return true; } - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName())); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName()))); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 d93ecec3..8c40c7bd 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 @@ -41,17 +41,10 @@ public class DestoryChatroomAction extends AdminAction { InputDestoryChatroom inputDestoryChatroom = gson.fromJson(content, InputDestoryChatroom.class); if (inputDestoryChatroom != null && !StringUtil.isNullOrEmpty(inputDestoryChatroom.getChatroomId())) { - messagesStore.destoryChatroom(inputDestoryChatroom.getChatroomId()); - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(); - response.setContent(new Gson().toJson(result)); - + setResponseContent(RestResult.ok()); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 342df959..d473d867 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 @@ -43,24 +43,11 @@ public class DestroyUserAction extends AdminAction { WFCMessage.IDBuf idBuf = WFCMessage.IDBuf.newBuilder().setId(inputDestroyUser.getUserId()).build(); sendApiMessage(inputDestroyUser.getUserId(), IMTopic.DestroyUserTopic, idBuf.toByteArray(), result -> { ErrorCode errorCode1 = ErrorCode.fromCode(result[0]); - if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) { - //ba errorcode qudiao - byte[] data = new byte[result.length -1]; - for (int i = 0; i < data.length; i++) { - data[i] = result[i+1]; - } - String token = Base64.getEncoder().encodeToString(data); - - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode1, null); - } + return new Result(errorCode1); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 074e9e29..c59b39fc 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 @@ -41,17 +41,11 @@ public class DismissGroupAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 d73bd20f..231398d4 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 @@ -49,17 +49,11 @@ public class FriendRelationAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 b91349b9..17ca505d 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 @@ -47,9 +47,7 @@ public class FriendRelationGetAction extends AdminAction { list.add(data.getFriendUid()); } } - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputStringList(list)); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(new OutputStringList(list))); } return true; } 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 b9895382..c48e1b73 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 @@ -46,14 +46,9 @@ public class GetChatroomInfoAction extends AdminAction { } else { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } - response.setStatus(HttpResponseStatus.OK); - - response.setContent(new Gson().toJson(result)); - + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 31eb7a7f..ea5385b6 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 @@ -58,14 +58,9 @@ public class GetChatroomMembersAction extends AdminAction { } else { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } - response.setStatus(HttpResponseStatus.OK); - - response.setContent(new Gson().toJson(result)); - + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 f3aa1f25..ea1d85d0 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 @@ -42,8 +42,6 @@ public class GetGroupInfoAction extends AdminAction { && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) { WFCMessage.GroupInfo groupInfo = messagesStore.getGroupInfo(inputGetGroup.getGroupId()); - - response.setStatus(HttpResponseStatus.OK); RestResult result; if (groupInfo == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); @@ -57,12 +55,9 @@ public class GetGroupInfoAction extends AdminAction { pojoGroupInfo.setType(groupInfo.getType()); result = RestResult.ok(pojoGroupInfo); } - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 6cfb906c..c4dac3b5 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 @@ -48,8 +48,6 @@ public class GetGroupMembersAction extends AdminAction { List members = new ArrayList<>(); ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members); - - response.setStatus(HttpResponseStatus.OK); RestResult result; if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) { result = RestResult.resultOf(errorCode); @@ -69,11 +67,9 @@ public class GetGroupMembersAction extends AdminAction { result = RestResult.ok(out); } - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 e725eba6..778574a3 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 @@ -48,9 +48,9 @@ public class GetIMTokenAction extends AdminAction { } String token = Base64.getEncoder().encodeToString(data); - sendResponse(response, null, new OutputGetIMTokenData(userId, token)); + return new Result(errorCode1, new OutputGetIMTokenData(userId, token)); } else { - sendResponse(response, errorCode1, null); + return new Result(errorCode1); } }); return false; 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 d5006b09..b070ccd3 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 @@ -40,7 +40,6 @@ public class GetSystemSettingAction extends AdminAction { if (inputUserId != null) { SystemSettingPojo output = messagesStore.getSystemSetting(inputUserId.id); - response.setStatus(HttpResponseStatus.OK); RestResult result; if (output == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); @@ -48,11 +47,9 @@ public class GetSystemSettingAction extends AdminAction { result = RestResult.ok(output); } - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 4eed6d03..ff0af32e 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 @@ -48,7 +48,6 @@ public class GetUserAction extends AdminAction { user = messagesStore.getUserInfoByMobile(inputUserId.getMobile()); } - response.setStatus(HttpResponseStatus.OK); RestResult result; if (user == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); @@ -56,11 +55,9 @@ public class GetUserAction extends AdminAction { result = RestResult.ok(InputOutputUserInfo.fromPbUser(user)); } - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 0e401332..9e58284f 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 @@ -31,11 +31,10 @@ public class GetUserBlockListAction extends AdminAction { @Override public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { - response.setStatus(HttpResponseStatus.OK); OutputUserBlockStatusList list = new OutputUserBlockStatusList(); list.setStatusList(messagesStore.getUserStatusList()); RestResult result = RestResult.ok(list); - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } return true; } 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 c3fed263..33471df9 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 @@ -39,13 +39,9 @@ public class GetUserBlockStatusAction extends AdminAction { && !StringUtil.isNullOrEmpty(inputUserId.getUserId())) { int status = messagesStore.getUserStatus(inputUserId.getUserId()); - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(new OutputUserStatus(status)); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(new OutputUserStatus(status))); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 ff211a55..17852264 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 @@ -45,16 +45,12 @@ public class GetUserGroupsAction extends AdminAction { && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()))) { Set groupIds = messagesStore.getUserGroupIds(inputUserId.getUserId()); - response.setStatus(HttpResponseStatus.OK); OutputGroupIds outputGroupIds = new OutputGroupIds(); outputGroupIds.setGroupIds(new ArrayList<>(groupIds)); RestResult result = RestResult.ok(outputGroupIds); - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 47d92c05..472bc450 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 @@ -41,17 +41,11 @@ public class KickoffGroupMemberAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 3a2a4060..390af1e1 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 @@ -38,9 +38,7 @@ public class KickoffUserClientAction extends AdminAction { sessionsStore.kickoffUserClient(pojo.getFirst(), pojo.getSecond()); sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 118085c7..14d02443 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 @@ -41,17 +41,11 @@ public class ModifyGroupInfoAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 844e13bd..da45b32c 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 @@ -41,17 +41,11 @@ public class ModifyGroupMemberAliasAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 504733c3..15f1e31a 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 @@ -45,16 +45,14 @@ public class MulticastMessageAction extends AdminAction { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { long messageId = byteBuf.readLong(); long timestamp = byteBuf.readLong(); - sendResponse(response, null, new MultiMessageResult(messageId, timestamp)); + return new Result(errorCode, new MultiMessageResult(messageId, timestamp)); } else { - sendResponse(response, errorCode, null); + return new Result(errorCode); } }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 5afd01ae..c5957bd4 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 @@ -40,22 +40,16 @@ public class PutSystemSettingAction extends AdminAction { if (inputUserId != null && (!StringUtil.isNullOrEmpty(inputUserId.value) || !StringUtil.isNullOrEmpty(inputUserId.desc))) { - boolean success = messagesStore.updateSystemSetting(inputUserId.id, inputUserId.value, inputUserId.desc); - - response.setStatus(HttpResponseStatus.OK); RestResult result; if (!success) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR); } else { result = RestResult.ok(); } - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 6c886513..7e983aa9 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 @@ -41,17 +41,11 @@ public class QuitGroupMemberAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 8d7f099d..71d418bd 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 @@ -44,13 +44,11 @@ public class RecallMessageAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - sendResponse(response, errorCode, null); + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 bcd98da6..9ab7cbd2 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 @@ -44,13 +44,11 @@ public class RecallMultiCastMessageAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - sendResponse(response, errorCode, null); + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 f1033cf3..dbcaf81e 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 @@ -51,10 +51,7 @@ public class RelationGetAction extends AdminAction { out.alias = data.getAlias(); out.extra = data.getExtra(); } - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(out); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(out)); } return true; } 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 acf0eae9..ce014271 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 @@ -46,16 +46,14 @@ public class SendMessageAction extends AdminAction { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { long messageId = byteBuf.readLong(); long timestamp = byteBuf.readLong(); - sendResponse(response, null, new SendMessageResult(messageId, timestamp)); + return new Result(errorCode, new SendMessageResult(messageId, timestamp)); } else { - sendResponse(response, errorCode, null); + return new Result(errorCode); } }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 2bbc5151..e95a830b 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 @@ -38,9 +38,7 @@ public class SensitiveWordAddAction extends AdminAction { response.setStatus(HttpResponseStatus.OK); sendResponse(response, errorCode, null); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 70c81924..00a8f46e 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 @@ -39,9 +39,7 @@ public class SensitiveWordDeleteAction extends AdminAction { sendResponse(response, errorCode, null); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 ad6df629..7c40211b 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 @@ -41,17 +41,11 @@ public class SetGroupManagerAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 ca125f3f..2de27815 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 @@ -41,17 +41,11 @@ public class TransferGroupAction extends AdminAction { ByteBuf byteBuf = Unpooled.buffer(); byteBuf.writeBytes(result); ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); - if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { - sendResponse(response, null, null); - } else { - sendResponse(response, errorCode, null); - } + return new Result(errorCode); }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 ddcc338c..b4153987 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 @@ -50,13 +50,9 @@ public class UpdateUserAction extends AdminAction { && inputCreateUser.flag > 0) { ErrorCode errorCode = messagesStore.updateUserInfo(inputCreateUser.userInfo, inputCreateUser.flag); - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(errorCode); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(errorCode)); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 5fa08fcc..290e4120 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 @@ -31,10 +31,7 @@ public class GetChannelAction extends ChannelAction { @Override public boolean action(Request request) { if (request.getNettyRequest() instanceof FullHttpRequest) { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo)); - - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo))); } return true; } 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 d3650b77..bb382bb5 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 @@ -36,10 +36,7 @@ public class GetChannelSubscribersAction extends ChannelAction { OutputStringList outputStringList = new OutputStringList(); outputStringList.setList(new ArrayList<>()); outputStringList.getList().addAll(messagesStore.getChannelSubscriber(channelInfo.getTargetId())); - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(outputStringList); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(outputStringList)); } return true; } 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 2d8b6b69..de0c1e24 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 @@ -46,7 +46,6 @@ public class GetUserAction extends ChannelAction { user = messagesStore.getUserInfoByMobile(inputUserId.getMobile()); } - response.setStatus(HttpResponseStatus.OK); RestResult result; if (user == null || StringUtil.isNullOrEmpty(user.getName())) { @@ -70,11 +69,9 @@ public class GetUserAction extends ChannelAction { } } - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 c3aacba4..4cdc3c5a 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 @@ -45,9 +45,7 @@ public class ModifyChannelProfileAction extends ChannelAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 077b46b8..bd117761 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 @@ -65,9 +65,7 @@ public class SendMessageAction extends ChannelAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 fa6f4a18..fa7a5fbd 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 @@ -54,9 +54,7 @@ public class SubscriberChannelAction extends ChannelAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 0b74ae49..5e713571 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 @@ -51,9 +51,7 @@ public class AddGroupMemberAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 1d0e967c..2039c5db 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 @@ -60,9 +60,7 @@ public class CreateGroupAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 8efe5d5a..f62143a8 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 @@ -32,9 +32,7 @@ public class DeleteCallbackAction extends RobotAction { robot = robot.toBuilder().clearCallback().setState(0).build(); messagesStore.addRobot(robot); } - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok()); } return true; } 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 1a96d7af..791f05f6 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 @@ -51,9 +51,7 @@ public class DismissGroupAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 f4d2ff75..29d1ad33 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 @@ -33,9 +33,7 @@ public class GetCallbackAction extends RobotAction { if (request.getNettyRequest() instanceof FullHttpRequest) { RobotCallbackPojo out = new RobotCallbackPojo(); out.setUrl(robot.getCallback()); - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(out); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok(out)); } return true; } 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 b551287e..887d9ead 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 @@ -41,8 +41,6 @@ public class GetGroupInfoAction extends RobotAction { && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) { WFCMessage.GroupInfo groupInfo = messagesStore.getGroupInfo(inputGetGroup.getGroupId()); - - response.setStatus(HttpResponseStatus.OK); RestResult result; if (groupInfo == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); @@ -56,12 +54,9 @@ public class GetGroupInfoAction extends RobotAction { pojoGroupInfo.setType(groupInfo.getType()); result = RestResult.ok(pojoGroupInfo); } - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 b5bf9c72..afea25b5 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 @@ -48,9 +48,6 @@ public class GetGroupMembersAction extends RobotAction { List members = new ArrayList<>(); ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members); - - - response.setStatus(HttpResponseStatus.OK); RestResult result; if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) { result = RestResult.resultOf(errorCode); @@ -77,11 +74,9 @@ public class GetGroupMembersAction extends RobotAction { result = RestResult.ok(out); } - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 81b27e7b..3451eebd 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 @@ -43,19 +43,15 @@ public class GetUserAction extends RobotAction { user = messagesStore.getUserInfoByMobile(inputUserId.getMobile()); } - response.setStatus(HttpResponseStatus.OK); RestResult result; if (user == null) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { result = RestResult.ok(InputOutputUserInfo.fromPbUser(user)); } - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 a0c08d37..2bda3181 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 @@ -51,9 +51,7 @@ public class KickoffGroupMemberAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 1fac8f4b..ebeac36e 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 @@ -51,9 +51,7 @@ public class ModifyGroupInfoAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 8011fc8e..f31d6425 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 @@ -51,9 +51,7 @@ public class ModifyGroupMemberAliasAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 4e8c2242..569fc049 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 @@ -51,9 +51,7 @@ public class QuitGroupMemberAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 e0dead38..effbb10e 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 @@ -54,9 +54,7 @@ public class SendMessageAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 92ee0210..1c0ccf34 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 @@ -35,14 +35,9 @@ public class SetCallbackAction extends RobotAction { robot = robot.toBuilder().setCallback(input.getUrl()).setState(1).build(); messagesStore.addRobot(robot); } - - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.ok(); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.ok()); } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } 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 8f611d8e..19cbeb8c 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 @@ -51,9 +51,7 @@ public class TransferGroupAction extends RobotAction { }); return false; } else { - response.setStatus(HttpResponseStatus.OK); - RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); - response.setContent(new Gson().toJson(result)); + setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER)); } } return true; 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 407d0103..74bd0e45 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 @@ -76,7 +76,6 @@ public class UpdateProfileAction extends RobotAction { break; } - response.setStatus(HttpResponseStatus.OK); RestResult result = RestResult.ok(); if(modified) { try { @@ -86,8 +85,7 @@ public class UpdateProfileAction extends RobotAction { result.setErrorCode(ErrorCode.ERROR_CODE_SERVER_ERROR); } } - - response.setContent(new Gson().toJson(result)); + setResponseContent(result); } return true; }