diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
index b3994f820..c84e16efd 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
@@ -542,10 +542,7 @@ public class DateUtil extends CalendarUtil {
 		if (null == format || null == date) {
 			return null;
 		}
-		// java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra
-		if (format.getZone() == null) {
-			format = format.withZone(ZoneId.systemDefault());
-		}
+		/// java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra
 		/// return format.format(date.toInstant());
 		return TemporalAccessorUtil.format(date.toInstant(), format);
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
index 72fe79008..21b5248ce 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
@@ -8,7 +8,7 @@ public class NumberChineseFormatterTest {
 	@Test
 	public void formatTest() {
 		String f0 = NumberChineseFormatter.format(50008000, false);
-		Assert.assertEquals("五千万零8千", f0);
+		Assert.assertEquals("五千万零八千", f0);
 		String f1 = NumberChineseFormatter.format(10889.72356, false);
 		Assert.assertEquals("一万零八百八十九点七二", f1);
 		f1 = NumberChineseFormatter.format(12653, false);
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
index bb4f7fa4e..0ea1d0f9b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
@@ -13,7 +13,15 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.TimeZone;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.LinkedHashSet;
+import java.util.GregorianCalendar;
 
 /**
  * 时间工具单元测试<br>
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
index 67a0686b3..02c089cea 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
@@ -26,6 +26,10 @@ import java.util.List;
  * FTP客户端封装<br>
  * 此客户端基于Apache-Commons-Net
  *
+ * 常见搭建ftp的工具有
+ * 1、filezila server ;根目录一般都是空
+ * 2、linux vsftpd ; 使用的 系统用户的目录，这里往往都是不是根目录，如：/home/ftpuser/ftp
+ *
  * @author looly
  * @since 4.1.8
  */
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
index ac77808ca..ec0ca33d9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
@@ -28,7 +28,8 @@ import java.util.HashMap;
 
 /**
  * 基于Zxing的二维码工具类
- *
+ * 参见二维码网站：
+ * <p>https://cli.im/text</p>
  * @author looly
  * @since 4.0.2
  */
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
index c1af336f5..78650e129 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
@@ -35,16 +35,22 @@ public class QrCodeUtilTest {
 		// 背景色透明
 		config.setBackColor(null);
 		config.setErrorCorrection(ErrorCorrectionLevel.H);
-		QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.file("d:/qrcodeCustom.png"));
+		String path = FileUtil.isWindows() ? "d:/hutool/qrcodeCustom.png" : "~/Desktop/hutool/qrcodeCustom.png";
+		if (!FileUtil.file(path).getParentFile().exists()) {
+			FileUtil.file(path).getParentFile().mkdirs();
+		}
+		QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.file(path));
 	}
 
 	@Test
 	@Ignore
 	public void generateWithLogoTest() {
+		String icon = FileUtil.isWindows() ? "d:/hutool/pic/face.jpg" : "~/Desktop/hutool/pic/face.jpg";
+		String targetPath = FileUtil.isWindows() ? "d:/hutool/qrcodeWithLogo.jpg" : "~/Desktop/hutool/qrcodeWithLogo.jpg";
 		QrCodeUtil.generate(//
 				"http://hutool.cn/", //
-				QrConfig.create().setImg("e:/pic/face.jpg"), //
-				FileUtil.file("e:/qrcodeWithLogo.jpg"));
+				QrConfig.create().setImg(icon), //
+				FileUtil.file(targetPath));
 	}
 
 	@Test