From 15753a5a31a8a3c0df1b5107aea1b08ca4280435 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Mon, 15 Nov 2021 20:55:06 +0800
Subject: [PATCH] fix code

---
 hutool-core/src/main/java/cn/hutool/core/net/RFC3986.java       | 2 +-
 hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/net/RFC3986.java b/hutool-core/src/main/java/cn/hutool/core/net/RFC3986.java
index 39e563ea3..2c10260a4 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/RFC3986.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/RFC3986.java
@@ -14,7 +14,7 @@ public class RFC3986 {
 	/**
 	 * gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@"
 	 */
-	public static final PercentCodec GEN_DELIMS = PercentCodec.of(":/?#[]&");
+	public static final PercentCodec GEN_DELIMS = PercentCodec.of(":/?#[]@");
 
 	/**
 	 * sub-delims = "!" / "$" / "{@code &}" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java b/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
index a70d5542f..b90c23ce1 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
@@ -35,7 +35,7 @@ public class StrFormatter {
 	 * 如果想输出占位符使用 \\转义即可，如果想输出占位符之前的 \ 使用双转义符 \\\\ 即可<br>
 	 * 例：<br>
 	 * 通常使用：format("this is {} for {}", "{}", "a", "b") =》 this is a for b<br>
-	 * 转义{}： format("this is \\{} for {}", "{}", "a", "b") =》 this is \{} for a<br>
+	 * 转义{}： format("this is \\{} for {}", "{}", "a", "b") =》 this is {} for a<br>
 	 * 转义\： format("this is \\\\{} for {}", "{}", "a", "b") =》 this is \a for b<br>
 	 *
 	 * @param strPattern  字符串模板