🆕 #1685 小程序增加图像处理相关接口

Author: binarywang

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpImgProcService.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxImgProcService.java

@@ -1,9 +1,9 @@
-package me.chanjar.weixin.mp.api;
+package me.chanjar.weixin.common.api;
 
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.bean.imgproc.WxMpImgProcAiCropResult;
-import me.chanjar.weixin.mp.bean.imgproc.WxMpImgProcQrCodeResult;
-import me.chanjar.weixin.mp.bean.imgproc.WxMpImgProcSuperResolutionResult;
+import me.chanjar.weixin.common.bean.imgproc.WxImgProcAiCropResult;
+import me.chanjar.weixin.common.bean.imgproc.WxImgProcQrCodeResult;
+import me.chanjar.weixin.common.bean.imgproc.WxImgProcSuperResolutionResult;
 
 import java.io.File;
 
@@ -13,7 +13,7 @@
  *
  * @author Theo Nie
  */
-public interface WxMpImgProcService {
+public interface WxImgProcService {
 
   /**
    * 二维码/条码识别接口
@@ -27,7 +27,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcQrCodeResult
    * @throws WxErrorException .
    */
-  WxMpImgProcQrCodeResult qrCode(String imgUrl) throws WxErrorException;
+  WxImgProcQrCodeResult qrCode(String imgUrl) throws WxErrorException;
 
   /**
    * 二维码/条码识别接口
@@ -41,7 +41,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcQrCodeResult
    * @throws WxErrorException .
    */
-  WxMpImgProcQrCodeResult qrCode(File imgFile) throws WxErrorException;
+  WxImgProcQrCodeResult qrCode(File imgFile) throws WxErrorException;
 
   /**
    * 图片高清化接口
@@ -55,7 +55,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcSuperResolutionResult
    * @throws WxErrorException .
    */
-  WxMpImgProcSuperResolutionResult superResolution(String imgUrl) throws WxErrorException;
+  WxImgProcSuperResolutionResult superResolution(String imgUrl) throws WxErrorException;
 
   /**
    * 图片高清化接口
@@ -69,7 +69,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcSuperResolutionResult
    * @throws WxErrorException .
    */
-  WxMpImgProcSuperResolutionResult superResolution(File imgFile) throws WxErrorException;
+  WxImgProcSuperResolutionResult superResolution(File imgFile) throws WxErrorException;
 
   /**
    * 图片智能裁剪接口
@@ -81,7 +81,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcAiCropResult
    * @throws WxErrorException .
    */
-  WxMpImgProcAiCropResult aiCrop(String imgUrl) throws WxErrorException;
+  WxImgProcAiCropResult aiCrop(String imgUrl) throws WxErrorException;
 
   /**
    * 图片智能裁剪接口
@@ -93,7 +93,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcAiCropResult
    * @throws WxErrorException .
    */
-  WxMpImgProcAiCropResult aiCrop(String imgUrl, String ratios) throws WxErrorException;
+  WxImgProcAiCropResult aiCrop(String imgUrl, String ratios) throws WxErrorException;
 
   /**
    * 图片智能裁剪接口
@@ -105,7 +105,7 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcAiCropResult
    * @throws WxErrorException .
    */
-  WxMpImgProcAiCropResult aiCrop(File imgFile) throws WxErrorException;
+  WxImgProcAiCropResult aiCrop(File imgFile) throws WxErrorException;
 
   /**
    * 图片智能裁剪接口
@@ -117,5 +117,5 @@ public interface WxMpImgProcService {
    * @return WxMpImgProcAiCropResult
    * @throws WxErrorException .
    */
-  WxMpImgProcAiCropResult aiCrop(File imgFile, String ratios) throws WxErrorException;
+  WxImgProcAiCropResult aiCrop(File imgFile, String ratios) throws WxErrorException;
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/imgproc/WxMpImgProcAiCropResult.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/imgproc/WxImgProcAiCropResult.java

@@ -1,8 +1,8 @@
-package me.chanjar.weixin.mp.bean.imgproc;
+package me.chanjar.weixin.common.bean.imgproc;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 import java.util.List;
@@ -11,50 +11,59 @@
  * @author Theo Nie
  */
 @Data
-public class WxMpImgProcAiCropResult implements Serializable {
+public class WxImgProcAiCropResult implements Serializable {
   private static final long serialVersionUID = -6470673963772979463L;
 
   @SerializedName("img_size")
   private ImgSize imgSize;
+
   @SerializedName("results")
   private List<Results> results;
 
   @Override
   public String toString() {
-    return WxMpGsonBuilder.create().toJson(this);
+    return WxGsonBuilder.create().toJson(this);
   }
 
-  public static WxMpImgProcAiCropResult fromJson(String json) {
-    return WxMpGsonBuilder.create().fromJson(json, WxMpImgProcAiCropResult.class);
+  public static WxImgProcAiCropResult fromJson(String json) {
+    return WxGsonBuilder.create().fromJson(json, WxImgProcAiCropResult.class);
   }
 
   @Data
-  public static class ImgSize {
+  public static class ImgSize implements Serializable {
+    private static final long serialVersionUID = -6470673963772979463L;
+
     @SerializedName("w")
     private int w;
+
     @SerializedName("h")
     private int h;
 
     @Override
     public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
+      return WxGsonBuilder.create().toJson(this);
     }
   }
 
   @Data
-  public static class Results {
+  public static class Results implements Serializable {
+    private static final long serialVersionUID = -6470673963772979463L;
+
     @SerializedName("crop_left")
     private int cropLeft;
+
     @SerializedName("crop_top")
     private int cropTop;
+
     @SerializedName("crop_right")
     private int cropRight;
+
     @SerializedName("crop_bottom")
     private int cropBottom;
 
     @Override
     public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
+      return WxGsonBuilder.create().toJson(this);
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/imgproc/WxMpImgProcQrCodeResult.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/imgproc/WxImgProcQrCodeResult.java

@@ -1,93 +1,103 @@
-package me.chanjar.weixin.mp.bean.imgproc;
+package me.chanjar.weixin.common.bean.imgproc;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
  * 二维码/条码识别返回结果
+ *
  * @author Theo Nie
  */
 @Data
-public class WxMpImgProcQrCodeResult implements Serializable {
-
+public class WxImgProcQrCodeResult implements Serializable {
   private static final long serialVersionUID = -1194154790100866123L;
+
   @SerializedName("img_size")
   private ImgSize imgSize;
+
   @SerializedName("code_results")
   private List<CodeResults> codeResults;
 
   @Data
-  public static class ImgSize implements Serializable{
+  public static class ImgSize implements Serializable {
     private static final long serialVersionUID = -8847603245514017839L;
+
     @SerializedName("w")
     private int w;
     @SerializedName("h")
     private int h;
 
     @Override
     public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
+      return WxGsonBuilder.create().toJson(this);
     }
   }
 
   @Data
-  public static class CodeResults implements Serializable{
+  public static class CodeResults implements Serializable {
     private static final long serialVersionUID = -6138135951229076759L;
+
     @SerializedName("type_name")
     private String typeName;
+
     @SerializedName("data")
     private String data;
+
     @SerializedName("pos")
     private Pos pos;
 
     @Override
     public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
+      return WxGsonBuilder.create().toJson(this);
     }
 
     @Data
-    public static class Pos implements Serializable{
+    public static class Pos implements Serializable {
       private static final long serialVersionUID = 7754894061212819602L;
       @SerializedName("left_top")
       private Coordinate leftTop;
+
       @SerializedName("right_top")
       private Coordinate rightTop;
+
       @SerializedName("right_bottom")
       private Coordinate rightBottom;
+
       @SerializedName("left_bottom")
       private Coordinate leftBottom;
 
       @Override
       public String toString() {
-        return WxMpGsonBuilder.create().toJson(this);
+        return WxGsonBuilder.create().toJson(this);
       }
 
       @Data
-      public static class Coordinate implements Serializable{
+      public static class Coordinate implements Serializable {
         private static final long serialVersionUID = 8930443668927359677L;
         @SerializedName("x")
         private int x;
+
         @SerializedName("y")
         private int y;
 
         @Override
         public String toString() {
-          return WxMpGsonBuilder.create().toJson(this);
+          return WxGsonBuilder.create().toJson(this);
         }
       }
     }
   }
 
-  public static WxMpImgProcQrCodeResult fromJson(String json) {
-    return WxMpGsonBuilder.create().fromJson(json, WxMpImgProcQrCodeResult.class);
+  public static WxImgProcQrCodeResult fromJson(String json) {
+    return WxGsonBuilder.create().fromJson(json, WxImgProcQrCodeResult.class);
   }
 
   @Override
   public String toString() {
-    return WxMpGsonBuilder.create().toJson(this);
+    return WxGsonBuilder.create().toJson(this);
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/imgproc/WxImgProcSuperResolutionResult.java

@@ -0,0 +1,28 @@
+package me.chanjar.weixin.common.bean.imgproc;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 图片高清化返回结果
+ * @author Theo Nie
+ */
+@Data
+public class WxImgProcSuperResolutionResult implements Serializable {
+  private static final long serialVersionUID = 8007440280170407021L;
+
+  @SerializedName("media_id")
+  private String mediaId;
+
+  @Override
+  public String toString() {
+    return WxGsonBuilder.create().toJson(this);
+  }
+
+  public static WxImgProcSuperResolutionResult fromJson(String json) {
+    return WxGsonBuilder.create().fromJson(json, WxImgProcSuperResolutionResult.class);
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java

@@ -2,6 +2,7 @@
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import me.chanjar.weixin.common.api.WxImgProcService;
 import me.chanjar.weixin.common.api.WxOcrService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.service.WxService;
@@ -295,4 +296,12 @@ public interface WxMaService extends WxService {
    * @return 。
    */
   WxOcrService getOcrService();
+
+  /**
+   * 返回图像处理接口的实现类对象，以方便调用其各个接口.
+   *
+   * @return WxImgProcService
+   */
+  WxImgProcService getImgProcService();
+
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java

@@ -8,6 +8,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.api.WxImgProcService;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.api.WxOcrService;
 import me.chanjar.weixin.common.bean.WxAccessToken;
@@ -59,6 +60,7 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
   private final WxMaLiveService liveService = new WxMaLiveServiceImpl(this);
   private final WxMaLiveGoodsService liveGoodsService = new WxMaLiveGoodsServiceImpl(this);
   private final WxOcrService ocrService = new WxMaOcrServiceImpl(this);
+  private final WxImgProcService imgProcService = new WxMaImgProcServiceImpl(this);
 
   private int retrySleepMillis = 1000;
   private int maxRetryTimes = 5;
@@ -408,4 +410,9 @@ public WxOcrService getOcrService() {
     return this.ocrService;
   }
 
+  @Override
+  public WxImgProcService getImgProcService() {
+    return this.imgProcService;
+  }
+
 }