anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构

Browse Source
This commit is contained in:
imhao183
2021-04-23 09:50:19 +08:00
parent d89893821f
commit d491ac0ad7
69 changed files with 147 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java
+1 -3
View File
@@ -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;
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java
+1 -3
View File
@@ -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;
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java
+2 -7
View File
@@ -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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java
+2 -7
View File
@@ -48,9 +48,6 @@ public class GetGroupMembersAction extends RobotAction {
List<WFCMessage.GroupMember> 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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java
+2 -6
View File
@@ -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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java
+2 -7
View File
@@ -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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java
+1 -3
View File
@@ -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;
}