From 6e84a5fd433c229aa3478c2f243b647b1ba8a67e Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 18 Nov 2025 16:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(printer):=20=E8=B0=83=E6=95=B4=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E8=BE=B9=E8=B7=9D=E5=92=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=8B=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改二维码距离左边缘的图片宽度比例从 0.075 为 0.05
- 修正图片旋转角度判断逻辑，确保横向处理正确
- 移除下载 URL 中的域名替换操作，使用原始地址直接下载
---
 .../watermark/operator/PrinterDefaultWatermarkOperator.java   | 2 +-
 .../ycwl/basic/service/printer/impl/PrinterServiceImpl.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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) {
                                 }