From 6b95a60c4b74c4be3c0fba8e3304be04d18285be Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 18 Mar 2024 16:27:10 +0800 Subject: [PATCH] fix code --- .../dromara/hutool/extra/qrcode/QrConfig.java | 25 +++++++++++++++++++ .../dromara/hutool/extra/qrcode/QrImage.java | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java index d83b31878..6c8b66980 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java @@ -74,6 +74,11 @@ public class QrConfig { * 二维码中的Logo */ protected Image img; + + /** + * 二维码logo圆角弧度,0~1,为长宽占比 + */ + protected double imgRound = 0.3; /** * 二维码中的Logo缩放的比例系数,如5表示长宽最小值的1/5 */ @@ -385,6 +390,26 @@ public class QrConfig { return this; } + /** + * 获取二维码logo圆角弧度,0~1,为长宽占比 + * @return 二维码logo圆角弧度,0~1,为长宽占比 + * @since 6.0.0 + */ + public double getImgRound() { + return imgRound; + } + + /** + * 设置二维码logo圆角弧度,0~1,为长宽占比 + * @param imgRound 二维码logo圆角弧度,0~1,为长宽占比 + * @return this + * @since 6.0.0 + */ + public QrConfig setImgRound(final double imgRound) { + this.imgRound = imgRound; + return this; + } + /** * 获取二维码中的Logo缩放的比例系数,如5表示长宽最小值的1/5 * diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java index 971358030..356cdf3b3 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java @@ -87,7 +87,7 @@ public class QrImage extends BufferedImage { } Img.from(this).pressImage(// - Img.from(logoImg).round(0.3).getImg(), // 圆角 + Img.from(logoImg).round(config.imgRound).getImg(), // 圆角 new Rectangle(imgWidth, imgHeight), // 位置 1//不透明 );