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
sdk/src/main/java/cn/wildfirechat/sdk/Main.java
+2 -1
View File
@@ -9,6 +9,7 @@ import cn.wildfirechat.sdk.model.IMResult;
import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.netty.util.internal.StringUtil;
@@ -1510,7 +1511,7 @@ public class Main {
menu21.url = "http://www.sohu.com";
menu2.subMenus.add(menu21);
String menuStr = new Gson().toJson(menus);
String menuStr = new GsonBuilder().disableHtmlEscaping().create().toJson(menus);
voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Menu, menuStr);
if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("modify channel menu success");
sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java
+3 -1
View File
@@ -2,6 +2,7 @@ package cn.wildfirechat.sdk.utilities;
import cn.wildfirechat.sdk.model.IMResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import ikidou.reflect.TypeBuilder;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpResponse;
@@ -29,6 +30,7 @@ import java.util.concurrent.TimeUnit;
public class AdminHttpUtils extends JsonUtils {
private static final Logger LOG = LoggerFactory.getLogger(AdminHttpUtils.class);
public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
private static String adminUrl;
private static String adminSecret;
@@ -124,7 +126,7 @@ public class AdminHttpUtils extends JsonUtils {
String jsonStr = "";
if (object != null) {
jsonStr = new Gson().toJson(object);
jsonStr = gson.toJson(object);
}
LOG.info("http request content: {}", jsonStr);
sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java
+3 -1
View File
@@ -2,6 +2,7 @@ package cn.wildfirechat.sdk.utilities;
import cn.wildfirechat.sdk.model.IMResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import ikidou.reflect.TypeBuilder;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpResponse;
@@ -26,6 +27,7 @@ import java.util.concurrent.TimeUnit;
public class ChannelHttpUtils extends JsonUtils {
private static final Logger LOG = LoggerFactory.getLogger(ChannelHttpUtils.class);
public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
private String imurl;
private String channelId;
@@ -74,7 +76,7 @@ public class ChannelHttpUtils extends JsonUtils {
String jsonStr = "";
if (object != null) {
jsonStr = new Gson().toJson(object);
jsonStr = gson.toJson(object);
}
LOG.info("http request content: {}", jsonStr);
sdk/src/main/java/cn/wildfirechat/sdk/utilities/JsonUtils.java
+3 -2
View File
@@ -2,16 +2,17 @@ package cn.wildfirechat.sdk.utilities;
import cn.wildfirechat.sdk.model.IMResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import ikidou.reflect.TypeBuilder;
public class JsonUtils {
public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
public static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
TypeBuilder builder = TypeBuilder.newInstance(IMResult.class);
if (!clazz.equals(Void.class)) {
builder.addTypeParam(clazz);
}
return new Gson().fromJson(content, builder.build());
return gson.fromJson(content, builder.build());
}
public static boolean isNullOrEmpty(String str) {
sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java
+3 -1
View File
@@ -2,6 +2,7 @@ package cn.wildfirechat.sdk.utilities;
import cn.wildfirechat.sdk.model.IMResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import ikidou.reflect.TypeBuilder;
import io.netty.util.internal.StringUtil;
import org.apache.commons.codec.digest.DigestUtils;
@@ -27,6 +28,7 @@ import java.util.concurrent.TimeUnit;
public class RobotHttpUtils extends JsonUtils {
private static final Logger LOG = LoggerFactory.getLogger(RobotHttpUtils.class);
public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
private final String url;
private final String robotId;
@@ -75,7 +77,7 @@ public class RobotHttpUtils extends JsonUtils {
String jsonStr = null;
if (object != null) {
jsonStr = new Gson().toJson(object);
jsonStr = gson.toJson(object);
}
LOG.info("http request content: {}", jsonStr);