manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastjson2

Browse Source
This commit is contained in:
thinkgem
2023-07-06 17:41:43 +08:00
parent 09ff1c68b0
commit 414bad08d5
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/com/jeesite/common/io/PropertyLoader.java
View File

@@ -4,11 +4,8 @@
*/ */
package com.jeesite.common.io; package com.jeesite.common.io;
import java.io.IOException; import com.alibaba.fastjson.parser.ParserConfig;
import java.util.ArrayList; import com.jeesite.common.lang.StringUtils;
import java.util.List;
import java.util.Properties;
import org.springframework.boot.env.OriginTrackedMapPropertySource; import org.springframework.boot.env.OriginTrackedMapPropertySource;
import org.springframework.boot.env.PropertiesPropertySourceLoader; import org.springframework.boot.env.PropertiesPropertySourceLoader;
import org.springframework.boot.env.YamlPropertySourceLoader; import org.springframework.boot.env.YamlPropertySourceLoader;
@@ -16,8 +13,10 @@ import org.springframework.core.Ordered;
import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import com.alibaba.fastjson.parser.ParserConfig; import java.io.IOException;
import com.jeesite.common.lang.StringUtils; import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
/** /**
* 配置文件加载（Boot） * 配置文件加载（Boot）
@@ -40,7 +39,11 @@ public class PropertyLoader implements org.springframework.boot.env.PropertySour
List<PropertySource<?>> propertySources = new ArrayList<>(); List<PropertySource<?>> propertySources = new ArrayList<>();
if (!isLoadJeeSitePropertySource) { if (!isLoadJeeSitePropertySource) {
isLoadJeeSitePropertySource = true; isLoadJeeSitePropertySource = true;
ParserConfig.getGlobalInstance().setSafeMode(true); // 开启 FastJSON 安全模式 try {
ParserConfig.getGlobalInstance().setSafeMode(true); // 开启 FastJSON 安全模式
} catch (Exception ignored) {
// 兼容 fastjson2 的调用，不返回异常
}
Properties properties = PropertiesUtils.getInstance().getProperties(); Properties properties = PropertiesUtils.getInstance().getProperties();
propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties)); propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties));
} else { } else {