🎨 重构部分包结构

Author: binarywang

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java

@@ -2,7 +2,7 @@
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.open.bean.fastma.WxFastMaCategory;
+import me.chanjar.weixin.open.bean.ma.WxFastMaCategory;
 import me.chanjar.weixin.open.bean.result.*;
 
 import java.util.List;

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java

@@ -7,11 +7,9 @@
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.open.api.WxOpenComponentService;
 import me.chanjar.weixin.open.api.WxOpenFastMaService;
-import me.chanjar.weixin.open.bean.fastma.WxFastMaCategory;
+import me.chanjar.weixin.open.bean.ma.WxFastMaCategory;
 import me.chanjar.weixin.open.bean.result.*;
 import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.List;

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java

@@ -13,7 +13,7 @@
 import me.chanjar.weixin.open.bean.ma.WxMaQrcodeParam;
 import me.chanjar.weixin.open.bean.message.WxOpenMaSubmitAuditMessage;
 import me.chanjar.weixin.open.bean.result.*;
-import me.chanjar.weixin.open.util.requestexecuter.ma.MaQrCodeRequestExecutor;
+import me.chanjar.weixin.open.executor.MaQrCodeRequestExecutor;
 
 import java.io.File;
 import java.util.List;

weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/fastma/WxFastMaCategory.java renamed to weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxFastMaCategory.java

@@ -1,35 +1,37 @@
-package me.chanjar.weixin.open.bean.fastma;
+package me.chanjar.weixin.open.bean.ma;
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
+ * 修改更新类目所需实体.
+ *
  * @author Hipple
- * @description 修改更新类目所需实体
  * @since 2019/1/25 10:49
  */
 @Data
 public class WxFastMaCategory implements Serializable {
+  private static final long serialVersionUID = 1595589596066509155L;
 
   /**
-   * 一级类目ID
+   * 一级类目ID.
    */
   private int first;
 
   /**
-   * 二级类目ID
+   * 二级类目ID.
    */
   private int second;
 
   /**
-   * 资质信息
+   * 资质信息.
    */
-  private List<certicaty> certicates;
+  private List<Certificate> certicates;
 
   @Data
-  public static class certicaty {
+  public static class Certificate {
     private String key;
     private String value;
   }

weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeApacheHttpRequestExecutor.java renamed to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeApacheHttpRequestExecutor.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.open.util.requestexecuter.ma;
+package me.chanjar.weixin.open.executor;
 
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;

weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeJoddHttpRequestExecutor.java renamed to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.open.util.requestexecuter.ma;
+package me.chanjar.weixin.open.executor;
 
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;

weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeOkhttpRequestExecutor.java renamed to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeOkhttpRequestExecutor.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.open.util.requestexecuter.ma;
+package me.chanjar.weixin.open.executor;
 
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;
@@ -25,8 +25,6 @@
  * @date 2018-09-13
  */
 public class MaQrCodeOkhttpRequestExecutor extends MaQrCodeRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
-  private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
   public MaQrCodeOkhttpRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }

weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeRequestExecutor.java renamed to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeRequestExecutor.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.open.util.requestexecuter.ma;
+package me.chanjar.weixin.open.executor;
 
 import java.io.File;
 import java.io.IOException;