进一步优化 json 工具类,默认使用 Spring 初始化出来的

This commit is contained in:
YunaiV
2021-01-24 12:37:58 +08:00
parent eadc4f749a
commit fa3f382210
10 changed files with 59 additions and 38 deletions

View File

@ -0,0 +1,18 @@
package cn.iocoder.dashboard.framework.jackson.config;
import cn.iocoder.dashboard.util.json.JsonUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class JacksonConfig {
@Bean
@SuppressWarnings("InstantiationOfUtilityClass")
public JsonUtils jsonUtils(ObjectMapper objectMapper) {
JsonUtils.init(objectMapper);
return new JsonUtils();
}
}

View File

@ -11,7 +11,7 @@ import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogF
import cn.iocoder.dashboard.framework.security.core.util.SecurityUtils;
import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO;
import cn.iocoder.dashboard.util.json.JSONUtils;
import cn.iocoder.dashboard.util.json.JsonUtils;
import cn.iocoder.dashboard.util.servlet.ServletUtils;
import com.google.common.collect.Maps;
import io.swagger.annotations.Api;
@ -319,7 +319,7 @@ public class OperateLogAspect {
// 被忽略时,标记为 ignore 字符串,避免和 null 混在一起
args.put(argName, !isIgnoreArgs(argValue) ? argValue : "[ignore]");
}
return JSONUtils.toJSONString(args);
return JsonUtils.toJsonString(args);
}
private static String obtainResultData(Object result) {
@ -327,7 +327,7 @@ public class OperateLogAspect {
if (result instanceof CommonResult) {
result = ((CommonResult<?>) result).getData();
}
return JSONUtils.toJSONString(result);
return JsonUtils.toJsonString(result);
}
private static boolean isIgnoreArgs(Object object) {

View File

@ -1,12 +1,10 @@
package cn.iocoder.dashboard.framework.mybatis.core.type;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
import cn.iocoder.dashboard.util.json.JsonUtils;
import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.Set;
/**
@ -17,29 +15,18 @@ import java.util.Set;
*
* @author 芋道源码
*/
public class JacksonLongSetTypeHandler extends AbstractJsonTypeHandler<Object> {
// TODO 芋艿需要将 Spring 的设置下进来
private static final ObjectMapper objectMapper = new ObjectMapper();
public class JsonLongSetTypeHandler extends AbstractJsonTypeHandler<Object> {
private static final TypeReference<Set<Long>> typeReference = new TypeReference<Set<Long>>(){};
@Override
protected Object parse(String json) {
try {
return objectMapper.readValue(json, typeReference);
} catch (IOException e) {
throw new RuntimeException(e);
}
return JsonUtils.parseObject(json, typeReference);
}
@Override
protected String toJson(Object obj) {
try {
return objectMapper.writeValueAsString(obj);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
return JsonUtils.toJsonString(obj);
}
}

View File

@ -1,7 +1,7 @@
package cn.iocoder.dashboard.framework.redis.core.pubsub;
import cn.hutool.core.util.ArrayUtil;
import cn.iocoder.dashboard.util.json.JSONUtils;
import cn.iocoder.dashboard.util.json.JsonUtils;
import lombok.SneakyThrows;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.connection.MessageListener;
@ -44,7 +44,7 @@ public abstract class AbstractChannelMessageListener<T extends ChannelMessage> i
@Override
public final void onMessage(Message message, byte[] bytes) {
T messageObj = JSONUtils.parseObject(message.getBody(), messageType);
T messageObj = JsonUtils.parseObject(message.getBody(), messageType);
this.onMessage(messageObj);
}

View File

@ -1,7 +1,7 @@
package cn.iocoder.dashboard.framework.redis.core.util;
import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage;
import cn.iocoder.dashboard.util.json.JSONUtils;
import cn.iocoder.dashboard.util.json.JsonUtils;
import org.springframework.data.redis.core.RedisTemplate;
/**
@ -18,7 +18,7 @@ public class RedisMessageUtils {
* @param message 消息
*/
public static <T extends ChannelMessage> void sendChannelMessage(RedisTemplate<?, ?> redisTemplate, T message) {
redisTemplate.convertAndSend(message.getChannel(), JSONUtils.toJSONString(message));
redisTemplate.convertAndSend(message.getChannel(), JsonUtils.toJsonString(message));
}
}