diff --git a/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java b/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java index c457906e..3cefa954 100644 --- a/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java +++ b/src/main/java/com/ycwl/basic/image/watermark/operator/PrinterDefaultWatermarkOperator.java @@ -47,7 +47,7 @@ public class PrinterDefaultWatermarkOperator implements IOperator { public static int OFFSET_Y = 15; public static Color BG_COLOR = Color.WHITE; public static int QRCODE_SIZE = 150; - public static double QRCODE_LEFT_MARGIN_RATIO = 0.075; // 二维码距离左边缘的图片宽度比例 + public static double QRCODE_LEFT_MARGIN_RATIO = 0.05; // 二维码距离左边缘的图片宽度比例 public static int QRCODE_OFFSET_Y = -35; public static int SCENIC_FONT_SIZE = 42; diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java index 741c2b00..6f8e0a14 100644 --- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java @@ -789,14 +789,14 @@ public class PrinterServiceImpl implements PrinterService { boolean needRotation = false; try { - HttpUtil.downloadFile(item.getCropUrl().replace("oss.zhentuai.com", "frametour-assets.oss-cn-shanghai-internal.aliyuncs.com"), originalFile); + HttpUtil.downloadFile(item.getCropUrl(), originalFile); // 判断图片方向并处理旋转 boolean isLandscape = false; try { Integer rotate = JacksonUtil.getInt(item.getCrop(), "rotation"); if (rotate != null) { - isLandscape = rotate % 180 != 0; + isLandscape = rotate % 180 == 0; } } catch (Exception ignored) { }