From ff064c8663dd0d0cf4a79e88794ca388e8b6259d Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 24 Nov 2020 09:59:32 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=87=8D=E6=9E=84=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?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 --- .../api/impl/WxMaAnalysisServiceImpl.java | 2 +- .../miniapp/api/impl/WxMaCloudServiceImpl.java | 2 +- .../miniapp/api/impl/WxMaCodeServiceImpl.java | 2 +- .../api/impl/WxMaExpressServiceImpl.java | 2 +- .../api/impl/WxMaLiveGoodsServiceImpl.java | 2 +- .../miniapp/api/impl/WxMaLiveServiceImpl.java | 2 +- .../miniapp/api/impl/WxMaMsgServiceImpl.java | 2 +- .../api/impl/WxMaPluginServiceImpl.java | 2 +- .../api/impl/WxMaQrcodeServiceImpl.java | 6 +++--- .../api/impl/WxMaSettingServiceImpl.java | 2 +- .../api/impl/WxMaSubscribeServiceImpl.java | 2 +- .../bean/AbstractWxMaQrcodeWrapper.java | 2 +- .../bean/WxMaAuditMediaUploadResult.java | 18 ++++++++++-------- .../wx/miniapp/bean/WxMaDomainAction.java | 2 +- .../miniapp/bean/WxMaJscode2SessionResult.java | 2 +- .../wx/miniapp/bean/WxMaKefuMessage.java | 2 +- .../bean/WxMaMediaAsyncCheckResult.java | 2 +- .../wx/miniapp/bean/WxMaMessage.java | 2 +- .../wx/miniapp/bean/WxMaPhoneNumberInfo.java | 2 +- .../binarywang/wx/miniapp/bean/WxMaQrcode.java | 2 +- .../wx/miniapp/bean/WxMaRunStepInfo.java | 2 +- .../wx/miniapp/bean/WxMaShareInfo.java | 2 +- .../wx/miniapp/bean/WxMaSubscribeMessage.java | 2 +- .../wx/miniapp/bean/WxMaUniformMessage.java | 5 +++-- .../wx/miniapp/bean/WxMaUserInfo.java | 2 +- .../cn/binarywang/wx/miniapp/bean/WxaCode.java | 2 +- .../wx/miniapp/bean/WxaCodeUnlimit.java | 2 +- .../miniapp/bean/analysis/WxMaRetainInfo.java | 2 +- .../bean/analysis/WxMaUserPortrait.java | 2 +- .../bean/analysis/WxMaVisitDistribution.java | 2 +- .../miniapp/bean/code/WxMaCodeAuditStatus.java | 2 +- .../bean/code/WxMaCodeCommitRequest.java | 2 +- .../bean/code/WxMaCodeSubmitAuditRequest.java | 2 +- .../bean/code/WxMaCodeVersionDistribution.java | 2 +- .../bean/express/WxMaExpressAccount.java | 2 +- .../bean/express/WxMaExpressDelivery.java | 2 +- .../miniapp/bean/express/WxMaExpressPath.java | 2 +- .../bean/express/WxMaExpressPrinter.java | 2 +- .../request/WxMaExpressAddOrderRequest.java | 2 +- .../request/WxMaExpressBindAccountRequest.java | 2 +- .../request/WxMaExpressGetOrderRequest.java | 2 +- .../WxMaExpressPrinterUpdateRequest.java | 2 +- .../WxMaExpressTestUpdateOrderRequest.java | 2 +- .../result/WxMaExpressOrderInfoResult.java | 2 +- .../miniapp/bean/live/WxMaAssistantResult.java | 2 +- .../wx/miniapp/bean/live/WxMaLiveResult.java | 2 +- .../config/impl/WxMaDefaultConfigImpl.java | 2 +- .../ApacheAuditMediaUploadRequestExecutor.java | 10 +++++----- .../AuditMediaUploadRequestExecutor.java | 16 ++++++++-------- ...oddHttpAuditMediaUploadRequestExecutor.java | 9 ++++----- .../OkHttpAuditMediaUploadRequestExecutor.java | 10 +++++----- .../QrcodeBytesRequestExecutor.java | 2 +- .../QrcodeFileRequestExecutor.java | 2 +- .../QrcodeRequestExecutor.java | 2 +- .../{util => }/json/WxMaGsonBuilder.java | 3 ++- .../WxMaCodeCommitRequestGsonAdapter.java | 3 ++- ...WxMaCodeVersionDistributionGsonAdapter.java | 2 +- .../adaptor}/WxMaRetainInfoGsonAdapter.java | 2 +- .../WxMaSubscribeMessageGsonAdapter.java | 2 +- .../WxMaUniformMessageGsonAdapter.java | 2 +- .../adaptor}/WxMaUserPortraitGsonAdapter.java | 2 +- .../WxMaVisitDistributionGsonAdapter.java | 2 +- .../api/impl/WxMaExpressServiceImplTest.java | 2 +- .../WxMaUniformMessageGsonAdapterTest.java | 2 +- .../open/api/impl/WxOpenMaServiceImpl.java | 2 +- .../wxpay/service/impl/EntPayServiceImpl.java | 13 +++---------- ...esultTest.java => WxPayBillResultTest.java} | 0 67 files changed, 101 insertions(+), 104 deletions(-) rename weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxAuditMediaUploadResult.java => weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaAuditMediaUploadResult.java (51%) rename {weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache => weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor}/ApacheAuditMediaUploadRequestExecutor.java (82%) rename {weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http => weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor}/AuditMediaUploadRequestExecutor.java (59%) rename {weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd => weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor}/JoddHttpAuditMediaUploadRequestExecutor.java (77%) rename {weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp => weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor}/OkHttpAuditMediaUploadRequestExecutor.java (77%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util => executor}/QrcodeBytesRequestExecutor.java (98%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util => executor}/QrcodeFileRequestExecutor.java (98%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util => executor}/QrcodeRequestExecutor.java (98%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util => }/json/WxMaGsonBuilder.java (94%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaCodeCommitRequestGsonAdapter.java (90%) mode change 100755 => 100644 rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaCodeVersionDistributionGsonAdapter.java (97%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaRetainInfoGsonAdapter.java (97%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaSubscribeMessageGsonAdapter.java (96%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaUniformMessageGsonAdapter.java (98%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaUserPortraitGsonAdapter.java (98%) rename weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/{util/json => json/adaptor}/WxMaVisitDistributionGsonAdapter.java (97%) rename weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/{util => }/json/WxMaUniformMessageGsonAdapterTest.java (98%) rename weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/{WxPayTradeFundBillResultTest.java => WxPayBillResultTest.java} (100%) diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaAnalysisServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaAnalysisServiceImpl.java index db6964271..b0f160659 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaAnalysisServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaAnalysisServiceImpl.java @@ -8,7 +8,7 @@ import cn.binarywang.wx.miniapp.bean.analysis.WxMaUserPortrait; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitDistribution; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitPage; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitTrend; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import lombok.AllArgsConstructor; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java index 300ded88f..c4058e152 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java @@ -5,7 +5,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.cloud.*; import cn.binarywang.wx.miniapp.constant.WxMaConstants; import cn.binarywang.wx.miniapp.util.JoinerUtils; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java index 2d965b4c4..4d73f6aa1 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java @@ -19,7 +19,7 @@ import cn.binarywang.wx.miniapp.bean.code.WxMaCodeAuditStatus; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeCommitRequest; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeSubmitAuditRequest; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeVersionDistribution; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import me.chanjar.weixin.common.error.WxError; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java index 21d0bfe0b..ab2d23c9d 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java @@ -8,7 +8,7 @@ import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPath; import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPrinter; import cn.binarywang.wx.miniapp.bean.express.request.*; import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressOrderInfoResult; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java index ba776a8f5..a3ff950c2 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java @@ -4,7 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaLiveGoodsService; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.live.WxMaLiveGoodInfo; import cn.binarywang.wx.miniapp.bean.live.WxMaLiveResult; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java index e3af02825..cc3b266dc 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java @@ -6,7 +6,7 @@ import cn.binarywang.wx.miniapp.bean.live.WxMaAssistantResult; import cn.binarywang.wx.miniapp.bean.live.WxMaLiveAssistantInfo; import cn.binarywang.wx.miniapp.bean.live.WxMaLiveResult; import cn.binarywang.wx.miniapp.bean.live.WxMaLiveRoomInfo; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.common.base.Joiner; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java index f647a80fe..776a17a25 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java @@ -4,7 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaMsgService; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.*; import cn.binarywang.wx.miniapp.constant.WxMaConstants; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.enums.WxType; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaPluginServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaPluginServiceImpl.java index 134ed66d5..643b3e059 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaPluginServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaPluginServiceImpl.java @@ -3,7 +3,7 @@ package cn.binarywang.wx.miniapp.api.impl; import cn.binarywang.wx.miniapp.api.WxMaPluginService; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaPluginListResult; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.common.collect.ImmutableMap; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java index dbd8fa3e5..524be9fe9 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java @@ -6,9 +6,9 @@ import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; import cn.binarywang.wx.miniapp.bean.WxMaQrcode; import cn.binarywang.wx.miniapp.bean.WxaCode; import cn.binarywang.wx.miniapp.bean.WxaCodeUnlimit; -import cn.binarywang.wx.miniapp.util.QrcodeBytesRequestExecutor; -import cn.binarywang.wx.miniapp.util.QrcodeFileRequestExecutor; -import cn.binarywang.wx.miniapp.util.QrcodeRequestExecutor; +import cn.binarywang.wx.miniapp.executor.QrcodeBytesRequestExecutor; +import cn.binarywang.wx.miniapp.executor.QrcodeFileRequestExecutor; +import cn.binarywang.wx.miniapp.executor.QrcodeRequestExecutor; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSettingServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSettingServiceImpl.java index c69a58d1b..3980f145f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSettingServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSettingServiceImpl.java @@ -3,7 +3,7 @@ package cn.binarywang.wx.miniapp.api.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaSettingService; import cn.binarywang.wx.miniapp.bean.WxMaDomainAction; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImpl.java index 8682612a9..faa88a638 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImpl.java @@ -3,7 +3,7 @@ package cn.binarywang.wx.miniapp.api.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaSubscribeService; import cn.binarywang.wx.miniapp.bean.template.WxMaPubTemplateTitleListResult; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.gson.reflect.TypeToken; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java index cb444c94c..c7fbe1066 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; /** * 微信二维码（小程序码）包装器. diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxAuditMediaUploadResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaAuditMediaUploadResult.java similarity index 51% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxAuditMediaUploadResult.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaAuditMediaUploadResult.java index 916fe1815..646866252 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxAuditMediaUploadResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaAuditMediaUploadResult.java @@ -1,10 +1,11 @@ -package me.chanjar.weixin.common.bean.result; - -import java.io.Serializable; +package cn.binarywang.wx.miniapp.bean; +import com.google.gson.annotations.SerializedName; import lombok.Data; import me.chanjar.weixin.common.util.json.WxGsonBuilder; +import java.io.Serializable; + /** * 小程序 提审素材上传接口 * @@ -12,15 +13,16 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; * @since 2020/11/14 */ @Data -public class WxAuditMediaUploadResult implements Serializable { - +public class WxMaAuditMediaUploadResult implements Serializable { private static final long serialVersionUID = 1L; private String type; - private String mediaid; - public static WxAuditMediaUploadResult fromJson(String json) { - return WxGsonBuilder.create().fromJson(json, WxAuditMediaUploadResult.class); + @SerializedName("mediaid") + private String mediaId; + + public static WxMaAuditMediaUploadResult fromJson(String json) { + return WxGsonBuilder.create().fromJson(json, WxMaAuditMediaUploadResult.class); } @Override diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java index 19a6a1cde..b41782597 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java index 85b476770..af113e4ec 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaKefuMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaKefuMessage.java index 73ca435d6..5d16b60b7 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaKefuMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaKefuMessage.java @@ -4,7 +4,7 @@ import cn.binarywang.wx.miniapp.builder.ImageMessageBuilder; import cn.binarywang.wx.miniapp.builder.LinkMessageBuilder; import cn.binarywang.wx.miniapp.builder.MaPageMessageBuilder; import cn.binarywang.wx.miniapp.builder.TextMessageBuilder; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java index e7fda61a0..f4428b959 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java index 08a2e5794..57d6a5b9b 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java @@ -2,7 +2,7 @@ package cn.binarywang.wx.miniapp.bean; import cn.binarywang.wx.miniapp.config.WxMaConfig; import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import cn.binarywang.wx.miniapp.util.xml.XStreamTransformer; import com.google.gson.annotations.SerializedName; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java index 149ecbebe..da481f098 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java index 5c17cd1e5..cb505a165 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaRunStepInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaRunStepInfo.java index 5e6ff641c..fe9e74b3f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaRunStepInfo.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaRunStepInfo.java @@ -3,7 +3,7 @@ package cn.binarywang.wx.miniapp.bean; import java.io.Serializable; import java.util.List; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaShareInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaShareInfo.java index 91aff519c..e8c7f1a9a 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaShareInfo.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaShareInfo.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java index 74f3f6a61..edf4dc3c3 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java @@ -1,7 +1,7 @@ package cn.binarywang.wx.miniapp.bean; import cn.binarywang.wx.miniapp.constant.WxMaConstants; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.*; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUniformMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUniformMessage.java index 4cb4c8697..6df12b1b8 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUniformMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUniformMessage.java @@ -4,7 +4,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.adaptor.WxMaUniformMessageGsonAdapter; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -99,7 +100,7 @@ public class WxMaUniformMessage implements Serializable { private String appid; /** * 注意，此属性不是最终的json字符串，可结合以下两个属性一起使用，确定最终json字符串是什么 - * 转换的代码逻辑，请阅读 {@link cn.binarywang.wx.miniapp.util.json.WxMaUniformMessageGsonAdapter} + * 转换的代码逻辑，请阅读 {@link WxMaUniformMessageGsonAdapter} */ private String pagePath; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUserInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUserInfo.java index 368fa772c..86b14f755 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUserInfo.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaUserInfo.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCode.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCode.java index 2d94f05ce..2361355ad 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCode.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCode.java @@ -2,7 +2,7 @@ package cn.binarywang.wx.miniapp.bean; import java.io.Serializable; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCodeUnlimit.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCodeUnlimit.java index 05bf134c6..ab0dad4e2 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCodeUnlimit.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxaCodeUnlimit.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaRetainInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaRetainInfo.java index 7021a180e..8006cca01 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaRetainInfo.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaRetainInfo.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.analysis; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaUserPortrait.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaUserPortrait.java index 5e1164909..0dcf30ee3 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaUserPortrait.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaUserPortrait.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.analysis; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaVisitDistribution.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaVisitDistribution.java index 1655eec28..84a8ac122 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaVisitDistribution.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/analysis/WxMaVisitDistribution.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.analysis; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java index 3faa18660..d8733756c 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.code; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java index f59fb1f03..788f16641 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.code; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java index b65c4df58..ff245c8e6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.code; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java index dd0a03a91..9a57933d7 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.code; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java index 950bda306..d783c29ac 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java index dbdb02c11..7a5465ee3 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java index bbd3feacd..28c0bcdfc 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java index b41d33305..2c1e98602 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java index e11f5beb6..01056753f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java @@ -2,7 +2,7 @@ package cn.binarywang.wx.miniapp.bean.express.request; import cn.binarywang.wx.miniapp.bean.express.*; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java index be0ef991c..aee69f974 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express.request; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java index 6fe03ddae..419be9e60 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express.request; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java index da47f7704..e3aea495f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express.request; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java index c0a856124..3377a7e77 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express.request; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java index fb47057d8..9502eee82 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.express.result; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaAssistantResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaAssistantResult.java index 4137efc9f..b508b2e09 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaAssistantResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaAssistantResult.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.live; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.Data; import java.io.Serializable; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java index be8997872..9c8fc4016 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java @@ -1,6 +1,6 @@ package cn.binarywang.wx.miniapp.bean.live; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java index 94e09bc5c..73104bd36 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java @@ -1,7 +1,7 @@ package cn.binarywang.wx.miniapp.config.impl; import cn.binarywang.wx.miniapp.config.WxMaConfig; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheAuditMediaUploadRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheAuditMediaUploadRequestExecutor.java similarity index 82% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheAuditMediaUploadRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheAuditMediaUploadRequestExecutor.java index a390b9f9d..782dc46f2 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheAuditMediaUploadRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheAuditMediaUploadRequestExecutor.java @@ -1,15 +1,15 @@ -package me.chanjar.weixin.common.util.http.apache; +package cn.binarywang.wx.miniapp.executor; import java.io.File; import java.io.IOException; -import me.chanjar.weixin.common.bean.result.WxAuditMediaUploadResult; import me.chanjar.weixin.common.enums.WxType; import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.common.util.http.AuditMediaUploadRequestExecutor; import me.chanjar.weixin.common.util.http.RequestHttp; +import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; +import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -30,7 +30,7 @@ public class ApacheAuditMediaUploadRequestExecutor extends AuditMediaUploadReque } @Override - public WxAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { + public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { HttpPost httpPost = new HttpPost(uri); if (requestHttp.getRequestHttpProxy() != null) { RequestConfig config = RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build(); @@ -50,7 +50,7 @@ public class ApacheAuditMediaUploadRequestExecutor extends AuditMediaUploadReque if (error.getErrorCode() != 0) { throw new WxErrorException(error); } - return WxAuditMediaUploadResult.fromJson(responseContent); + return WxMaAuditMediaUploadResult.fromJson(responseContent); } finally { httpPost.releaseConnection(); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AuditMediaUploadRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/AuditMediaUploadRequestExecutor.java similarity index 59% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AuditMediaUploadRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/AuditMediaUploadRequestExecutor.java index aeb6894e0..6aad5cfdc 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AuditMediaUploadRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/AuditMediaUploadRequestExecutor.java @@ -1,14 +1,14 @@ -package me.chanjar.weixin.common.util.http; +package cn.binarywang.wx.miniapp.executor; import java.io.File; import java.io.IOException; -import me.chanjar.weixin.common.bean.result.WxAuditMediaUploadResult; +import me.chanjar.weixin.common.util.http.RequestExecutor; +import me.chanjar.weixin.common.util.http.RequestHttp; +import me.chanjar.weixin.common.util.http.ResponseHandler; import me.chanjar.weixin.common.enums.WxType; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.common.util.http.apache.ApacheAuditMediaUploadRequestExecutor; -import me.chanjar.weixin.common.util.http.jodd.JoddHttpAuditMediaUploadRequestExecutor; -import me.chanjar.weixin.common.util.http.okhttp.OkHttpAuditMediaUploadRequestExecutor; +import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult; /** * 小程序 提审素材上传接口 @@ -18,7 +18,7 @@ import me.chanjar.weixin.common.util.http.okhttp.OkHttpAuditMediaUploadRequestEx * @author yangyh22 * @since 2020/11/14 */ -public abstract class AuditMediaUploadRequestExecutor implements RequestExecutor { +public abstract class AuditMediaUploadRequestExecutor implements RequestExecutor { protected RequestHttp requestHttp; @@ -27,11 +27,11 @@ public abstract class AuditMediaUploadRequestExecutor implements RequestEx } @Override - public void execute(String uri, File data, ResponseHandler handler, WxType wxType) throws WxErrorException, IOException { + public void execute(String uri, File data, ResponseHandler handler, WxType wxType) throws WxErrorException, IOException { handler.handle(this.execute(uri, data, wxType)); } - public static RequestExecutor create(RequestHttp requestHttp) { + public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: return new ApacheAuditMediaUploadRequestExecutor(requestHttp); diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpAuditMediaUploadRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/JoddHttpAuditMediaUploadRequestExecutor.java similarity index 77% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpAuditMediaUploadRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/JoddHttpAuditMediaUploadRequestExecutor.java index 4747dc843..cce799098 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpAuditMediaUploadRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/JoddHttpAuditMediaUploadRequestExecutor.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.common.util.http.jodd; +package cn.binarywang.wx.miniapp.executor; import java.io.File; import java.io.IOException; @@ -8,12 +8,11 @@ import jodd.http.HttpConnectionProvider; import jodd.http.HttpRequest; import jodd.http.HttpResponse; import jodd.http.ProxyInfo; -import me.chanjar.weixin.common.bean.result.WxAuditMediaUploadResult; import me.chanjar.weixin.common.enums.WxType; import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.common.util.http.AuditMediaUploadRequestExecutor; import me.chanjar.weixin.common.util.http.RequestHttp; +import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult; /** * @author yangyh22 @@ -26,7 +25,7 @@ public class JoddHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadReq } @Override - public WxAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { + public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { HttpRequest request = HttpRequest.post(uri); if (requestHttp.getRequestHttpProxy() != null) { requestHttp.getRequestHttpClient().useProxy(requestHttp.getRequestHttpProxy()); @@ -41,6 +40,6 @@ public class JoddHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadReq if (error.getErrorCode() != 0) { throw new WxErrorException(error); } - return WxAuditMediaUploadResult.fromJson(responseContent); + return WxMaAuditMediaUploadResult.fromJson(responseContent); } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpAuditMediaUploadRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/OkHttpAuditMediaUploadRequestExecutor.java similarity index 77% rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpAuditMediaUploadRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/OkHttpAuditMediaUploadRequestExecutor.java index 78f4c4af0..808f16d83 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpAuditMediaUploadRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/OkHttpAuditMediaUploadRequestExecutor.java @@ -1,14 +1,14 @@ -package me.chanjar.weixin.common.util.http.okhttp; +package cn.binarywang.wx.miniapp.executor; import java.io.File; import java.io.IOException; -import me.chanjar.weixin.common.bean.result.WxAuditMediaUploadResult; import me.chanjar.weixin.common.enums.WxType; import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.common.util.http.AuditMediaUploadRequestExecutor; import me.chanjar.weixin.common.util.http.RequestHttp; +import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult; +import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; @@ -27,7 +27,7 @@ public class OkHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadReque } @Override - public WxAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { + public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException { RequestBody body = new MultipartBody.Builder() .setType(MediaType.parse("multipart/form-data")) @@ -43,7 +43,7 @@ public class OkHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadReque if (error.getErrorCode() != 0) { throw new WxErrorException(error); } - return WxAuditMediaUploadResult.fromJson(responseContent); + return WxMaAuditMediaUploadResult.fromJson(responseContent); } } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeBytesRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeBytesRequestExecutor.java similarity index 98% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeBytesRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeBytesRequestExecutor.java index bd473fb21..ab2d262f2 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeBytesRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeBytesRequestExecutor.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util; +package cn.binarywang.wx.miniapp.executor; import cn.binarywang.wx.miniapp.bean.AbstractWxMaQrcodeWrapper; import me.chanjar.weixin.common.enums.WxType; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeFileRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeFileRequestExecutor.java similarity index 98% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeFileRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeFileRequestExecutor.java index 8d5d67435..6580678ef 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeFileRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeFileRequestExecutor.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util; +package cn.binarywang.wx.miniapp.executor; import cn.binarywang.wx.miniapp.bean.AbstractWxMaQrcodeWrapper; import me.chanjar.weixin.common.enums.WxType; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeRequestExecutor.java similarity index 98% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeRequestExecutor.java index d3b764ff1..83e710dc1 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/QrcodeRequestExecutor.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util; +package cn.binarywang.wx.miniapp.executor; import cn.binarywang.wx.miniapp.bean.AbstractWxMaQrcodeWrapper; import me.chanjar.weixin.common.enums.WxType; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaGsonBuilder.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/WxMaGsonBuilder.java similarity index 94% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaGsonBuilder.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/WxMaGsonBuilder.java index 21b582d5b..e6f6842fa 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaGsonBuilder.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/WxMaGsonBuilder.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; @@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.analysis.WxMaUserPortrait; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitDistribution; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeCommitRequest; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeVersionDistribution; +import cn.binarywang.wx.miniapp.json.adaptor.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeCommitRequestGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeCommitRequestGsonAdapter.java old mode 100755 new mode 100644 similarity index 90% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeCommitRequestGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeCommitRequestGsonAdapter.java index 410f86ca1..accf80fc9 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeCommitRequestGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeCommitRequestGsonAdapter.java @@ -1,6 +1,7 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeCommitRequest; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeVersionDistributionGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeVersionDistributionGsonAdapter.java similarity index 97% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeVersionDistributionGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeVersionDistributionGsonAdapter.java index 027ca6a95..018be6b04 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaCodeVersionDistributionGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaCodeVersionDistributionGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.code.WxMaCodeVersionDistribution; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaRetainInfoGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaRetainInfoGsonAdapter.java similarity index 97% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaRetainInfoGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaRetainInfoGsonAdapter.java index a51972b4b..2e71f9eb4 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaRetainInfoGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaRetainInfoGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.analysis.WxMaRetainInfo; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaSubscribeMessageGsonAdapter.java similarity index 96% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaSubscribeMessageGsonAdapter.java index 89f8bad8d..ac877f8b2 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaSubscribeMessageGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import com.google.gson.JsonElement; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUniformMessageGsonAdapter.java similarity index 98% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUniformMessageGsonAdapter.java index 75ccd68aa..3f81914d0 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUniformMessageGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import java.lang.reflect.Type; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUserPortraitGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUserPortraitGsonAdapter.java similarity index 98% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUserPortraitGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUserPortraitGsonAdapter.java index b8a7c448f..c99fd67ba 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaUserPortraitGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaUserPortraitGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.analysis.WxMaUserPortrait; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaVisitDistributionGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaVisitDistributionGsonAdapter.java similarity index 97% rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaVisitDistributionGsonAdapter.java rename to weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaVisitDistributionGsonAdapter.java index 0fc79d44b..74ae61821 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaVisitDistributionGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/json/adaptor/WxMaVisitDistributionGsonAdapter.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json.adaptor; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitDistribution; import com.google.gson.JsonArray; diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImplTest.java index 6991ad9c2..bf6e23797 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImplTest.java @@ -7,7 +7,7 @@ import cn.binarywang.wx.miniapp.bean.express.request.*; import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressOrderInfoResult; import cn.binarywang.wx.miniapp.constant.WxMaConstants; import cn.binarywang.wx.miniapp.test.ApiTestModule; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.inject.Inject; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapterTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/json/WxMaUniformMessageGsonAdapterTest.java similarity index 98% rename from weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapterTest.java rename to weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/json/WxMaUniformMessageGsonAdapterTest.java index 1ae60070c..7b19136af 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/util/json/WxMaUniformMessageGsonAdapterTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/json/WxMaUniformMessageGsonAdapterTest.java @@ -1,4 +1,4 @@ -package cn.binarywang.wx.miniapp.util.json; +package cn.binarywang.wx.miniapp.json; import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; 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 a8c252bae..24d9e2341 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 @@ -4,7 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.config.WxMaConfig; -import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java index 00e2ede65..be823c8da 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java @@ -8,6 +8,7 @@ import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.EntPayService; import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.util.SignUtils; +import lombok.RequiredArgsConstructor; import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openssl.PEMParser; @@ -30,17 +31,9 @@ import java.util.Base64; * * @author Binary Wang */ +@RequiredArgsConstructor public class EntPayServiceImpl implements EntPayService { - private WxPayService payService; - - /** - * Instantiates a new Ent pay service. - * - * @param payService the pay service - */ - public EntPayServiceImpl(WxPayService payService) { - this.payService = payService; - } + private final WxPayService payService; @Override public EntPayResult entPay(EntPayRequest request) throws WxPayException { diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayTradeFundBillResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java similarity index 100% rename from weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayTradeFundBillResultTest.java rename to weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBillResultTest.java