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/channel/GetChannelAction.java
+1 -4
View File
@@ -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;
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java
+1 -4
View File
@@ -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;
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java
+2 -5
View File
@@ -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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java
+1 -3
View File
@@ -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));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java
+1 -3
View File
@@ -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;
broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java
+1 -3
View File
@@ -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));
}
}