release 4.5.13

dromara · Jun 20, 2019 · f181565 · f181565
1 parent d7e12f4
commit f181565
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### 新特性
 * 【crypto】      提供HmacSM3支持（issue#396@Github）
+* 【setting】     SettingLoader添加同步锁（issue#396@Github）
 
 ### Bug修复
 * 【log】           修复log模块模板拼接时没有判断等级关闭与否的问题

diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>

diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>

diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>

diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-cache</artifactId>

diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-captcha</artifactId>

diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-core</artifactId>

diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-cron</artifactId>

diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-crypto</artifactId>

diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-db</artifactId>

diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-dfa</artifactId>

diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>

diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-http</artifactId>

diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-json</artifactId>

diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-log</artifactId>

diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-poi</artifactId>

diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-script</artifactId>

diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-setting</artifactId>

diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
@@ -98,7 +98,7 @@ public boolean load(UrlResource urlResource) {
 	 * @return 加载成功与否
 	 * @throws IOException IO异常
 	 */
-	public boolean load(InputStream settingStream) throws IOException {
+	synchronized public boolean load(InputStream settingStream) throws IOException {
 		this.groupedMap.clear();
 		BufferedReader reader = null;
 		try {
@@ -177,7 +177,7 @@ public void store(String absolutePath) {
 	 * @param writer Writer
 	 * @throws IOException IO异常
 	 */
-	private void store(PrintWriter writer) throws IOException {
+	synchronized private void store(PrintWriter writer) throws IOException {
 		for (Entry<String, LinkedHashMap<String, String>> groupEntry : this.groupedMap.entrySet()) {
 			writer.println(StrUtil.format("{}{}{}", CharUtil.BRACKET_START, groupEntry.getKey(), CharUtil.BRACKET_END));
 			for (Entry<String, String> entry : groupEntry.getValue().entrySet()) {

diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-socket</artifactId>

diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>4.5.13-SNAPSHOT</version>
+		<version>4.5.13</version>
 	</parent>
 
 	<artifactId>hutool-system</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
 	<groupId>cn.hutool</groupId>
 	<artifactId>hutool-parent</artifactId>
-	<version>4.5.13-SNAPSHOT</version>
+	<version>4.5.13</version>
 	<name>hutool</name>
 	<description>提供丰富的Java工具方法</description>
 	<url>https://github.com/looly/hutool</url>