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-05-24 10:31:09 +08:00
parent 141c8f38d8
commit b0fe3fd57f
82 changed files with 264 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class AddGroupMemberAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
inputAddGroupMember.setOperator(robot.getUid());
if (inputAddGroupMember.isValide()) {
sendApiRequest(IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java
+5 -5
View File
@@ -37,7 +37,7 @@ public class CreateGroupAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
inputCreateGroup.setOperator(robot.getUid());
@@ -45,7 +45,7 @@ public class CreateGroupAction extends RobotAction {
if (inputCreateGroup.isValide()) {
PojoGroupInfo group_info = inputCreateGroup.getGroup().getGroup_info();
WFCMessage.CreateGroupRequest createGroupRequest = inputCreateGroup.toProtoGroupRequest();
sendApiRequest(IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), result -> {
sendApiRequest(response, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,14 +53,14 @@ public class CreateGroupAction extends RobotAction {
byte[] data = new byte[byteBuf.readableBytes()];
byteBuf.readBytes(data);
String groupId = new String(data);
sendResponse(null, new OutputCreateGroupResult(groupId));
sendResponse(response, null, new OutputCreateGroupResult(groupId));
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/DeleteCallbackAction.java
+2 -2
View File
@@ -26,13 +26,13 @@ import io.netty.util.internal.StringUtil;
public class DeleteCallbackAction extends RobotAction {
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
if(!StringUtil.isNullOrEmpty(robot.getCallback())) {
robot = robot.toBuilder().clearCallback().setState(0).build();
messagesStore.addRobot(robot);
}
setResponseContent(RestResult.ok());
setResponseContent(RestResult.ok(), response);
}
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class DismissGroupAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
inputDismissGroup.setOperator(robot.getUid());
if (inputDismissGroup.isValide()) {
sendApiRequest(IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetCallbackAction.java
+2 -2
View File
@@ -29,11 +29,11 @@ import io.netty.util.internal.StringUtil;
public class GetCallbackAction extends RobotAction {
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
RobotCallbackPojo out = new RobotCallbackPojo();
out.setUrl(robot.getCallback());
setResponseContent(RestResult.ok(out));
setResponseContent(RestResult.ok(out), response);
}
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java
+3 -3
View File
@@ -34,7 +34,7 @@ public class GetGroupInfoAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
if (inputGetGroup != null
@@ -58,9 +58,9 @@ public class GetGroupInfoAction extends RobotAction {
pojoGroupInfo.setSearchable(groupInfo.getSearchable());
result = RestResult.ok(pojoGroupInfo);
}
setResponseContent(result);
setResponseContent(result, response);
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupMembersAction.java
+3 -3
View File
@@ -39,7 +39,7 @@ public class GetGroupMembersAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
String robotId = robot.getUid();
@@ -75,9 +75,9 @@ public class GetGroupMembersAction extends RobotAction {
result = RestResult.ok(out);
}
setResponseContent(result);
setResponseContent(result, response);
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java
+3 -3
View File
@@ -28,7 +28,7 @@ import cn.wildfirechat.common.ErrorCode;
public class GetUserAction extends RobotAction {
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
if (inputUserId != null
@@ -49,9 +49,9 @@ public class GetUserAction extends RobotAction {
} else {
result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
}
setResponseContent(result);
setResponseContent(result, response);
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class KickoffGroupMemberAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
inputKickoffGroupMember.setOperator(robot.getUid());
if (inputKickoffGroupMember.isValide()) {
sendApiRequest(IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class ModifyGroupInfoAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
inputAddGroupMember.setOperator(robot.getUid());
if (inputAddGroupMember.isValide()) {
sendApiRequest(IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class ModifyGroupMemberAliasAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
inputSetGroupMemberAlias.setOperator(robot.getUid());
if (inputSetGroupMemberAlias.isValide()) {
sendApiRequest(IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class QuitGroupMemberAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
inputQuitGroup.setOperator(robot.getUid());
if (inputQuitGroup.isValide()) {
sendApiRequest(IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java
+4 -4
View File
@@ -95,7 +95,7 @@ abstract public class RobotAction extends Action {
return localSign.equals(sign) ? ErrorCode.ERROR_CODE_SUCCESS : ErrorCode.ERROR_CODE_AUTH_FAILURE;
}
protected void sendResponse(ErrorCode errorCode, Object data) {
protected void sendResponse(Response response, ErrorCode errorCode, Object data) {
response.setStatus(HttpResponseStatus.OK);
if (errorCode == null) {
errorCode = ErrorCode.ERROR_CODE_SUCCESS;
@@ -124,7 +124,7 @@ abstract public class RobotAction extends Action {
return null;
}
protected void sendApiRequest(String topic, byte[] message, Callback callback) {
protected void sendApiRequest(Response response, String topic, byte[] message, Callback callback) {
ServerAPIHelper.sendRequest(robot.getUid(), null, topic, message, new ServerAPIHelper.Callback() {
@Override
public void onSuccess(byte[] response) {
@@ -133,12 +133,12 @@ abstract public class RobotAction extends Action {
@Override
public void onError(ErrorCode errorCode) {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
@Override
public void onTimeout() {
sendResponse(ErrorCode.ERROR_CODE_TIMEOUT, null);
sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
}
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java
+5 -5
View File
@@ -35,26 +35,26 @@ public class SendMessageAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
sendMessageData.setSender(robot.getUid());
if (SendMessageData.isValide(sendMessageData)) {
sendApiRequest(IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
sendApiRequest(response, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
long messageId = byteBuf.readLong();
long timestamp = byteBuf.readLong();
sendResponse(null, new SendMessageResult(messageId, timestamp));
sendResponse(response, null, new SendMessageResult(messageId, timestamp));
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/SetCallbackAction.java
+3 -3
View File
@@ -27,7 +27,7 @@ import io.netty.util.internal.StringUtil;
public class SetCallbackAction extends RobotAction {
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
RobotCallbackPojo input = getRequestBody(request.getNettyRequest(), RobotCallbackPojo.class);
if(!StringUtil.isNullOrEmpty(input.getUrl())) {
@@ -35,9 +35,9 @@ public class SetCallbackAction extends RobotAction {
robot = robot.toBuilder().setCallback(input.getUrl()).setState(1).build();
messagesStore.addRobot(robot);
}
setResponseContent(RestResult.ok());
setResponseContent(RestResult.ok(), response);
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java
+5 -5
View File
@@ -34,24 +34,24 @@ public class TransferGroupAction extends RobotAction {
}
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
inputDismissGroup.setOperator(robot.getUid());
if (inputDismissGroup.isValide()) {
sendApiRequest(IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
sendApiRequest(response, IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(null, null);
sendResponse(response, null, null);
} else {
sendResponse(errorCode, null);
sendResponse(response, errorCode, null);
}
});
return false;
} else {
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java
+2 -2
View File
@@ -28,7 +28,7 @@ import static cn.wildfirechat.pojos.MyInfoType.*;
public class UpdateProfileAction extends RobotAction {
@Override
public boolean action(Request request) {
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
IntStringPairPojo input = getRequestBody(request.getNettyRequest(), IntStringPairPojo.class);
@@ -85,7 +85,7 @@ public class UpdateProfileAction extends RobotAction {
result.setErrorCode(ErrorCode.ERROR_CODE_SERVER_ERROR);
}
}
setResponseContent(result);
setResponseContent(result, response);
}
return true;
}