From 0915b8918d27761251891b65277315a54a29a414 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 16 Jul 2021 01:51:12 +0800 Subject: [PATCH] fix comment --- .../java/cn/hutool/core/date/DateUtil.java | 5 +-- .../main/java/cn/hutool/core/img/ImgUtil.java | 1 + .../cn/hutool/extra/qrcode/QrCodeUtil.java | 11 ++++-- .../hutool/extra/qrcode/QrCodeUtilTest.java | 38 +++++++++---------- 4 files changed, 28 insertions(+), 27 deletions(-) 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 61385e3d5..06fa860bf 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 @@ -18,7 +18,6 @@ import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; import java.time.Year; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; import java.util.Calendar; @@ -542,8 +541,8 @@ public class DateUtil extends CalendarUtil { if (null == format || null == date) { return null; } - /// java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra - /// return format.format(date.toInstant()); + // java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra + // 出现以上报错时，表示Instant时间戳没有时区信息，赋予默认时区 return TemporalAccessorUtil.format(date.toInstant(), format); } diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java b/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java index b75e32e70..54e4b181e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java @@ -1544,6 +1544,7 @@ public class ImgUtil { * @since 3.1.0 */ public static void write(Image image, File targetFile) throws IORuntimeException { + FileUtil.touch(targetFile); ImageOutputStream out = null; try { out = getImageOutputStream(targetFile); 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 ec0ca33d9..4715508e6 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 @@ -27,9 +27,12 @@ import java.io.OutputStream; import java.util.HashMap; /** - * 基于Zxing的二维码工具类 - * 参见二维码网站： - *

https://cli.im/text

+ * 基于Zxing的二维码工具类，支持： + * + * * @author looly * @since 4.0.2 */ @@ -79,7 +82,7 @@ public class QrCodeUtil { * 生成 Base64 编码格式的二维码，以 String 形式表示 * *

- * 输出格式为: data:image/[type];base64,[data] + * 输出格式为: data:image/[type];base64,[data] *

* * @param content 内容 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 78650e129..500492af2 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 @@ -16,7 +16,6 @@ import java.io.File; * 二维码工具类单元测试 * * @author looly - * */ public class QrCodeUtilTest { @@ -27,7 +26,7 @@ public class QrCodeUtilTest { } @Test - @Ignore +// @Ignore public void generateCustomTest() { QrConfig config = new QrConfig(); config.setMargin(0); @@ -35,28 +34,25 @@ public class QrCodeUtilTest { // 背景色透明 config.setBackColor(null); config.setErrorCorrection(ErrorCorrectionLevel.H); - 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)); + String path = FileUtil.isWindows() ? "d:/test/qrcodeCustom.png" : "~/Desktop/hutool/qrcodeCustom.png"; + QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.touch(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"; + String icon = FileUtil.isWindows() ? "d:/test/pic/face.jpg" : "~/Desktop/hutool/pic/face.jpg"; + String targetPath = FileUtil.isWindows() ? "d:/test/qrcodeWithLogo.jpg" : "~/Desktop/hutool/qrcodeWithLogo.jpg"; QrCodeUtil.generate(// - "http://hutool.cn/", // + "https://hutool.cn/", // QrConfig.create().setImg(icon), // - FileUtil.file(targetPath)); + FileUtil.touch(targetPath)); } @Test @Ignore public void decodeTest() { - String decode = QrCodeUtil.decode(FileUtil.file("e:/pic/qr.png")); + String decode = QrCodeUtil.decode(FileUtil.file("d:/test/pic/qr.png")); Console.log(decode); } @@ -68,18 +64,20 @@ public class QrCodeUtilTest { Console.log(decode); } + @Test + public void generateAsBase64Test() { + String base64 = QrCodeUtil.generateAsBase64("https://hutool.cn/", new QrConfig(400, 400), "png"); + Assert.assertNotNull(base64); + } + @Test @Ignore - public void generateAsBase64Test(){ - String base64 = QrCodeUtil.generateAsBase64("http://hutool.cn/", new QrConfig(400, 400), "png"); - System.out.println(base64); - + public void generateAsBase64Test2() { byte[] bytes = FileUtil.readBytes( - new File("d:/test/qr.png")); + new File("d:/test/qr.png")); String encode = Base64.encode(bytes); - String base641 = QrCodeUtil.generateAsBase64("http://hutool.cn/", new QrConfig(400, 400), "png", encode); - System.out.println(base641); - + String base641 = QrCodeUtil.generateAsBase64("https://hutool.cn/", new QrConfig(400, 400), "png", encode); + Assert.assertNotNull(base641); } }