diff --git a/common/src/main/java/com/jeesite/common/io/PropertyLoader.java b/common/src/main/java/com/jeesite/common/io/PropertyLoader.java index a5b050e7..87295774 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertyLoader.java +++ b/common/src/main/java/com/jeesite/common/io/PropertyLoader.java @@ -40,9 +40,10 @@ public class PropertyLoader implements org.springframework.boot.env.PropertySour if (!isLoadJeeSitePropertySource) { isLoadJeeSitePropertySource = true; try { - ParserConfig.getGlobalInstance().setSafeMode(true); // 开启 FastJSON 安全模式 + // 默认开启 FastJSON 1.x 的,安全模式 + ParserConfig.getGlobalInstance().setSafeMode(true); } catch (Exception ignored) { - // 兼容 fastjson2 的调用,不返回异常 + // 兼容 FastJSON 2.x 的调用,忽略异常 } Properties properties = PropertiesUtils.getInstance().getProperties(); propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties)); diff --git a/parent/pom.xml b/parent/pom.xml index 3d1fe610..8a92e21e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,21 +25,25 @@ 2.13.0 1.10.0 1.5 - 2.57 + + 2.13.5 2.0.33 + 2.57 2.0 - - + 1.1.1 1.21 - + + 2.11.0 0.4.19 3.9.3 1.1.2 0.1.5 3.5.1 + 5.2.3 2.5.1 3.0.17 + 2.10.4 7.3 7.17.8 @@ -60,7 +64,7 @@ 1.8 - + 9.0.75 true @ ${java.version}