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

update

Browse Source
This commit is contained in:
thinkgem
2023-07-11 10:16:12 +08:00
parent 050aa6e4bf
commit e3e222d7bb
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,9 +40,10 @@ public class PropertyLoader implements org.springframework.boot.env.PropertySour
if (!isLoadJeeSitePropertySource) { if (!isLoadJeeSitePropertySource) {
isLoadJeeSitePropertySource = true; isLoadJeeSitePropertySource = true;
try { try {
ParserConfig.getGlobalInstance().setSafeMode(true); // 开启 FastJSON 安全模式 // 默认开启 FastJSON 1.x 的，安全模式
ParserConfig.getGlobalInstance().setSafeMode(true);
} catch (Exception ignored) { } catch (Exception ignored) {
// 兼容 fastjson2 的调用，不返回异常 // 兼容 FastJSON 2.x 的调用，忽略异常
} }
Properties properties = PropertiesUtils.getInstance().getProperties(); Properties properties = PropertiesUtils.getInstance().getProperties();
propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties)); propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties));

14
parent/pom.xml
View File

@@ -25,21 +25,25 @@
<commons-io.version>2.13.0</commons-io.version> <commons-io.version>2.13.0</commons-io.version>
<commons-text.version>1.10.0</commons-text.version> <commons-text.version>1.10.0</commons-text.version>
<commons-email.version>1.5</commons-email.version> <commons-email.version>1.5</commons-email.version>
<fst.version>2.57</fst.version>
<jackson-bom2.version>2.13.5</jackson-bom2.version>
<fastjson.version>2.0.33</fastjson.version> <fastjson.version>2.0.33</fastjson.version>
<fst.version>2.57</fst.version>
<snakeyaml.version>2.0</snakeyaml.version> <snakeyaml.version>2.0</snakeyaml.version>
<!--<jackson.version>2.12.6</jackson.version>--> <activation.version>1.1.1</activation.version>
<!--<activation.version>1.1.1</activation.version>-->
<UserAgentUtils.version>1.21</UserAgentUtils.version> <UserAgentUtils.version>1.21</UserAgentUtils.version>
<!--<metadata-extractor.version>2.11.0</metadata-extractor.version>-->
<metadata-extractor.version>2.11.0</metadata-extractor.version>
<thumbnailator.version>0.4.19</thumbnailator.version> <thumbnailator.version>0.4.19</thumbnailator.version>
<twelvemonkeys.version>3.9.3</twelvemonkeys.version> <twelvemonkeys.version>3.9.3</twelvemonkeys.version>
<blade-patchca.version>1.1.2</blade-patchca.version> <blade-patchca.version>1.1.2</blade-patchca.version>
<jmimemagic.version>0.1.5</jmimemagic.version> <jmimemagic.version>0.1.5</jmimemagic.version>
<zxing.version>3.5.1</zxing.version> <zxing.version>3.5.1</zxing.version>
<poi.version>5.2.3</poi.version> <poi.version>5.2.3</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version> <pinyin4j.version>2.5.1</pinyin4j.version>
<groovy.version>3.0.17</groovy.version> <groovy.version>3.0.17</groovy.version>
<joda-time.version>2.10.4</joda-time.version> <joda-time.version>2.10.4</joda-time.version>
<logstash-logback.version>7.3</logstash-logback.version> <logstash-logback.version>7.3</logstash-logback.version>
<elasticsearch.version>7.17.8</elasticsearch.version> <elasticsearch.version>7.17.8</elasticsearch.version>
@@ -60,7 +64,7 @@
<!-- environment setting --> <!-- environment setting -->
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!--<tomcat.version>9.0.58</tomcat.version>--> <tomcat2.version>9.0.75</tomcat2.version>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<resource.delimiter>@</resource.delimiter> <resource.delimiter>@</resource.delimiter>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>