From 0aaf792ecd0c672af3550412a0010b5dc670d37e Mon Sep 17 00:00:00 2001
From: yihui <bangzewu@126.com>
Date: Tue, 15 Sep 2020 16:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=BB=98=E5=88=B6=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E7=9F=A9=E5=BD=A2?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=EF=BC=8Cfix=E5=9C=86=E8=A7=92=E7=9F=A9?=
 =?UTF-8?q?=E5=BD=A2=E5=88=B7=E5=AD=90=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console/pom.xml                               |  21 +--
 .../quick/plugin/test/AudioWrapperTest.java   |   6 +-
 plugins/image-plugin/pom.xml                  |   5 +
 .../image/wrapper/merge/cell/RectCell.java    |  48 ++-----
 .../wrapper/merge/cell/RectFillCell.java      |  39 ++++--
 .../image/wrapper/merge/cell/TextCell.java    |  10 ++
 .../plugin/test/ImgMergeWrapperTest.java      | 127 ++++++++++-------
 .../plugin/test/WaterMarkWrapperTest.java     |   2 -
 .../image-plugin/src/test/resources/cover.jpg | Bin 0 -> 8558 bytes
 plugins/imagic-plugin/pom.xml                 |   2 +-
 .../hui/quick/plugin/imagic/ImgWrapper.java   | 132 +++++++++++++++++-
 .../quick/plugin/test/QrCodeGenUserGuide.java |   3 +-
 12 files changed, 278 insertions(+), 117 deletions(-)
 create mode 100644 plugins/image-plugin/src/test/resources/cover.jpg

diff --git a/console/pom.xml b/console/pom.xml
index dfbd01c6..1be3fc2f 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -18,13 +18,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <qrcode-plugin.version>2.4.2</qrcode-plugin.version>
-        <image-plugin.version>2.4</image-plugin.version>
-        <svg-plugin.version>2.4</svg-plugin.version>
-        <markdonw-plugin.version>2.4</markdonw-plugin.version>
-        <audio-plugin.version>2.4</audio-plugin.version>
-        <date-plugin.version>2.4</date-plugin.version>
-        <phantom-plugin.version>2.4</phantom-plugin.version>
+        <qrcode-plugin.version>2.5</qrcode-plugin.version>
+        <image-plugin.version>2.5</image-plugin.version>
+        <svg-plugin.version>2.5</svg-plugin.version>
+        <markdonw-plugin.version>2.5</markdonw-plugin.version>
+        <audio-plugin.version>2.5</audio-plugin.version>
+        <date-plugin.version>2.5</date-plugin.version>
+        <phantom-plugin.version>2.5</phantom-plugin.version>
     </properties>
 
     <repositories>
@@ -41,13 +41,6 @@
             </snapshots>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <url>https://repo.spring.io/libs-release-local</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
 
         <dependency>
diff --git a/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java b/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java
index 0452c0ca..613d3670 100644
--- a/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java
+++ b/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java
@@ -1,15 +1,17 @@
 package com.github.hui.quick.plugin.test;
 
 import com.github.hui.quick.plugin.audio.AudioWrapper;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class AudioWrapperTest {
 
+    private static final Logger log = LoggerFactory.getLogger(AudioWrapperTest.class);
+
 
     @Test
     public void testAudioParse() {
diff --git a/plugins/image-plugin/pom.xml b/plugins/image-plugin/pom.xml
index 667a4857..608b0b06 100644
--- a/plugins/image-plugin/pom.xml
+++ b/plugins/image-plugin/pom.xml
@@ -18,6 +18,11 @@
             <artifactId>base-plugin</artifactId>
             <version>2.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectCell.java b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectCell.java
index a148b921..121ef3da 100644
--- a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectCell.java
+++ b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectCell.java
@@ -26,13 +26,7 @@ public class RectCell implements IMergeCell {
 
 
     /**
-     * 是否为虚线
-     */
-    private boolean dashed;
-
-
-    /**
-     * 虚线样式
+     * 虚线样式，指定线宽等，如 {@link CellConstants#RECT_DEFAULT_DASH}
      */
     private Stroke stroke;
 
@@ -45,13 +39,12 @@ public class RectCell implements IMergeCell {
     public RectCell() {
     }
 
-    public RectCell(int x, int y, int w, int h, Color color, boolean dashed, Stroke stroke, int radius) {
+    public RectCell(int x, int y, int w, int h, Color color, Stroke stroke, int radius) {
         this.x = x;
         this.y = y;
         this.w = w;
         this.h = h;
         this.color = color;
-        this.dashed = dashed;
         this.stroke = stroke;
         this.radius = radius;
     }
@@ -59,11 +52,11 @@ public RectCell(int x, int y, int w, int h, Color color, boolean dashed, Stroke
     @Override
     public void draw(Graphics2D g2d) {
         g2d.setColor(color);
-        if (!dashed) {
+        if (stroke == null) {
             g2d.drawRoundRect(x, y, w, h, radius, radius);
         } else {
             Stroke stroke = g2d.getStroke();
-            g2d.setStroke(stroke);
+            g2d.setStroke(this.stroke);
             g2d.drawRoundRect(x, y, w, h, radius, radius);
             g2d.setStroke(stroke);
         }
@@ -109,14 +102,6 @@ public void setColor(Color color) {
         this.color = color;
     }
 
-    public boolean isDashed() {
-        return dashed;
-    }
-
-    public void setDashed(boolean dashed) {
-        this.dashed = dashed;
-    }
-
     public Stroke getStroke() {
         return stroke;
     }
@@ -142,21 +127,20 @@ public boolean equals(Object o) {
             return false;
         }
         RectCell rectCell = (RectCell) o;
-        return x == rectCell.x && y == rectCell.y && w == rectCell.w && h == rectCell.h && dashed == rectCell.dashed &&
-                radius == rectCell.radius && Objects.equals(color, rectCell.color) &&
-                Objects.equals(stroke, rectCell.stroke);
+        return x == rectCell.x && y == rectCell.y && w == rectCell.w && h == rectCell.h && radius == rectCell.radius &&
+                Objects.equals(color, rectCell.color) && Objects.equals(stroke, rectCell.stroke);
     }
 
     @Override
     public int hashCode() {
 
-        return Objects.hash(x, y, w, h, color, dashed, stroke, radius);
+        return Objects.hash(x, y, w, h, color, stroke, radius);
     }
 
     @Override
     public String toString() {
-        return "RectCell{" + "x=" + x + ", y=" + y + ", w=" + w + ", h=" + h + ", color=" + color + ", dashed=" +
-                dashed + ", stroke=" + stroke + ", radius=" + radius + '}';
+        return "RectCell{" + "x=" + x + ", y=" + y + ", w=" + w + ", h=" + h + ", color=" + color + ", stroke=" +
+                stroke + ", radius=" + radius + '}';
     }
 
     public static Builder builder() {
@@ -180,13 +164,6 @@ public static class Builder {
          */
         private Color color;
 
-
-        /**
-         * 是否为虚线
-         */
-        private boolean dashed;
-
-
         /**
          * 虚线样式
          */
@@ -223,11 +200,6 @@ public Builder color(Color color) {
             return this;
         }
 
-        public Builder dashed(boolean dashed) {
-            this.dashed = dashed;
-            return this;
-        }
-
         public Builder stroke(Stroke stroke) {
             this.stroke = stroke;
             return this;
@@ -239,7 +211,7 @@ public Builder radius(int radius) {
         }
 
         public RectCell build() {
-            return new RectCell(x, y, w, h, color, dashed, stroke, radius);
+            return new RectCell(x, y, w, h, color, stroke, radius);
         }
     }
 }
diff --git a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectFillCell.java b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectFillCell.java
index 0be90290..fa0d49c2 100644
--- a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectFillCell.java
+++ b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/RectFillCell.java
@@ -17,24 +17,31 @@ public class RectFillCell implements IMergeCell {
 
     private int x, y, w, h;
 
+    private int radius;
+
     @Override
     public void draw(Graphics2D g2d) {
         g2d.setFont(font);
         g2d.setColor(color);
-        ;
-        g2d.fillRect(x, y, w, h);
+
+        if (radius <= 0) {
+            g2d.fillRect(x, y, w, h);
+        } else {
+            g2d.fillRoundRect(x, y, w, h, radius, radius);
+        }
     }
 
     public RectFillCell() {
     }
 
-    public RectFillCell(Font font, Color color, int x, int y, int w, int h) {
+    public RectFillCell(Font font, Color color, int x, int y, int w, int h, int radius) {
         this.font = font;
         this.color = color;
         this.x = x;
         this.y = y;
         this.w = w;
         this.h = h;
+        this.radius = radius;
     }
 
     public Font getFont() {
@@ -85,6 +92,14 @@ public void setH(int h) {
         this.h = h;
     }
 
+    public int getRadius() {
+        return radius;
+    }
+
+    public void setRadius(int radius) {
+        this.radius = radius;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -94,20 +109,19 @@ public boolean equals(Object o) {
             return false;
         }
         RectFillCell that = (RectFillCell) o;
-        return x == that.x && y == that.y && w == that.w && h == that.h && Objects.equals(font, that.font) &&
-                Objects.equals(color, that.color);
+        return x == that.x && y == that.y && w == that.w && h == that.h && radius == that.radius &&
+                Objects.equals(font, that.font) && Objects.equals(color, that.color);
     }
 
     @Override
     public int hashCode() {
-
-        return Objects.hash(font, color, x, y, w, h);
+        return Objects.hash(font, color, x, y, w, h, radius);
     }
 
     @Override
     public String toString() {
         return "RectFillCell{" + "font=" + font + ", color=" + color + ", x=" + x + ", y=" + y + ", w=" + w + ", h=" +
-                h + '}';
+                h + ", radius=" + radius + '}';
     }
 
     public static Builder builder() {
@@ -120,7 +134,7 @@ public static class Builder {
         private Color color;
 
 
-        private int x, y, w, h;
+        private int x, y, w, h, radius;
 
         public Builder font(Font font) {
             this.font = font;
@@ -152,8 +166,13 @@ public Builder h(int h) {
             return this;
         }
 
+        public Builder radius(int radius) {
+            this.radius = radius;
+            return this;
+        }
+
         public RectFillCell build() {
-            return new RectFillCell(font, color, x, y, w, h);
+            return new RectFillCell(font, color, x, y, w, h, radius);
         }
     }
 }
diff --git a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/TextCell.java b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/TextCell.java
index 609c12a0..08e62f83 100644
--- a/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/TextCell.java
+++ b/plugins/image-plugin/src/main/java/com/github/hui/quick/plugin/image/wrapper/merge/cell/TextCell.java
@@ -127,6 +127,16 @@ public void addText(String text) {
         texts.add(text);
     }
 
+    /**
+     * 文本框占用的高度, 水平绘制时有效
+     *
+     * @return
+     */
+    public int getDrawHeight() {
+        FontMetrics fontMetrics = FontUtil.getFontMetric(font);
+        int size = batchSplitText(texts, fontMetrics).size();
+        return size * (fontMetrics.getHeight() + lineSpace);
+    }
 
     @Override
     public void draw(Graphics2D g2d) {
diff --git a/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/ImgMergeWrapperTest.java b/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/ImgMergeWrapperTest.java
index de3799a1..f206215e 100644
--- a/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/ImgMergeWrapperTest.java
+++ b/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/ImgMergeWrapperTest.java
@@ -1,18 +1,16 @@
 package com.github.hui.quick.plugin.test;
 
 
+import com.github.hui.quick.plugin.base.ColorUtil;
 import com.github.hui.quick.plugin.base.GraphicUtil;
 import com.github.hui.quick.plugin.base.ImageLoadUtil;
 import com.github.hui.quick.plugin.base.ImageOperateUtil;
+import com.github.hui.quick.plugin.image.util.FontUtil;
 import com.github.hui.quick.plugin.image.wrapper.create.ImgCreateOptions;
 import com.github.hui.quick.plugin.image.wrapper.merge.ImgMergeWrapper;
-import com.github.hui.quick.plugin.image.wrapper.merge.cell.IMergeCell;
-import com.github.hui.quick.plugin.image.wrapper.merge.cell.ImgCell;
-import com.github.hui.quick.plugin.image.wrapper.merge.cell.LineCell;
-import com.github.hui.quick.plugin.image.wrapper.merge.cell.TextCell;
+import com.github.hui.quick.plugin.image.wrapper.merge.cell.*;
 import com.github.hui.quick.plugin.image.wrapper.merge.template.QrCodeCardTemplate;
 import com.github.hui.quick.plugin.image.wrapper.merge.template.QrCodeCardTemplateBuilder;
-import com.github.hui.quick.plugin.image.util.FontUtil;
 import org.junit.Test;
 
 import javax.imageio.ImageIO;
@@ -29,6 +27,72 @@
  */
 public class ImgMergeWrapperTest {
 
+    @Test
+    public void gen() throws IOException {
+        try {
+            testCover("我师兄实在太稳健了", "cover");
+            testCover("射雕英雄传", "cover2");
+        } catch (Exception e) {
+        }
+    }
+
+    public void testCover(String text, String out) throws IOException {
+        int w = 276, h = 402;
+        BufferedImage bg = ImageLoadUtil.getImageByPath("cover.jpg");
+
+
+        TextCell textCell = new TextCell();
+        textCell.setColor(ColorUtil.int2color(0xFFB49876));
+        textCell.addText(text);
+        textCell.setFont(new Font("苹方", Font.PLAIN, 32));
+        int textX = 13 * w / (13 + 12 + 67);
+        textCell.setStartX(textX);
+        int textY = (int) (23.5 * h / (23.5 + 13 + 86)) + 28;
+        textCell.setStartY(textY);
+        textCell.setEndX(w - textX);
+        textCell.setEndY(textY);
+        textCell.setDrawStyle(ImgCreateOptions.DrawStyle.HORIZONTAL);
+        textCell.setAlignStyle(ImgCreateOptions.AlignStyle.CENTER);
+        int textHeight = textCell.getDrawHeight();
+
+
+        RectFillCell fillCell = new RectFillCell();
+        textY = textY - 32;
+        fillCell.setX(textX - 15);
+        fillCell.setY(textY - 15);
+        fillCell.setW(w - 2 * textX + 30);
+        fillCell.setH(textHeight + 30);
+        fillCell.setRadius(8);
+        fillCell.setColor(Color.LIGHT_GRAY);
+
+
+        RectCell rectCell = new RectCell();
+        rectCell.setX(textX - 21);
+        rectCell.setY(textY - 21);
+        rectCell.setW(w - 2 * textX + 42);
+        rectCell.setH(textHeight + 42);
+        rectCell.setColor(Color.LIGHT_GRAY);
+        rectCell.setRadius(12);
+        rectCell.setStroke(new BasicStroke(2));
+
+
+        Graphics2D g2d = GraphicUtil.getG2d(bg);
+        List<IMergeCell> list = new ArrayList<>();
+        list.add(rectCell);
+        list.add(fillCell);
+        list.add(textCell);
+        list.stream().forEach(s -> s.draw(g2d));
+
+        System.out.println("---绘制完成---");
+        try {
+            ImageIO.write(bg, "png", new File("/tmp/cover/" + out + ".png"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
     @Test
     public void testCell() throws IOException {
         int w = 520, h = 260;
@@ -43,13 +107,7 @@ public void testCell() throws IOException {
         // logo
         BufferedImage logo = ImageLoadUtil.getImageByPath("bg.png");
         logo = ImageOperateUtil.makeRoundImg(logo, false, null);
-        ImgCell logoCell = ImgCell.builder()
-                .img(logo)
-                .x(60)
-                .y(20)
-                .w(100)
-                .h(100)
-                .build();
+        ImgCell logoCell = ImgCell.builder().img(logo).x(60).y(20).w(100).h(100).build();
         list.add(logoCell);
 
 
@@ -83,23 +141,12 @@ public void testCell() throws IOException {
 
 
         // line
-        LineCell line = LineCell.builder().x1(280)
-                .y1(20)
-                .x2(240)
-                .y2(240)
-                .color(Color.GRAY)
-                .build();
+        LineCell line = LineCell.builder().x1(280).y1(20).x2(240).y2(240).color(Color.GRAY).build();
         list.add(line);
 
 
         BufferedImage qrCode = ImageLoadUtil.getImageByPath("xcx.jpg");
-        ImgCell imgCell = ImgCell.builder()
-                .img(qrCode)
-                .x(300)
-                .y(30)
-                .w(200)
-                .h(200)
-                .build();
+        ImgCell imgCell = ImgCell.builder().img(qrCode).x(300).y(30).w(200).h(200).build();
         list.add(imgCell);
 
 
@@ -140,33 +187,19 @@ public void testMerge() throws IOException {
         BufferedImage img2 = ImageLoadUtil.getImageByPath("blogQrcode.png");
 
 
-        ImgCell imgCell = ImgCell.builder()
-                .img(img1)
-                .x(0)
-                .y(0)
-                .build();
+        ImgCell imgCell = ImgCell.builder().img(img1).x(0).y(0).build();
 
 
-        LineCell lineCell = LineCell.builder()
-                .x1(img1.getWidth() / 3)
-                .x2(img1.getWidth() * 7 / 6)
-                .y1(img1.getHeight() + 4)
-                .y2(img1.getHeight() + 4)
-                . color(Color.LIGHT_GRAY)
-                .dashed(true)
-                .build();
+        LineCell lineCell =
+                LineCell.builder().x1(img1.getWidth() / 3).x2(img1.getWidth() * 7 / 6).y1(img1.getHeight() + 4)
+                        .y2(img1.getHeight() + 4).color(Color.LIGHT_GRAY).dashed(true).build();
 
 
-        ImgCell imgCell2 = ImgCell.builder()
-                .img(img2)
-                .x(img1.getWidth() / 2)
-                .y(img1.getHeight() + 4)
-                .build();
+        ImgCell imgCell2 = ImgCell.builder().img(img2).x(img1.getWidth() / 2).y(img1.getHeight() + 4).build();
 
-        BufferedImage ans = ImgMergeWrapper.merge(Arrays.asList(imgCell, lineCell, imgCell2),
-                img1.getWidth() / 2 + img2.getWidth(),
-                img1.getHeight() + 4 + img2.getHeight(),
-                Color.WHITE);
+        BufferedImage ans = ImgMergeWrapper
+                .merge(Arrays.asList(imgCell, lineCell, imgCell2), img1.getWidth() / 2 + img2.getWidth(),
+                        img1.getHeight() + 4 + img2.getHeight(), Color.WHITE);
         ImageIO.write(ans, "jpg", new File("/tmp/ansV3.jpg"));
     }
 }
diff --git a/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/WaterMarkWrapperTest.java b/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/WaterMarkWrapperTest.java
index 31ede84e..fdf1fcb8 100644
--- a/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/WaterMarkWrapperTest.java
+++ b/plugins/image-plugin/src/test/java/com/github/hui/quick/plugin/test/WaterMarkWrapperTest.java
@@ -1,8 +1,6 @@
 package com.github.hui.quick.plugin.test;
 
-import com.github.hui.quick.plugin.base.DomUtil;
 import com.github.hui.quick.plugin.base.ImageLoadUtil;
-import com.github.hui.quick.plugin.base.constants.MediaType;
 import com.github.hui.quick.plugin.image.wrapper.wartermark.WaterMarkOptions;
 import com.github.hui.quick.plugin.image.wrapper.wartermark.WaterMarkWrapper;
 import org.junit.Test;
diff --git a/plugins/image-plugin/src/test/resources/cover.jpg b/plugins/image-plugin/src/test/resources/cover.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0087cef80b1b176a5e8e97554b4e6c188260d16f
GIT binary patch
literal 8558
zcmeI1_ct6))bJP4TSSSnNP<X+O+@bzVU-}lB5GI?tiD#?2tw4=O9Y9wSS8A0bt0_Z
zI~%>X5Nnl$H{bU;&)@L=@_y#boH=Lixp(HynKS3!do_Kv2)M4Tp``&JBLe`){x!hW
z96${~LH-~AjTHa5Ms@8!XsD<tsc32F=xAwZY3Uf48R+Pl=xJ#gSs0m^uU}`mPRDSA
z^~QD9fAi~CZ2)>2vP3dAGBOsx)eivgKh6Ji{b%HVp`yM<NlrmSM*DAB<vM`upB?gR
z*C_s(qW&lHPn_Z!B@5M!+tlK$cT^2%*lax5ALq~tJPl5$<hUtlC~522E+M7%(kOA{
zY8F8ApJo-nU&Ckrpa1WH|7RXBO{_&rr=8ARP)-3;ZYVy|R#n~+AMlHVS$>2zY|R<)
zXN~SNt_E+n$iKSlD1KAobx-$xLRIlD^I_!|_j+H5^+8zgy$x8kU}LxfX!ZXd!|d!~
zEiPscX|7r*8y~<<aH)SuDCRMLcC?wT=_uCaUX{S|A2)9{X^d{XrI@xyRAt|7(w^UF
zMa)P1579<{)zs)~pRY8wrX_@xrWtfl2&N3qQ&_&A0wxBC94(*S&6EqCNdpNeW`2Rx
zk2VyfYD9??5tdFr4X%Wv;CTCcu9dks`5f#Z#oE#h8IXV<k-rCV1&9(rw)jUZ)cOX!
z$1QGD(%*azqte(aa;<J2Vgf-kRiypeF76{*R<z(B@%hP0_3b43`~PkBseFyQeRjKR
zvktFO!tjDvRg1hyg21d3_b3H;<Ih6U6rH&nZg}4DHs&h^<$E_qSx&&)Y(1f!(k@N%
zI&D_~(q#O9u2}trgo)v#_~-z~jOnO1In|T%@^imVOHmk?N*oK9*K5zQT@%_5H;hjE
z3&b2;x#zuQuK=W!l8h+R*)6+xpr@~Z=$+uICsUd|;>&fw0KO%U@*ZbrrZ#w&-^p&H
z<4T)E8igotT~KlN!4<&1w!&&4wMC|R<9qt4tD7Kv=UfzE<#MnrlB#$?Uafk~?qN|x
zL{#ezL|_L?$c{~^kqoyqfV#!%EzWRVw(yy0-U?EG5oq##Kl1qH4(6CW>aS1J_>?NW
zG-01I8SS&K)pzTinXF0*ZvNziZg$f}*EoNxD`PUPS?ZN-qovpjeM41<fx?0wNhUQx
zG?Htn!+l-`-dkzF!eTpN;aC*?&Q_zQ{C3U{)asJmzAM@MBR?Q|eS;_b-B!Fp_IA^@
zMoZZ!F?qbUuJY)kZ?*W}Xz>p4cuEOohgHNT@6R2XPnHTiDv>cRb7^FMPK}iqM{3yI
z$9FwgA1Qh=ksZIPd_H52^EkGQ9=OrzS&$Ix7nRpf|Gq=9r9@-~(ez@H#?d~uMF!-^
zMVWWGJzmx6+&Ee}^y!!0ywt#;Pv+a(_KliV1#8PeETxL#9b9~!Frm?!nBtUH&;qkJ
zSLGi`Br^FONli-WRW3`Kyo&g&CqOyBd=62L@im+7cuc0)xLrR!Vq}nbmy!1)Q|}6U
zz`f564y4XqSveKR{TfSG4;dJ5!woGE93G0AG538abDy`f@yBaf4`@}LIIcyyc|Z&V
zh({_%C*HXevop&b5Jp)pAHO{P&G<Zg&s*_uaH{Ui)nUnG;ie(t22;qkmORWI6~3|b
zeMW@wxzPbCz5801oY3vqcQoz7wH|{USAeC_x$yw7x>rGKNm{Vi#K?<KuM&2~FFyh@
zH)Ke$N39HEJRhm)x}QBW@FT9(Ds&<Wg>u9B*?;?Ram~*osZ=l}2)&9V!=GloT!N^m
z<kJKO7Z2f>6tQZUqos|#x++rr`D-k;nj$oKXd7qXG&}2}<Xuu!>{yJB>wJ%cK9<Ax
zsyt^_O$mE7QK#IoH2VFZlMBEI|FnAO+cQ*$uyE2o{|k1Pk+0kTG{AW4%RP!2#N1-a
zU=-ELJ5RZjjRq{%^_#s=eQicU{V+K+fDi{l>KCtRIv|qWWx3NWeh+=h<IkPF0z~Ir
z0hU|OF^LC7UURO4wU7R+Sj*ke;-Kf6i;06&f32QfWXjf>Tb6-mSgfx~@GaOg6z?QU
z6I>V*37WH?-<<pqx${Qnryi}~iUYs8+Z2&n$8<3;O-#)#T$WpB2nF1gX-x(u9UCc^
zoR&2~tk<v(QM9e}$%=Fv-vdot_}e$RSKc!t8pg7G!#Af}J2^zAOWugVHp0qS;x&0P
znFWCMrVwt@b3<RR+DJ<)HJ|Qv21#avc!f2cO(!pcodI1?YEoxA)bg%%_b#|$r=(_D
zq#!WP`MG$ETri<>e#u#&@l{!}fn<+98xx-v@FZf0@PlM7q7Yk)VUglBy7A}=z~*}G
z?HTCMfc6$GPh$PIq6n;6W1pJ({oTGST9v_^(93P!L;4X}f6|y=gO4)0xC$%<QPRQO
zM%!x~vPS+|;2E5fn%PipJHIciBgyzsr@^oAJU|_e!L`5s8WolTdFET~46L7Cw95u8
zGBB%)JhR|`;BiE%Y4yzGUNCHbQ>#=8w|+3MG1=IU9OCPZ{|3w4Dq;9`c-Px*<2UPk
z$_YA3$3?&nZoy~;0C66nJjIDiP;<M)tS+i<k~G+L4IhTh)(#);(>$ZUQ}iGpazjC%
zpWtBrWC?*#Qd{734!r^t6D<b_42$V~(fnC0h16B?qja46<HV(DyV(AifF}$}mEQ-E
z)UobfslNfvg?$|QK^CB{`7H++Bf5T_I~Cil_LpY{CfX482A!^^{RYG6mZ71P)7bo^
zhnhDvWQiktbOM{q&f0mg#kAF@<xG9)>}}3ySu9Bmo;X>5vK4yIQbA-Tp&Zu33Dc14
zh`ij+sU9=J!w^3ksA}a)QoCstQ&-}tWF3?-Q1H9a)M$H)x<)U=%^O3<;!PAQa^<)8
z=c(L1ndSE0H<n6OSnQFd2Dk_b8TL3&Fog=05*aCamHc?q7!~rjS0~ug2<i{uO22!a
zJI1^-(Az7EsG~>>$UILGpBmk~%$SQ^UR!>)<s&WP%kzmh#)qO-f5gGLVMQ}biSZKl
zVe)fkqEhR}q{~tq{ES*b^VUZoc|}>`xRZZIWJ%^Wo#W9f0il4*c^_D$T>CM;@+BQA
zxid&Io<3IHo|h+@pwG6}zY0yg_&bFZt1HUjdzdghVW6&Sa9^U``r><6@cYf*)4#~$
z%^zkxgBKUM)^QAQ-F>xYCxik7Q6a%9xfRD<IoV~0BStC_v%`EAa`=YS5TJ}?2y>CO
z0h<bj^zgeRtenq{V6mrrgrivh7Ti4aSKCU?+Qf+X!Z5@xCHB@^%C;ax_yw`{Zki5+
z-nX0Ymf+tCEQ!}mmxD`<D`lpA$k|5qz#r{vE@p{@W&T;!n1Ua3UffG6XRl)%o9x|?
z8<M52ps28{FdS2KEekN`x1EyAMlx|Q9yOR@(BRuJ0ca57`l3{;ee~1y$K^7b!)CPI
z%1vT_Dj$1GEd>um)_eK(;HPHnC3N1&P%mTaQM&H|lSygJFOAii;-ID@CSb`L5a&F%
z_x`bpYoGlk1LhYkQu5L1lloEF#p@*l`sI5kzJ&#K#$U39D#5pG$WR{b?mn(c<5ZZc
zDpa;pMq`R9O6!NggbwKFNY0&Kua6@jDaY6O#4&UEF@15MmGa_cGz8INb>EQ^83<to
z8`Ip9N!u9zYrH<?RBz?{d*b8%SvZ*OI`d*XC)Y6_<`r^`F>lO6+1E@6{lMYJM@B*$
z0C`cwj?7)&o`Yes@sHXC)kt5`;`f!$zSlG$?Ypv49iQBiI#iET@E8nIZ%oX{7mq_T
zvp!;$U|wr$lRMs(GwVJMOyjPDSaAJ5%GOH$1eDv?+UE$bMo$<wVtv$9fxmF_(l}rm
zKHCh5da|auQXQ2(yC_%)<*8t%501kmnw6fTre2CTLIeFAuVF83P>+?2elAejL!UGl
zXw3LB5C%2mR3_~DpdQc<E)E_*#y^yys)ZmnIK#8C>+bEaYAiG2-q*x(-gwP*XHM7?
zen^e!P4hK09)M}GxL=g>kR?*&jokx~QU>sd%2)C22sn3#TIX)vq~*#sU$!L2_J~VK
zi45n5N03Zg>ZV4RokBQIW>M=8!q~6NC_=e=Ryi6slRavlDQkJ(1COb}+Zz+BmqiPk
zuh%t*65UJ35t0&9X4pN6x!+S7KQvChkF^WPsXRfZcBn3FH4J=xfPBJX9u{}lOEn=K
z(u^w#D;ESD5*fRdzm`sIiZt*4+TQAr=rY@zzML_YA>8yRs69P~+-eT~3F1kL@dz_-
z)SbtO{(O`1w$VXO+*6;g1mQMfGCSM#^c-9zz8-KG53W$&af6`CVv4*FUPOif#r(uS
zK`%JM|Ef`1lz|Fhf-nj*9q&wXV@9EbFOehZd5#gXzBz+~ekSZ76c%p`N*?A=+T*hb
z!N+*Ji`u(X4$q~ZF6KwwZJvvGYx}OGs!3goC7nU)Ykh|-CxuFnVaA5Fu6Lr2Wvw_b
zYmh{HU$#exGGRh22$jA4%xJEO<D<r}6)b6ko@MeP@Hd!s8BWlcOr>VUQp}+`HJ4-K
ztDXG-zhjE^%7-B@%@!rcR39*Txkm27wLF4e12&FLGxYV19Zv<3F#2qb^$HZ{?&8UY
z>`VD`5A$c67Ane9-o$JC)>R{>$I0v_Tw%Sm(xV!GKdc-z0xyHjxC6A)%f=0AAB?8$
zlYOOF%JekKV3czVP87$soqkBvFXXgv#CD=nizXi5uuyd!_1y~_%x-rJg?r!Z+P#kV
zcI4~3V-Be@aYZmdHx(YFR+h#lynocSM@{g4*8U*YhDfx2W9NaBiUX0(K@>_MMgBvF
zx}%`*@!Fvhx0kvB8MMMt1ntTCQ<#>6pD^RR#)4s@td-ux6#xq>J`YLlAIx&phP~~_
z8;aTdnv)=b1=EAkZ)HG_uv)3`Y=BbQd#T!r$%c@s+KnQj(roiV0#P@y#db<=ubbkb
zFy|l*e{RD&N`EQGoh;o;rd(C2H=)>rY|I>QV1M|MU*;F4oIO}Am+c1}IhFfTQp)~?
zE2ac}s)=*Zg?c46{QgRe&C}F36pdam0s2G<8)z^4d7r;>JX)Fmc=6B{GTsT+60;bs
zlKl$HPdM0}WU|noCU50xKu$TeMl#Qq<=6Z`=%o(nBa7=ymsQTC&;6a=cf>tCq96M9
zWwZ6IE#vg)Pfu#)os82b0@py1yy{FOoux<r;<_{dg_%MklKgwsHd3KT2ouuboBvHx
zk0EnRQxFE!@ThOGxOneNG=EMpPZ_ZT0e&QnJXYOZ4-4^nmnFqe{6{KyS0S9X3!YLB
zbmx$=@5)9AHy=>;JKnDE(maN|!AxYNZl2v+c|S6S+hw$20=ZSHK<IE=QJ=O1ix16#
z?JIVIM@w-K`qGT-C{!*crypu-<0HGe0SveT2w9jCof8*Ua&RNksO;h{dB6O0d;Ar^
zhA-~iz5MVE4hvlsT#4&te>i4^QPFAxrIjG15It+*W*I#v>C>LlYU>@o_|KcAjd*j1
zeGZzuVQ=pN&*Ix-<2o;T)Hy6;^K29%0ZEwv=7zJJhA%E`;|uGQ+Zhi(Q+H(5JHqhp
zYO3>(Y1XVV<ncDGFQl&kg>I4)MnqG_toM!Xe3^?Oa@VdGI@i%mbK<4S9NNg5C`qgO
z7oq2%NLw#`F*y|rA4?A%Eg{1qT|3=ks3Q2Oex_t5Ik>9tjP>&02T?0xEROSq4F)X1
zS)O*_#LMuQQ`<t19vH1?Q9HfQX`BO-fSatqZY!%iQLO81a==A7&v{wHN&c5j_PrhM
zDOyb%2ch!lUT)tZ_ov0N5YZ;hx8-?W*pYq#=aVzunjfoV8wy$^U>H}+)Qf1HA1_pC
zoW)Sq31Y7UdgT0~3|j^H2lkabTeX!burAVxr%q!vXt9)rgx^0!ehzaB9tz%h1pZU%
zK(T3zH=Y=oC8oW2km4zo>_c*}G~HYkc+KW>?yoifE}xTD3Ag4Sv_frp1xURD(Ert$
zWPvEt79Ib6{z!|bw!XUmn)u>5?~x4suZK%Rr9^8cf?WmC^NY6OHeHsI;6YSW?%SvM
z22E>@y}fH8GOO-Ekn@sXh8H?g`afDtVe*Jle}w&*clVyu&3mGbFngcSCAm=N!Q}9G
zwO=$82{ZoC;vlY8hUUBBYNhhcui2k7&8fQ;u}?g7zhnXOM0gxCeIIo=h_EU|^u(2J
zZfNWq>naMeNW9#MzX<ePCAXxcR|%4E*8p1bXc39V>Nm9s7Lx<xN(Sa7+cLD4?B>_l
zSem?lZQZ&38H`1PJp+5)bkxD>3|_}xm8xuFGdu#XVWtbOsR76||2typKZgt~WYmlV
zx|Yqr>qEJv4~>XM#5mTEQgf$o>t>Aohs>oz4h(Jb=AEpyTKwqiWB6p4U76h=8%S&O
zl22NUVsi#9_wJc4>D_UJzj>|lsT_Fz`wL_thhJ<z12bXi3Kct2l&1Y89Hq&5M;D)p
z<G1!8__sbs-08n~X0RQd6Vh<~j!>-6ff=`ouRF8gn(ri!QU;OLDJziUP+`T{#fwXf
zvQ3r*U;wUcqWwDx<pa=noCtCgvfolzXl4(e*~V7kg;VyXX$dj$p2)`yWhc$rl5oV}
z=cu`&ty`roY{$tD-J;!o9uV*^fIL_QIVM*PU%_9cVq_EhI7d1y7j9UdxH`MqrA?w`
z$!7|(-R0pko-QQ~u>Ceu2GKaw{3RHS2vJb~8*>FPbWSYi%A9)36?>RC!yT~dS=d}}
zWpNsRn*Q(kt(x5|B%O21lWLY5{2T3t5|i9Y?dMFjx(_m$o*wB+w@lU&toC4b+u?Ji
zdX7lLedd6IYj0s4;ZxO9jzp`YQ;(fy6H{zoiR-UfXn7vFT$Y+ukK)^)`o&A%;DbSM
zARqe>!BGm=z$@Uxp_66Vu;?hrR^ydyTkar)PucqrB6w?Y?^Z~YL^%=M>7uZnR}-j(
z;K&-O8GwBrxvtaHajm-xT31e9?AEOHH#apnOLS7qrieC)vuG={IKp99E6}v(gs(Sj
zDog3Kdx|^cn+Z%*Y<A59r{{#0*qq^R2Tj%t!p!-|++pzdk2Q?$l;o<g8f?fvUZDr-
zQFu+LkqP6Lg-Vl_NXsu*@ndy`CjMm|{arJ6yZO!@g`SrLX{ww=o0dusuojfc>>z7L
zG<(f7KNZX#b?0#c>W33oh6KxM-m14cf@)L!cWOAQ77R7!oa<{lwMk=D-bOW<;fKpz
zc+x8NL9FAj^{hd8X^Js#0DK#9H1&!zDi?*$Nm3W32z?Ky=$3V--irD5c)megI<e70
z@@IK|qpDAx5%;Uj_s(#&Te8#Z@t#@&{D@6Z_Pe2<=%1E4?wC!z^75}KrCt@rmU(rx
zIr(<vyX4#f8;b7D;v);;ppxU4O_o^xb~pW%`X7W+oaMoKLr$L3tbKY-;r3)mGrbO`
zMXAJ`HK<QHYxZ;7Ut)hxa3-|($oF7IOANeXtDU}v%T5C8>1Rv)F87w$pBL5FQz^Eu
z4vKa>?$ZN@o_b9%aS{p3lJBClZbsLU@^8K!@iZ8CHLlB>v-JsraeFcR_^CH_h{YeD
z+j)X0g>rAbuMPuX{om5MTB^najq_XzK2j}f`KuyhhJi-MW4hZ@TN!iF>-lH;d^#U)
zDRbH#HVN=l?)3~ELDCH0-EpqNoVND$ZvM3S{N2Uq&^KX1Q{h<`39z_?pQ{Q7tD2bM
z3Ey7Y=7N2XsuXJm;SufdkAVyT1wbQc(g_wTaXWe4)jk9);}P4o!gaE7R%V=8+oy*&
zw0I2@woBY+T=e0s9Q?UTF(;&3g#9~Pn^nVhJjmeVf~PccchVJh-by>wI)5{ETG02M
z9a3Jn@Zcd7wZM4R-Tggs)UuS@YK?zr`jcNl*z&8Q^|DkMIeZJfrd$`zvGGax#4O#G
zV)($AzmmLbOq8r;`hwE4FA5Z>UzQ)8p@LmzTFRK=oK^=NUerOs+tI4#VTe%=J5s$i
zeJu{ILyy{PpCOz*0Wy)F<@=Y7G2RbsRx=3vw1>uoXlplMZVL{2CG4gt^LUP>i+6FW
zfd!Ay?EI_*=_oE`ofk&N<KhMVXw-+!R^T4Uuba|uw*gd&up+)|)#L>u3O`|wzdeW_
zZTt?u<=gkU@wJ0M-IRzvC@j|{YC#vAw|6O}aI|G#S`aZ_;WOW#Nc&(&uEUcWaci@t
zs<Qx*nTFYuvSp8{o4}0^Ydv2d)5halzdJu`5?^Zbs{nsp^Ov40Et|TR_bV^;K5(H=
z@GS)eL6h63LSde~W$BS}>x4MzvN)LdKRvFM_?&6_xySof;fAo$*#X0gXK%(N<~CBZ
z4@<Z9Z%{8%8&*~hl7dEgxGwvM!DW<rV*F!O7s0#f)HwR>J4NzgPCI4WC%swX?giE6
zj_Iad?Z#8`Cah=q1g@dNWCkSUeyP92cz4M*!aHx`c@ZYFuKO%>H3<;R6Byc)l<7{z
z#z87n$DR@ybI}Q5a~O3wN5Zz=ysNk0Z@YVYd@-YmV||QjTlQxm78_V4RD5GS-eyR7
z=GCm4+KktL+kgSYXhP-vn339#K$06Lb*8<UbcSfbe1?vNxHi;vBaN?rP-0;l&7mAW
zX{^of(`@+iiRP@WW5P7aaLx^ktyWnsL6`U_LOXmm+0H}t=E}xP^9!)w1zxWxCY^ul
zrJLJLuF=mcuzT6TFa+274P<Q-o)=Rn4qJFhAA52jgd3MDN7}`}YtLN(<Q~C$+sy)M
zBkwZIpCuW?4sMiHj*Xj@<T$VqZ3be8W^S)4HO_nNk8R()yWNN2bz5X8aG4BWFc6a{
zH*D)Ld|<QB($rIzfMxoZ5EbRy0P8ZO(K&tY$Bw7nRW$)iJh#=l3q7+L)ccNCpbn0w
z!^eN_RLer!!e+pg2^~^Tp!tGl-JokpF(~~bdW7p%ie;eDl>CfSPD3q2lPmNSPj^S{
z>idJ-3l)90M^lCni9@qUsP{=mfU`mGPnzE@3P|5`QGK)}--MBjG~u%cPEE-4L8^~}
z-Dl6S$~k=jG5TR?q~x|~WN}I0Hzq}n_<87zCbu+JX4(e%ufCveYIH2$ZZg$tg&P98
zmgQCR1U_frV!e6YUU>Y}byjwTIvbK55fQzTF%?@5h_l7f`BH@bcrdTPn|B-LW~}4l
zB8kc%=-vl3G6k3SkajTy^#Z$+#3}_u6afHql?<&I)au5oJZbtg-h$rhqlA@leEv|^
zdt!8oh{-Dy@6>qw*kX~UovY1ZgVLY1fFND?4Xaw@EPt6@PFKW9l1@|&*Vt7VNc0G9
z=WXw;MB^NlWO7Ao2Ht!<>r<+VGMgF)gUq0A0{nrmk&{fA)5tB3u#uAiD7@uGpFZMx
z3(ZnW`DbVwNGMOSS`qcHzTq?nVk4O&m3k8f0@)27J7iB$OZCImGE{*qA+3V<on>IE
ziM3{Ces9t|oYiOG?o=Bd?cD<B4=a>&H(b#rF02cpKN82=CQr*^KUdQ0&<KET<7Ec{
zhUUhl_NE1+q@ufCY(|~fkw<Unj4z=$g@kqG?3U=D{1P!^-$I0a>9}~@p`!d#^A%TN
zE{|(WWG7^<A~Uv4FZ6@pcKHtBPwvqk+J|e@9bvBktnj(I84qmL7A&}qM}0iKUzlv5
z!~00j9QC)|>f`83HDsMRh|Rdp$WXhjH%T~Uq+2`{i(ReDrad<P8>+q4>)Vl2$IR1D
zKTncP_)>gvpUtS^37o;^i~au=%_5?2ptsc38ImRjyP**`l}2SHsZbk9GbZOHrRR4?
zejiJ5r~c&C<P>&8$w)T0mjPrFJ^ieLcG4{AT~l~fMsI35>}=T=rmk79$ZM$4Pg`Sw
z3Ah*r=tAwybh}Z5Em7YV3n$_1+=f>?ymG-uO89rG@ZfH5eg3EU+^$=^>V_Jb-*Ap|
zKUi8Ex9ZXb%6?8s{S?*WA|%TAtg;u>Tl=S|zbzexzUZOMJ=%^Cu8pLHS+gm8;-S|U
zyM@i3597y-UZ>}cYT5GXD1W1wc|Su@6Fm*wXpjk+@@KF^9(gtkp_RoN%526`=O{y;
zZ^2Te%2VYfAc|v#@?eeOg+J02;Y&Gr01~B98uRJJXO)j#g`CIj?^hp)nM;;V#m~)&
zc8ZEUqG|&Mibu@E$W+Zbbk*uK+XSdZJJ?YO$O20OG!4fFd{Otm#_l3sFu^it1Ym<S
z7iD(XU(zJYTFx%ulMXNiJ$f2YQ2_uPI;k`qlT@ei4u<uyDm(ffR{#M>y(V>tEK!Bv
zbLW2<*{-(>pMeOzltZ~lbi?&%j_Tjp?}!-|V~B*q2{Y7|IE!AJU1<W|?St>?352n0
z$?84`LSCEK34gq$2zC{uIZVndMP&|1f&T@3&%P!1xd#tD^zdFu=ovz6TH0R$vSz8#
zRvyIZHQsF{q5EUU)fo;k9~(~?7t+tm1X1uS07J??C@6*(mznt|XG4UyY%S$nntThW
nBa|}GqipywCJu_?r~?~M8kw#j)h$LF1H!Fud*FXtU(Ng<yQ37S

literal 0
HcmV?d00001

diff --git a/plugins/imagic-plugin/pom.xml b/plugins/imagic-plugin/pom.xml
index 16bcb96e..15506974 100644
--- a/plugins/imagic-plugin/pom.xml
+++ b/plugins/imagic-plugin/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.github.hui.media</groupId>
             <artifactId>base-plugin</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
         </dependency>
 
 
diff --git a/plugins/imagic-plugin/src/main/java/com/github/hui/quick/plugin/imagic/ImgWrapper.java b/plugins/imagic-plugin/src/main/java/com/github/hui/quick/plugin/imagic/ImgWrapper.java
index 4b8ed170..4a5c2059 100644
--- a/plugins/imagic-plugin/src/main/java/com/github/hui/quick/plugin/imagic/ImgWrapper.java
+++ b/plugins/imagic-plugin/src/main/java/com/github/hui/quick/plugin/imagic/ImgWrapper.java
@@ -5,7 +5,6 @@
 import com.github.hui.quick.plugin.imagic.base.ImgBaseOperate;
 import com.github.hui.quick.plugin.imagic.exception.ImgOperateException;
 import com.github.hui.quick.plugin.imagic.tool.BytesTool;
-import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -17,6 +16,7 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 图片转换的操作类 (裁剪+旋转+伸缩+水印+边框+)
@@ -371,7 +371,6 @@ private FileWriteUtil.FileInfo createFile() throws Exception {
         }
 
 
-        @Data
         public static class Operate<T> {
             /**
              * 操作类型
@@ -472,6 +471,135 @@ public String getWaterFilename() throws ImgOperateException {
                     return null;
                 }
             }
+
+            public OperateType getOperateType() {
+                return operateType;
+            }
+
+            public void setOperateType(OperateType operateType) {
+                this.operateType = operateType;
+            }
+
+            public Integer getWidth() {
+                return width;
+            }
+
+            public void setWidth(Integer width) {
+                this.width = width;
+            }
+
+            public Integer getHeight() {
+                return height;
+            }
+
+            public void setHeight(Integer height) {
+                this.height = height;
+            }
+
+            public Integer getX() {
+                return x;
+            }
+
+            public void setX(Integer x) {
+                this.x = x;
+            }
+
+            public Integer getY() {
+                return y;
+            }
+
+            public void setY(Integer y) {
+                this.y = y;
+            }
+
+            public Double getRotate() {
+                return rotate;
+            }
+
+            public void setRotate(Double rotate) {
+                this.rotate = rotate;
+            }
+
+            public Double getRadio() {
+                return radio;
+            }
+
+            public void setRadio(Double radio) {
+                this.radio = radio;
+            }
+
+            public Integer getQuality() {
+                return quality;
+            }
+
+            public void setQuality(Integer quality) {
+                this.quality = quality;
+            }
+
+            public String getColor() {
+                return color;
+            }
+
+            public void setColor(String color) {
+                this.color = color;
+            }
+
+            public T getWater() {
+                return water;
+            }
+
+            public void setWater(T water) {
+                this.water = water;
+            }
+
+            public String getWaterImgType() {
+                return waterImgType;
+            }
+
+            public void setWaterImgType(String waterImgType) {
+                this.waterImgType = waterImgType;
+            }
+
+            public boolean isForceScale() {
+                return forceScale;
+            }
+
+            public void setForceScale(boolean forceScale) {
+                this.forceScale = forceScale;
+            }
+
+            @Override
+            public boolean equals(Object o) {
+                if (this == o) {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass()) {
+                    return false;
+                }
+                Operate<?> operate = (Operate<?>) o;
+                return forceScale == operate.forceScale && operateType == operate.operateType &&
+                        Objects.equals(width, operate.width) && Objects.equals(height, operate.height) &&
+                        Objects.equals(x, operate.x) && Objects.equals(y, operate.y) &&
+                        Objects.equals(rotate, operate.rotate) && Objects.equals(radio, operate.radio) &&
+                        Objects.equals(quality, operate.quality) && Objects.equals(color, operate.color) &&
+                        Objects.equals(water, operate.water) && Objects.equals(waterImgType, operate.waterImgType);
+            }
+
+            @Override
+            public int hashCode() {
+
+                return Objects
+                        .hash(operateType, width, height, x, y, rotate, radio, quality, color, water, waterImgType,
+                                forceScale);
+            }
+
+            @Override
+            public String toString() {
+                return "Operate{" + "operateType=" + operateType + ", width=" + width + ", height=" + height + ", x=" +
+                        x + ", y=" + y + ", rotate=" + rotate + ", radio=" + radio + ", quality=" + quality +
+                        ", color='" + color + '\'' + ", water=" + water + ", waterImgType='" + waterImgType + '\'' +
+                        ", forceScale=" + forceScale + '}';
+            }
         }
 
 
diff --git a/plugins/qrcode-plugin/src/test/java/com/github/hui/quick/plugin/test/QrCodeGenUserGuide.java b/plugins/qrcode-plugin/src/test/java/com/github/hui/quick/plugin/test/QrCodeGenUserGuide.java
index d5269b1d..30f93ae5 100644
--- a/plugins/qrcode-plugin/src/test/java/com/github/hui/quick/plugin/test/QrCodeGenUserGuide.java
+++ b/plugins/qrcode-plugin/src/test/java/com/github/hui/quick/plugin/test/QrCodeGenUserGuide.java
@@ -250,6 +250,7 @@ public void bgQr4() {
                     .setDrawStyle(QrCodeOptions.DrawStyle.IMAGE)
                     .setDrawImg(cell)
                     .setDrawBgImg(bgCell)
+                    .setDetectSpecial()
                     .asFile("/tmp/bqr4.png");
         } catch (Exception e) {
             e.printStackTrace();
@@ -612,7 +613,7 @@ public void imgQr4() {
                     .setDrawBgImg("overbg/b.png")
                     .setDrawStyle(QrCodeOptions.DrawStyle.IMAGE)
                     .setDrawImg("overbg/a.png")
-//                    .setDetectSpecial()
+                    .setDetectSpecial()
                     .asFile("/tmp/imgQr4.png");
         } catch (Exception e) {
             e.printStackTrace();