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

gson单例化，另外关掉gson html转义功能

Browse Source
This commit is contained in:
heavyrian2012
2022-08-31 20:24:46 +08:00
parent 97540bdd1b
commit 04c89d1fc1
32 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/Action.java
+5 -4
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.RequireAuthentication;
import com.xiaoleilu.loServer.handler.Request;
@@ -39,7 +40,7 @@ import static io.moquette.BrokerConstants.*;
abstract public class Action {
public static IMessagesStore messagesStore = null;
public static ISessionsStore sessionsStore = null;
protected static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
public ChannelHandlerContext ctx;
protected static RateLimiter adminLimiter = null;
@@ -129,7 +130,7 @@ abstract public class Action {
}
RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), RestResult.resultOf(errorCode));
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
response.send();
}
@@ -145,7 +146,7 @@ abstract public class Action {
FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
String content = new String(bytes, StandardCharsets.UTF_8);//contribute by JiaRG from github
Gson gson = new Gson();
T t = gson.fromJson(content, cls);
return t;
}
@@ -154,6 +155,6 @@ abstract public class Action {
protected void setResponseContent(RestResult result, Response response) {
response.setStatus(HttpResponseStatus.OK);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class VersionAction extends Action {
try {
response.setContent(Utility.formatJson(new Gson().toJson(GitRepositoryState.getGitRepositoryState())));
response.setContent(Utility.formatJson(gson.toJson(GitRepositoryState.getGitRepositoryState())));
} catch (IOException e) {
e.printStackTrace();
response.setContent("{\"version\":\"unknown\"}");
broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
+1 -1
View File
@@ -99,7 +99,7 @@ abstract public class AdminAction extends Action {
}
RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), data);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
response.send();
}
}
broker/src/main/java/com/xiaoleilu/loServer/action/admin/ApplicationGetUserInfoAction.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ApplicationGetUserInfoAction extends AdminAction {
}
response.setStatus(HttpResponseStatus.OK);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class BlockUserAction extends AdminAction {
response.setStatus(HttpResponseStatus.OK);
RestResult result;
result = RestResult.resultOf(errorCode);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
if (inputUserBlock.getStatus() == 2) {
sendApiMessage(null, null, ServerAPIHelper.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), null);
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class CheckUserOnlineAction extends AdminAction {
InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
sendApiMessage(response, inputUserId.getUserId(), ServerAPIHelper.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), res -> {
OutputCheckUserOnline out = new Gson().fromJson(new String(res), OutputCheckUserOnline.class);
OutputCheckUserOnline out = gson.fromJson(new String(res), OutputCheckUserOnline.class);
return new Result(ErrorCode.ERROR_CODE_SUCCESS, out);
});
return false;
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class CreateChatroomAction extends AdminAction {
FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
String content = new String(bytes);
Gson gson = new Gson();
InputCreateChatroom inputCreateChatroom = gson.fromJson(content, InputCreateChatroom.class);
if (inputCreateChatroom != null
&& !StringUtil.isNullOrEmpty(inputCreateChatroom.getTitle())) {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class CreateRobotAction extends AdminAction {
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));
response.setContent(gson.toJson(result));
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class DestoryChatroomAction extends AdminAction {
FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
String content = new String(bytes);
Gson gson = new Gson();
InputDestoryChatroom inputDestoryChatroom = gson.fromJson(content, InputDestoryChatroom.class);
if (inputDestoryChatroom != null
&& !StringUtil.isNullOrEmpty(inputDestoryChatroom.getChatroomId())) {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupMemberExtraAction.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ModifyGroupMemberExtraAction extends AdminAction {
} else {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/channel/ApplicationGetUserInfoAction.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ApplicationGetUserInfoAction extends ChannelAction {
}
response.setStatus(HttpResponseStatus.OK);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java
+2 -2
View File
@@ -101,7 +101,7 @@ abstract public class ChannelAction extends Action {
}
RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), data);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
response.send();
}
@@ -110,7 +110,7 @@ abstract public class ChannelAction extends Action {
FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
String content = new String(bytes, StandardCharsets.UTF_8);
Gson gson = new Gson();
T t = gson.fromJson(content, cls);
return t;
}
broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class SubscriberChannelAction extends ChannelAction {
if(input.getSubscribe() > 0 && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Active_Subscribe) == 0) {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
return true;
}
WFCMessage.ListenChannel listenChannel = WFCMessage.ListenChannel.newBuilder().setChannelId(channelInfo.getTargetId()).setListen(input.getSubscribe()).build();
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ApplicationGetUserInfoAction.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ApplicationGetUserInfoAction extends RobotAction {
}
response.setStatus(HttpResponseStatus.OK);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
return true;
}
broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberExtraAction.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ModifyGroupMemberExtraAction extends RobotAction {
} else {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
}
}
return true;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java
+2 -2
View File
@@ -102,7 +102,7 @@ abstract public class RobotAction extends Action {
}
RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), data);
response.setContent(new Gson().toJson(result));
response.setContent(gson.toJson(result));
response.send();
}
@@ -113,7 +113,7 @@ abstract public class RobotAction extends Action {
String content = null;
try {
content = new String(bytes, "UTF-8");
Gson gson = new Gson();
T t = gson.fromJson(content, cls);
return t;
} catch (UnsupportedEncodingException e) {