diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
index 5e98634c5..b40401fb9 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
@@ -323,10 +323,10 @@ public class MailAccount implements Serializable {
* 设置发送方,遵循RFC-822标准
* 发件人可以是以下形式:
*
- *
+ ** * @param from 发送方,遵循RFC-822标准 * @return this diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java new file mode 100644 index 000000000..efc2877ef --- /dev/null +++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java @@ -0,0 +1,21 @@ +package org.dromara.hutool.http.client; + +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.http.client.engine.ClientEngineFactory; +import org.dromara.hutool.http.meta.Method; +import org.junit.jupiter.api.Test; + +public class IssueIB1QHQTest { + @Test + void requestByOkHttpTest() { + for (int i = 0; i < 3; i++) { + String response = ClientEngineFactory.createEngine("OkHttp") + .send(Request + .of("https://hutool.cn") + .method(Method.POST) + .body("123") + ).bodyStr(); + Console.log("response: {}", response); + } + } +} diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java index 1e26640ed..f5d0107c8 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java @@ -16,15 +16,15 @@ package org.dromara.hutool.setting; -import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.io.LineReader; +import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.resource.Resource; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.SystemUtil; import org.dromara.hutool.log.Log; @@ -39,30 +39,47 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map.Entry; import java.util.Set; +import java.util.function.UnaryOperator; /** * Setting文件加载器 * * @author Looly - * */ public class SettingLoader { private static final Log log = Log.get(); - /** 注释符号(当有此符号在行首,表示此行为注释) */ + /** + * 注释符号(当有此符号在行首,表示此行为注释) + */ private final static char COMMENT_FLAG_PRE = '#'; - /** 赋值分隔符(用于分隔键值对) */ - private char assignFlag = '='; - /** 变量名称的正则 */ - private String varRegex = "\\$\\{(.*?)\\}"; - /** 本设置对象的字符集 */ + /** + * 本设置对象的字符集 + */ private final Charset charset; - /** 是否使用变量 */ + /** + * 是否使用变量 + */ private final boolean isUseVariable; - /** GroupedMap */ + /** + * GroupedMap + */ private final GroupedMap groupedMap; + /** + * 赋值分隔符(用于分隔键值对) + */ + private char assignFlag = '='; + /** + * 变量名称的正则 + */ + private String varRegex = "\\$\\{(.*?)\\}"; + /** + * 值编辑器 + */ + private UnaryOperator{@code * 1. user@xxx.xx - * 2. name <user@xxx.xx> - *+ * 2. name+ * }