yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

master
YunaiV 2026-06-26 17:30:07 -07:00
parent a5d78fb486 ac1ded1aaf
commit 3add6b7183
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java
View File

@ -6,12 +6,14 @@ import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.util.json.databind.TimestampLocalDateTimeDeserializer; import cn.iocoder.yudao.framework.common.util.json.databind.TimestampLocalDateTimeDeserializer;
import cn.iocoder.yudao.framework.common.util.json.databind.TimestampLocalDateTimeSerializer; import cn.iocoder.yudao.framework.common.util.json.databind.TimestampLocalDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import lombok.Getter; import lombok.Getter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@ -33,17 +35,19 @@ import java.util.Map;
public class JsonUtils { public class JsonUtils {
@Getter @Getter
private static ObjectMapper objectMapper = new ObjectMapper(); private static ObjectMapper objectMapper = buildObjectMapper();
static { private static ObjectMapper buildObjectMapper() {
objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); // 忽略 null 值
// 解决 LocalDateTime 的序列化
SimpleModule simpleModule = new JavaTimeModule() SimpleModule simpleModule = new JavaTimeModule()
// 解决 LocalDateTime 的序列化
.addSerializer(LocalDateTime.class, TimestampLocalDateTimeSerializer.INSTANCE) .addSerializer(LocalDateTime.class, TimestampLocalDateTimeSerializer.INSTANCE)
.addDeserializer(LocalDateTime.class, TimestampLocalDateTimeDeserializer.INSTANCE); .addDeserializer(LocalDateTime.class, TimestampLocalDateTimeDeserializer.INSTANCE);
objectMapper.registerModules(simpleModule); return JsonMapper.builder()
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
.defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
.addModule(simpleModule)
.build();
} }
/** /**
@ -78,7 +82,7 @@ public class JsonUtils {
} }
try { try {
return objectMapper.readValue(text, clazz); return objectMapper.readValue(text, clazz);
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -92,7 +96,7 @@ public class JsonUtils {
JsonNode treeNode = objectMapper.readTree(text); JsonNode treeNode = objectMapper.readTree(text);
JsonNode pathNode = treeNode.path(path); JsonNode pathNode = treeNode.path(path);
return objectMapper.readValue(pathNode.toString(), clazz); return objectMapper.readValue(pathNode.toString(), clazz);
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -104,7 +108,7 @@ public class JsonUtils {
} }
try { try {
return objectMapper.readValue(text, objectMapper.getTypeFactory().constructType(type)); return objectMapper.readValue(text, objectMapper.getTypeFactory().constructType(type));
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -153,7 +157,7 @@ public class JsonUtils {
public static <T> T parseObject(String text, TypeReference<T> typeReference) { public static <T> T parseObject(String text, TypeReference<T> typeReference) {
try { try {
return objectMapper.readValue(text, typeReference); return objectMapper.readValue(text, typeReference);
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -169,7 +173,7 @@ public class JsonUtils {
public static <T> T parseObjectQuietly(String text, TypeReference<T> typeReference) { public static <T> T parseObjectQuietly(String text, TypeReference<T> typeReference) {
try { try {
return objectMapper.readValue(text, typeReference); return objectMapper.readValue(text, typeReference);
} catch (IOException e) { } catch (JacksonException e) {
return null; return null;
} }
} }
@ -186,7 +190,7 @@ public class JsonUtils {
} }
try { try {
return objectMapper.readValue(text, new TypeReference<Map<String, Object>>() {}); return objectMapper.readValue(text, new TypeReference<Map<String, Object>>() {});
} catch (IOException e) { } catch (JacksonException e) {
return null; return null;
} }
} }
@ -204,7 +208,7 @@ public class JsonUtils {
} }
try { try {
return objectMapper.readValue(text, clazz); return objectMapper.readValue(text, clazz);
} catch (IOException e) { } catch (JacksonException e) {
return null; return null;
} }
} }
@ -215,7 +219,7 @@ public class JsonUtils {
} }
try { try {
return objectMapper.readValue(text, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz)); return objectMapper.readValue(text, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -229,7 +233,7 @@ public class JsonUtils {
JsonNode treeNode = objectMapper.readTree(text); JsonNode treeNode = objectMapper.readTree(text);
JsonNode pathNode = treeNode.path(path); JsonNode pathNode = treeNode.path(path);
return objectMapper.readValue(pathNode.toString(), objectMapper.getTypeFactory().constructCollectionType(List.class, clazz)); return objectMapper.readValue(pathNode.toString(), objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -238,7 +242,7 @@ public class JsonUtils {
public static JsonNode parseTree(String text) { public static JsonNode parseTree(String text) {
try { try {
return objectMapper.readTree(text); return objectMapper.readTree(text);
} catch (IOException e) { } catch (JacksonException e) {
log.error("json parse err,json:{}", text, e); log.error("json parse err,json:{}", text, e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }

2
yudao-module-system/yudao-module-system-server/src/main/resources/application-dev.yaml
View File

@ -152,7 +152,7 @@ wx:
config-storage: config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
key-prefix: wa # Redis Key 的前缀 key-prefix: wa # Redis Key 的前缀
http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信公众号平台 http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信小程序平台
--- #################### 芋道相关配置 #################### --- #################### 芋道相关配置 ####################

2
yudao-module-system/yudao-module-system-server/src/main/resources/application-local.yaml
View File

@ -173,7 +173,7 @@ wx:
config-storage: config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
key-prefix: wa # Redis Key 的前缀 key-prefix: wa # Redis Key 的前缀
http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信公众号平台 http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信小程序平台
--- #################### 芋道相关配置 #################### --- #################### 芋道相关配置 ####################

2
yudao-server/src/main/resources/application-dev.yaml
View File

@ -142,7 +142,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
config-storage: config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
key-prefix: wa # Redis Key 的前缀 key-prefix: wa # Redis Key 的前缀
http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信公众号平台 http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信小程序平台
--- #################### 芋道相关配置 #################### --- #################### 芋道相关配置 ####################

2
yudao-server/src/main/resources/application-local.yaml
View File

@ -198,7 +198,7 @@ wx:
config-storage: config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
key-prefix: wa # Redis Key 的前缀 key-prefix: wa # Redis Key 的前缀
http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信公众号平台 http-client-type: HttpComponents # 采用 HttpComponents（HttpClient 5）请求微信小程序平台
--- #################### 芋道相关配置 #################### --- #################### 芋道相关配置 ####################