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 68b3e98e8..0ccc098b4 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java @@ -568,7 +568,7 @@ public class QrCodeUtil { * @return SVG矢量图(字符串) * @since 5.8.6 */ - public static String toSVG(BitMatrix matrix, int foreColor, Integer backColor, Image logoImg, int ratio) { + public static String toSVG(BitMatrix matrix, Integer foreColor, Integer backColor, Image logoImg, int ratio) { StringBuilder sb = new StringBuilder(); int qrWidth = matrix.getWidth(); int qrHeight = matrix.getHeight(); @@ -601,8 +601,6 @@ public class QrCodeUtil { } - Color fore = new Color(foreColor, true); - StringBuilder result = StrUtil.builder(); result.append("\n"); - result.append(" \n"); + result.append(" \n"); if (StrUtil.isNotBlank(logoBase64)) { result.append("\n"); } 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 d4c0f264c..52fbe6ba9 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java @@ -207,12 +207,13 @@ public class QrCodeUtilTest { public void comparePngAndSvgAndAsciiArtTest() { final QrConfig qrConfig = QrConfig.create() .setForeColor(null) - .setBackColor(null) - .setWidth(0) - .setHeight(0).setMargin(1); + .setBackColor(Color.WHITE) + .setWidth(200) + .setHeight(200).setMargin(1); QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.jpg")); QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.txt")); QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.png")); + QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.svg")); } }