From 00a54a11196ec4763c9ac409c7e3f93181ca1a69 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 5 Sep 2019 14:18:47 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=87=8D=E6=9E=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/open/api/WxOpenFastMaService.java | 2 +- .../open/api/impl/WxOpenFastMaServiceImpl.java | 4 +--- .../open/api/impl/WxOpenMaServiceImpl.java | 2 +- .../bean/{fastma => ma}/WxFastMaCategory.java | 16 +++++++++------- .../MaQrCodeApacheHttpRequestExecutor.java | 2 +- .../MaQrCodeJoddHttpRequestExecutor.java | 2 +- .../MaQrCodeOkhttpRequestExecutor.java | 4 +--- .../ma => executor}/MaQrCodeRequestExecutor.java | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) rename weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/{fastma => ma}/WxFastMaCategory.java (54%) rename weixin-java-open/src/main/java/me/chanjar/weixin/open/{util/requestexecuter/ma => executor}/MaQrCodeApacheHttpRequestExecutor.java (98%) rename weixin-java-open/src/main/java/me/chanjar/weixin/open/{util/requestexecuter/ma => executor}/MaQrCodeJoddHttpRequestExecutor.java (97%) rename weixin-java-open/src/main/java/me/chanjar/weixin/open/{util/requestexecuter/ma => executor}/MaQrCodeOkhttpRequestExecutor.java (93%) rename weixin-java-open/src/main/java/me/chanjar/weixin/open/{util/requestexecuter/ma => executor}/MaQrCodeRequestExecutor.java (96%) diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java index 2c7c374c..8710689c 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenFastMaService.java @@ -2,7 +2,7 @@ package me.chanjar.weixin.open.api; 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; diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java index 20981e86..01a808ed 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java @@ -7,11 +7,9 @@ import com.google.gson.JsonObject; 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; diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java index 93c776c0..6ee261fc 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java +++ b/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.WxMaOpenCommitExtInfo; 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; diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/fastma/WxFastMaCategory.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxFastMaCategory.java similarity index 54% rename from weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/fastma/WxFastMaCategory.java rename to weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxFastMaCategory.java index 1c0cbeb3..3c0d2bab 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/fastma/WxFastMaCategory.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxFastMaCategory.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.open.bean.fastma; +package me.chanjar.weixin.open.bean.ma; import lombok.Data; @@ -6,30 +6,32 @@ 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 certicates; + private List certicates; @Data - public static class certicaty { + public static class Certificate { private String key; private String value; } diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeApacheHttpRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeApacheHttpRequestExecutor.java similarity index 98% rename from weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeApacheHttpRequestExecutor.java rename to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeApacheHttpRequestExecutor.java index b3936458..86417686 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeApacheHttpRequestExecutor.java +++ b/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; diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeJoddHttpRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java similarity index 97% rename from weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeJoddHttpRequestExecutor.java rename to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java index dcdffd1b..f376dd45 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeJoddHttpRequestExecutor.java +++ b/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; diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeOkhttpRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeOkhttpRequestExecutor.java similarity index 93% rename from weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeOkhttpRequestExecutor.java rename to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeOkhttpRequestExecutor.java index 76627901..b7e56718 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeOkhttpRequestExecutor.java +++ b/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 @@ import java.util.UUID; * @date 2018-09-13 */ public class MaQrCodeOkhttpRequestExecutor extends MaQrCodeRequestExecutor { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public MaQrCodeOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeRequestExecutor.java similarity index 96% rename from weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeRequestExecutor.java rename to weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeRequestExecutor.java index 807f7ae1..5f13a46e 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/util/requestexecuter/ma/MaQrCodeRequestExecutor.java +++ b/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;