diff --git a/CHANGELOG.md b/CHANGELOG.md
index 518e738f2..a3d2ab5ba 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 
 # 🚀Changelog
 
+-------------------------------------------------------------------------------------------------------------
+# 5.8.18.M1 (2023-04-12)
+
+### 🐣新特性
+
+### 🐞Bug修复
+
 -------------------------------------------------------------------------------------------------------------
 # 5.8.17 (2023-04-12)
 
diff --git a/README-EN.md b/README-EN.md
index 557a6c46a..e33a0a474 100755
--- a/README-EN.md
+++ b/README-EN.md
@@ -144,18 +144,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop：
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.8.17</version>
+    <version>5.8.18.M1</version>
 </dependency>
 ```
 
 ### 🍐Gradle
 ```
-implementation 'cn.hutool:hutool-all:5.8.17'
+implementation 'cn.hutool:hutool-all:5.8.18.M1'
 ```
 
 ## 📥Download
 
-- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.17/)
+- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.18.M1/)
 
 > 🔔️note:
 > Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available.
diff --git a/README.md b/README.md
index 3a8156484..a1abe4537 100755
--- a/README.md
+++ b/README.md
@@ -144,20 +144,20 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.8.17</version>
+    <version>5.8.18.M1</version>
 </dependency>
 ```
 
 ### 🍐Gradle
 ```
-implementation 'cn.hutool:hutool-all:5.8.17'
+implementation 'cn.hutool:hutool-all:5.8.18.M1'
 ```
 
 ### 📥下载jar
 
 点击以下链接，下载`hutool-all-X.X.X.jar`即可：
 
-- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.17/)
+- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.18.M1/)
 
 > 🔔️注意
 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。
diff --git a/bin/version.txt b/bin/version.txt
index 7d3e07d97..ae6a7b6bb 100755
--- a/bin/version.txt
+++ b/bin/version.txt
@@ -1 +1 @@
-5.8.17
+5.8.18.M1
diff --git a/docs/js/version.js b/docs/js/version.js
index 0edf63b90..9f6d93474 100755
--- a/docs/js/version.js
+++ b/docs/js/version.js
@@ -1 +1 @@
-var version = '5.8.17'
\ No newline at end of file
+var version = '5.8.18.M1'
\ No newline at end of file
diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml
index ea77cf72d..16f16f56a 100755
--- a/hutool-all/pom.xml
+++ b/hutool-all/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>
diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml
index fb9cecaaf..4c9172cad 100755
--- a/hutool-aop/pom.xml
+++ b/hutool-aop/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>
diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml
index ea179acb1..3fb63aaba 100755
--- a/hutool-bloomFilter/pom.xml
+++ b/hutool-bloomFilter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>
diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml
index c2e788d67..7b5f59db4 100755
--- a/hutool-bom/pom.xml
+++ b/hutool-bom/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-bom</artifactId>
diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml
index f2dabd963..8f7ef0dfe 100755
--- a/hutool-cache/pom.xml
+++ b/hutool-cache/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-cache</artifactId>
diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml
index 869d8a657..a1102355a 100755
--- a/hutool-captcha/pom.xml
+++ b/hutool-captcha/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-captcha</artifactId>
diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml
index 600533efb..c8939b6ea 100755
--- a/hutool-core/pom.xml
+++ b/hutool-core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-core</artifactId>
diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
index 7d76f1809..fff3c8c67 100755
--- a/hutool-cron/pom.xml
+++ b/hutool-cron/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-cron</artifactId>
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 158cfcbb6..2e9ecfac4 100755
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-crypto</artifactId>
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index d386c5ae7..89953f96d 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-db</artifactId>
diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
index c52fbaf01..5b99ad88d 100755
--- a/hutool-dfa/pom.xml
+++ b/hutool-dfa/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-dfa</artifactId>
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 27ca9a4a2..a279fad98 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index d8cd6a109..b227a86f5 100755
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-http</artifactId>
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index 8a03c3bb1..b28113560 100755
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-json</artifactId>
diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml
index e1046a923..9652cd5cc 100755
--- a/hutool-jwt/pom.xml
+++ b/hutool-jwt/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-jwt</artifactId>
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index a8786a07c..7a7c72878 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-log</artifactId>
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index 10d0d157e..390cb0a72 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-poi</artifactId>
diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
index 2f2e17164..43efd61ed 100755
--- a/hutool-script/pom.xml
+++ b/hutool-script/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-script</artifactId>
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 3355d6933..dedbe90f8 100755
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-setting</artifactId>
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index c754e8bbe..56bf98571 100755
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-socket</artifactId>
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
index 779efed18..c56544a9c 100755
--- a/hutool-system/pom.xml
+++ b/hutool-system/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.8.17</version>
+		<version>5.8.18.M1</version>
 	</parent>
 
 	<artifactId>hutool-system</artifactId>
diff --git a/pom.xml b/pom.xml
index 0e5892a26..35e970851 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
 	<groupId>cn.hutool</groupId>
 	<artifactId>hutool-parent</artifactId>
-	<version>5.8.17</version>
+	<version>5.8.18.M1</version>
 	<name>hutool</name>
 	<description>Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。</description>
 	<url>https://github.com/dromara/hutool</url>