From 96ad2ed57f84a681de369d0aa687625e005b7f5e Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 4 Nov 2024 18:08:00 +0800 Subject: [PATCH] fix code --- .../hutool/extra/mail/MailAccount.java | 6 +- .../hutool/http/client/IssueIB1QHQTest.java | 21 ++++++ .../dromara/hutool/setting/SettingLoader.java | 72 ++++++++++++++----- 3 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java 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标准
* 发件人可以是以下形式： * - * 
+	 * 
{@code
 	 * 1. user@xxx.xx
-	 * 2.  name <user@xxx.xx>
-	 * 

+	 * 2. name
+	 * }
* * @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 valueEditor; + /** * 构造 * @@ -75,8 +92,8 @@ public class SettingLoader { /** * 构造 * - * @param groupedMap GroupedMap - * @param charset 编码 + * @param groupedMap GroupedMap + * @param charset 编码 * @param isUseVariable 是否使用变量 */ public SettingLoader(final GroupedMap groupedMap, final Charset charset, final boolean isUseVariable) { @@ -142,13 +159,17 @@ public class SettingLoader { } final String[] keyValue = SplitUtil.split(line, String.valueOf(this.assignFlag), 2, true, false) - .toArray(new String[0]); + .toArray(new String[0]); // 跳过不符合键值规范的行 if (keyValue.length < 2) { continue; } String value = keyValue[1]; + if (null != this.valueEditor) { + value = this.valueEditor.apply(value); + } + // 替换值中的所有变量变量（变量必须是此行之前定义的变量，否则无法找到） if (this.isUseVariable) { value = replaceVar(group, value); @@ -165,19 +186,37 @@ public class SettingLoader { * 正则只能有一个group表示变量本身，剩余为字符 例如 \$\{(name)\}表示${name}变量名为name的一个变量表示 * * @param regex 正则 + * @return this */ - public void setVarRegex(final String regex) { + public SettingLoader setVarRegex(final String regex) { this.varRegex = regex; + return this; } /** * 赋值分隔符（用于分隔键值对） * * @param assignFlag 正则 + * @return this * @since 4.6.5 */ - public void setAssignFlag(final char assignFlag) { + public SettingLoader setAssignFlag(final char assignFlag) { this.assignFlag = assignFlag; + return this; + } + + /** + * 设置值编辑器，用于在获取值后编辑返回值，例如解密等
+ * 编辑器函数接受一个参数，此参数为待编辑的值，函数返回编辑后的值
+ * 注意：此函数调用在变量替换前 + * + * @param valueEditor 编辑器函数 + * @return this + * @since 6.0.0 + */ + public SettingLoader setValueEditor(final UnaryOperator valueEditor) { + this.valueEditor = valueEditor; + return this; } /** @@ -224,6 +263,7 @@ public class SettingLoader { } // ----------------------------------------------------------------------------------- Private method start + /** * 替换给定值中的变量标识 *