From 993999735b941115e0ecb285d5f96a5ea6f0ce46 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 14 Nov 2017 11:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8lombok=E7=9A=84@Data=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E7=AE=80=E5=8C=96common=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89bean=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/common/bean/WxAccessToken.java | 18 +---- .../common/bean/WxCardApiSignature.java | 76 +------------------ .../weixin/common/bean/WxJsapiSignature.java | 44 +---------- .../weixin/common/bean/menu/WxMenu.java | 19 +---- .../weixin/common/bean/menu/WxMenuButton.java | 65 +--------------- .../weixin/common/bean/menu/WxMenuRule.java | 58 +------------- .../weixin/common/bean/result/WxError.java | 57 +------------- .../bean/result/WxMediaUploadResult.java | 34 +-------- .../chanjar/weixin/common/util/BeanUtils.java | 2 +- .../common/util/http/HttpResponseProxy.java | 12 +-- .../ApacheSimplePostRequestExecutor.java | 4 +- .../JoddHttpSimplePostRequestExecutor.java | 6 +- .../common/util/json/WxErrorAdapter.java | 17 +++-- .../weixin/common/bean/WxErrorTest.java | 1 - .../weixin/cp/api/WxCpBusyRetryTest.java | 4 +- .../mp/api/impl/WxMpCardServiceImpl.java | 7 +- .../mp/api/impl/WxMpKefuServiceImpl.java | 4 +- .../mp/api/impl/WxMpMaterialServiceImpl.java | 2 +- .../mp/api/impl/WxMpQrcodeServiceImpl.java | 20 ++--- .../datacube/WxDataCubeArticleResult.java | 2 + .../bean/datacube/WxDataCubeArticleTotal.java | 11 +-- .../bean/datacube/WxDataCubeBaseResult.java | 4 +- .../datacube/WxDataCubeInterfaceResult.java | 2 + .../mp/bean/datacube/WxDataCubeMsgResult.java | 17 +++-- .../weixin/mp/bean/device/BaseResp.java | 4 +- .../weixin/mp/bean/device/RespMsg.java | 4 +- .../weixin/mp/bean/device/TransMsgResp.java | 4 +- .../mp/bean/device/WxDeviceAuthorize.java | 2 + .../bean/device/WxDeviceAuthorizeResult.java | 4 +- .../weixin/mp/bean/device/WxDeviceBind.java | 4 +- .../bean/device/WxDeviceBindDeviceResult.java | 4 +- .../mp/bean/device/WxDeviceBindResult.java | 4 +- .../weixin/mp/bean/device/WxDeviceMsg.java | 4 +- .../mp/bean/device/WxDeviceOpenIdResult.java | 4 +- .../mp/bean/device/WxDeviceQrCodeResult.java | 4 +- .../bean/message/WxMpXmlOutImageMessage.java | 2 + .../bean/message/WxMpXmlOutNewsMessage.java | 2 + .../bean/message/WxMpXmlOutTextMessage.java | 2 + .../WxMpXmlOutTransferKefuMessage.java | 2 + .../bean/message/WxMpXmlOutVoiceMessage.java | 2 + ...lVoiceAndImageDownloadRequestExecutor.java | 3 +- .../mp/util/http/QrCodeRequestExecutor.java | 2 +- .../ApacheMaterialUploadRequestExecutor.java | 2 +- .../ApacheMediaImgUploadRequestExecutor.java | 2 +- .../JoddMaterialUploadRequestExecutor.java | 2 +- .../JoddMediaImgUploadRequestExecutor.java | 2 +- .../OkhttpMaterialUploadRequestExecutor.java | 2 +- .../weixin/mp/api/WxMpBusyRetryTest.java | 4 +- 48 files changed, 131 insertions(+), 426 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java index 6476205a..63279651 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java @@ -1,9 +1,11 @@ package me.chanjar.weixin.common.bean; +import lombok.Data; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; +@Data public class WxAccessToken implements Serializable { private static final long serialVersionUID = 8709719312922168909L; @@ -15,20 +17,4 @@ public class WxAccessToken implements Serializable { return WxGsonBuilder.create().fromJson(json, WxAccessToken.class); } - public String getAccessToken() { - return this.accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public int getExpiresIn() { - return this.expiresIn; - } - - public void setExpiresIn(int expiresIn) { - this.expiresIn = expiresIn; - } - } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java index df272318..9d5d7a06 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java @@ -1,17 +1,18 @@ package me.chanjar.weixin.common.bean; +import lombok.Data; import me.chanjar.weixin.common.util.ToStringUtils; import java.io.Serializable; /** - * 卡券Api签名 + * 卡券Api签名. * * @author YuJian * @version 15/11/8 */ +@Data public class WxCardApiSignature implements Serializable { - private static final long serialVersionUID = 158176707226975979L; private String appId; @@ -37,75 +38,4 @@ public class WxCardApiSignature implements Serializable { return ToStringUtils.toSimpleString(this); } - public String getAppId() { - return this.appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getCardId() { - return this.cardId; - } - - public void setCardId(String cardId) { - this.cardId = cardId; - } - - public String getCardType() { - return this.cardType; - } - - public void setCardType(String cardType) { - this.cardType = cardType; - } - - public String getLocationId() { - return this.locationId; - } - - public void setLocationId(String locationId) { - this.locationId = locationId; - } - - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getOpenId() { - return this.openId; - } - - public void setOpenId(String openId) { - this.openId = openId; - } - - public Long getTimestamp() { - return this.timestamp; - } - - public void setTimestamp(Long timestamp) { - this.timestamp = timestamp; - } - - public String getNonceStr() { - return this.nonceStr; - } - - public void setNonceStr(String nonceStr) { - this.nonceStr = nonceStr; - } - - public String getSignature() { - return this.signature; - } - - public void setSignature(String signature) { - this.signature = signature; - } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java index 78371583..619f0a75 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java @@ -1,10 +1,13 @@ package me.chanjar.weixin.common.bean; +import lombok.Data; + import java.io.Serializable; /** - * jspai signature + * jspai signature. */ +@Data public class WxJsapiSignature implements Serializable { private static final long serialVersionUID = -1116808193154384804L; @@ -18,43 +21,4 @@ public class WxJsapiSignature implements Serializable { private String signature; - public String getSignature() { - return this.signature; - } - - public void setSignature(String signature) { - this.signature = signature; - } - - public String getNonceStr() { - return nonceStr; - } - - public void setNonceStr(String nonceStr) { - this.nonceStr = nonceStr; - } - - public long getTimestamp() { - return this.timestamp; - } - - public void setTimestamp(long timestamp) { - this.timestamp = timestamp; - } - - public String getUrl() { - return this.url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java index d82431c9..4d349acb 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.common.bean.menu; +import lombok.Data; import me.chanjar.weixin.common.util.ToStringUtils; import me.chanjar.weixin.common.util.json.WxGsonBuilder; @@ -15,8 +16,8 @@ import java.util.List; * * @author Daniel Qian */ +@Data public class WxMenu implements Serializable { - private static final long serialVersionUID = -7083914585539687746L; private List buttons = new ArrayList<>(); @@ -40,22 +41,6 @@ public class WxMenu implements Serializable { .fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), WxMenu.class); } - public List getButtons() { - return this.buttons; - } - - public void setButtons(List buttons) { - this.buttons = buttons; - } - - public WxMenuRule getMatchRule() { - return this.matchRule; - } - - public void setMatchRule(WxMenuRule matchRule) { - this.matchRule = matchRule; - } - public String toJson() { return WxGsonBuilder.create().toJson(this); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java index 1c32ef10..2f9276b0 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java @@ -1,12 +1,14 @@ package me.chanjar.weixin.common.bean.menu; import com.google.gson.annotations.SerializedName; +import lombok.Data; import me.chanjar.weixin.common.util.ToStringUtils; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +@Data public class WxMenuButton implements Serializable { private static final long serialVersionUID = -1070939403109776555L; @@ -77,67 +79,4 @@ public class WxMenuButton implements Serializable { return ToStringUtils.toSimpleString(this); } - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type = type; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getKey() { - return this.key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getUrl() { - return this.url; - } - - public void setUrl(String url) { - this.url = url; - } - - public List getSubButtons() { - return this.subButtons; - } - - public void setSubButtons(List subButtons) { - this.subButtons = subButtons; - } - - public String getMediaId() { - return this.mediaId; - } - - public void setMediaId(String mediaId) { - this.mediaId = mediaId; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getPagePath() { - return pagePath; - } - - public void setPagePath(String pagePath) { - this.pagePath = pagePath; - } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java index dffae948..16542dec 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java @@ -1,10 +1,12 @@ package me.chanjar.weixin.common.bean.menu; import com.google.gson.annotations.SerializedName; +import lombok.Data; import me.chanjar.weixin.common.util.ToStringUtils; import java.io.Serializable; +@Data public class WxMenuRule implements Serializable { private static final long serialVersionUID = -4587181819499286670L; @@ -20,62 +22,6 @@ public class WxMenuRule implements Serializable { private String clientPlatformType; private String language; - public String getTagId() { - return this.tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getSex() { - return this.sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public String getCountry() { - return this.country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getProvince() { - return this.province; - } - - public void setProvince(String province) { - this.province = province; - } - - public String getCity() { - return this.city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getClientPlatformType() { - return this.clientPlatformType; - } - - public void setClientPlatformType(String clientPlatformType) { - this.clientPlatformType = clientPlatformType; - } - - public String getLanguage() { - return this.language; - } - - public void setLanguage(String language) { - this.language = language; - } - @Override public String toString() { return ToStringUtils.toSimpleString(this); diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java index 809d015a..25a06f47 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java @@ -1,5 +1,7 @@ package me.chanjar.weixin.common.bean.result; +import lombok.Builder; +import lombok.Data; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; @@ -9,6 +11,8 @@ import java.io.Serializable; * * @author Daniel Qian */ +@Data +@Builder public class WxError implements Serializable { private static final long serialVersionUID = 7869786563361406291L; @@ -23,34 +27,6 @@ public class WxError implements Serializable { return WxGsonBuilder.create().fromJson(json, WxError.class); } - public static Builder newBuilder() { - return new Builder(); - } - - public int getErrorCode() { - return this.errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getErrorMsg() { - return this.errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public String getJson() { - return this.json; - } - - public void setJson(String json) { - this.json = json; - } - @Override public String toString() { if (this.json != null) { @@ -59,29 +35,4 @@ public class WxError implements Serializable { return "错误: Code=" + this.errorCode + ", Msg=" + this.errorMsg; } - public static class Builder { - private int errorCode; - private String errorMsg; - - public Builder setErrorCode(int errorCode) { - this.errorCode = errorCode; - return this; - } - - public Builder setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - return this; - } - - /** - * 构造器方法. - */ - public WxError build() { - WxError wxError = new WxError(); - wxError.setErrorCode(this.errorCode); - wxError.setErrorMsg(this.errorMsg); - return wxError; - } - - } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java index 2c83d85c..a50018aa 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java @@ -1,10 +1,12 @@ package me.chanjar.weixin.common.bean.result; +import lombok.Data; import me.chanjar.weixin.common.util.ToStringUtils; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; +@Data public class WxMediaUploadResult implements Serializable { private static final long serialVersionUID = 330834334738622341L; @@ -17,38 +19,6 @@ public class WxMediaUploadResult implements Serializable { return WxGsonBuilder.create().fromJson(json, WxMediaUploadResult.class); } - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type = type; - } - - public String getMediaId() { - return this.mediaId; - } - - public void setMediaId(String mediaId) { - this.mediaId = mediaId; - } - - public long getCreatedAt() { - return this.createdAt; - } - - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } - - public String getThumbMediaId() { - return this.thumbMediaId; - } - - public void setThumbMediaId(String thumbMediaId) { - this.thumbMediaId = thumbMediaId; - } - @Override public String toString() { return ToStringUtils.toSimpleString(this); diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java index b9a22600..12ce3a4e 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java @@ -64,7 +64,7 @@ public class BeanUtils { if (!requiredFields.isEmpty()) { String msg = "必填字段 " + requiredFields + " 必须提供值"; log.debug(msg); - throw new WxErrorException(WxError.newBuilder().setErrorMsg(msg).build()); + throw new WxErrorException(WxError.builder().errorMsg(msg).build()); } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java index a75aa963..37efdaaf 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java @@ -19,6 +19,8 @@ import java.util.regex.Pattern; * @author Binary Wang */ public class HttpResponseProxy { + private static final Pattern PATTERN = Pattern.compile(".*filename=\"(.*)\""); + private CloseableHttpResponse apacheHttpResponse; private HttpResponse joddHttpResponse; private Response okHttpResponse; @@ -56,7 +58,7 @@ public class HttpResponseProxy { private String getFileName(CloseableHttpResponse response) throws WxErrorException { Header[] contentDispositionHeader = response.getHeaders("Content-disposition"); if (contentDispositionHeader == null || contentDispositionHeader.length == 0) { - throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build()); + throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build()); } return this.extractFileNameFromContentString(contentDispositionHeader[0].getValue()); @@ -74,15 +76,15 @@ public class HttpResponseProxy { private String extractFileNameFromContentString(String content) throws WxErrorException { if (content == null || content.length() == 0) { - throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build()); + throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build()); } - Pattern p = Pattern.compile(".*filename=\"(.*)\""); - Matcher m = p.matcher(content); + Matcher m = PATTERN.matcher(content); if (m.matches()) { return m.group(1); } - throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build()); + + throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build()); } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java index cc85fa76..1a8a292b 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java @@ -39,9 +39,7 @@ public class ApacheSimplePostRequestExecutor extends SimplePostRequestExecutor")) { diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java index 8fa349c6..57207f1b 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java @@ -5,7 +5,6 @@ import jodd.http.HttpRequest; import jodd.http.HttpResponse; import jodd.http.ProxyInfo; import jodd.util.StringPool; - import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; @@ -40,9 +39,8 @@ public class JoddHttpSimplePostRequestExecutor extends SimplePostRequestExecutor String responseContent = response.bodyText(); if (responseContent.isEmpty()) { - throw new WxErrorException( - WxError.newBuilder().setErrorCode(9999).setErrorMsg("无响应内容") - .build()); + throw new WxErrorException(WxError.builder().errorCode(9999).errorMsg("无响应内容") + .build()); } if (responseContent.startsWith("")) { diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxErrorAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxErrorAdapter.java index cc426bc8..abd0da60 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxErrorAdapter.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxErrorAdapter.java @@ -14,23 +14,26 @@ import me.chanjar.weixin.common.bean.result.WxError; import java.lang.reflect.Type; /** - * @author Daniel Qian + * @author Daniel Qian. */ public class WxErrorAdapter implements JsonDeserializer { @Override - public WxError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - WxError wxError = new WxError(); + public WxError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { + WxError.WxErrorBuilder errorBuilder = WxError.builder(); JsonObject wxErrorJsonObject = json.getAsJsonObject(); if (wxErrorJsonObject.get("errcode") != null && !wxErrorJsonObject.get("errcode").isJsonNull()) { - wxError.setErrorCode(GsonHelper.getAsPrimitiveInt(wxErrorJsonObject.get("errcode"))); + errorBuilder.errorCode(GsonHelper.getAsPrimitiveInt(wxErrorJsonObject.get("errcode"))); } if (wxErrorJsonObject.get("errmsg") != null && !wxErrorJsonObject.get("errmsg").isJsonNull()) { - wxError.setErrorMsg(GsonHelper.getAsString(wxErrorJsonObject.get("errmsg"))); + errorBuilder.errorMsg(GsonHelper.getAsString(wxErrorJsonObject.get("errmsg"))); } - wxError.setJson(json.toString()); - return wxError; + + errorBuilder.json(json.toString()); + + return errorBuilder.build(); } } diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxErrorTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxErrorTest.java index 477fcdab..1c05ea73 100644 --- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxErrorTest.java +++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxErrorTest.java @@ -8,7 +8,6 @@ import org.testng.annotations.*; public class WxErrorTest { public void testFromJson() { - String json = "{ \"errcode\": 40003, \"errmsg\": \"invalid openid\" }"; WxError wxError = WxError.fromJson(json); Assert.assertTrue(wxError.getErrorCode() == 40003); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBusyRetryTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBusyRetryTest.java index 2c964d30..6d4e8ce8 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBusyRetryTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBusyRetryTest.java @@ -24,9 +24,7 @@ public class WxCpBusyRetryTest { RequestExecutor executor, String uri, E data) throws WxErrorException { this.log.info("Executed"); - WxError error = new WxError(); - error.setErrorCode(-1); - throw new WxErrorException(error); + throw new WxErrorException(WxError.builder().errorCode(-1).build()); } }; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java index 8ec5945f..49ed7589 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java @@ -229,10 +229,9 @@ public class WxMpCardServiceImpl implements WxMpCardService { String errcode = json.get("errcode").getAsString(); if (!"0".equals(errcode)) { String errmsg = json.get("errmsg").getAsString(); - WxError error = new WxError(); - error.setErrorCode(Integer.valueOf(errcode)); - error.setErrorMsg(errmsg); - throw new WxErrorException(error); + throw new WxErrorException(WxError.builder() + .errorCode(Integer.valueOf(errcode)).errorMsg(errmsg) + .build()); } return responseContent; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java index 8d98a07a..6bda9e5c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java @@ -112,11 +112,11 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { @Override public WxMpKfMsgList kfMsgList(Date startTime, Date endTime, Long msgId, Integer number) throws WxErrorException { if (number > 10000) { - throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法参数请求,每次最多查询10000条记录!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("非法参数请求,每次最多查询10000条记录!").build()); } if (startTime.after(endTime)) { - throw new WxErrorException(WxError.newBuilder().setErrorMsg("起始时间不能晚于结束时间!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("起始时间不能晚于结束时间!").build()); } JsonObject param = new JsonObject(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java index 3683bb7f..520f69ea 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java @@ -37,7 +37,7 @@ public class WxMpMaterialServiceImpl implements WxMpMaterialService { try { return this.mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType)); } catch (IOException e) { - throw new WxErrorException(WxError.newBuilder().setErrorMsg(e.getMessage()).build(), e); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg(e.getMessage()).build(), e); } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java index 5f6c3ad5..f6af96e5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java @@ -28,13 +28,13 @@ public class WxMpQrcodeServiceImpl implements WxMpQrcodeService { @Override public WxMpQrCodeTicket qrCodeCreateTmpTicket(int sceneId, Integer expireSeconds) throws WxErrorException { if (sceneId == 0) { - throw new WxErrorException(WxError.newBuilder().setErrorCode(-1).setErrorMsg("临时二维码场景值不能为0!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("临时二维码场景值不能为0!").build()); } //expireSeconds 该二维码有效时间,以秒为单位。 最大不超过2592000(即30天),此字段如果不填,则默认有效期为30秒。 if (expireSeconds != null && expireSeconds > 2592000) { - throw new WxErrorException(WxError.newBuilder().setErrorCode(-1) - .setErrorMsg("临时二维码有效时间最大不能超过2592000(即30天)!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1) + .errorMsg("临时二维码有效时间最大不能超过2592000(即30天)!").build()); } if (expireSeconds == null) { @@ -59,13 +59,13 @@ public class WxMpQrcodeServiceImpl implements WxMpQrcodeService { @Override public WxMpQrCodeTicket qrCodeCreateTmpTicket(String sceneStr, Integer expireSeconds) throws WxErrorException { if (StringUtils.isBlank(sceneStr)) { - throw new WxErrorException(WxError.newBuilder().setErrorCode(-1).setErrorMsg("临时二维码场景值不能为空!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("临时二维码场景值不能为空!").build()); } //expireSeconds 该二维码有效时间,以秒为单位。 最大不超过2592000(即30天),此字段如果不填,则默认有效期为30秒。 if (expireSeconds != null && expireSeconds > 2592000) { - throw new WxErrorException(WxError.newBuilder().setErrorCode(-1) - .setErrorMsg("临时二维码有效时间最大不能超过2592000(即30天)!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1) + .errorMsg("临时二维码有效时间最大不能超过2592000(即30天)!").build()); } if (expireSeconds == null) { @@ -90,7 +90,9 @@ public class WxMpQrcodeServiceImpl implements WxMpQrcodeService { @Override public WxMpQrCodeTicket qrCodeCreateLastTicket(int sceneId) throws WxErrorException { if (sceneId < 1 || sceneId > 100000) { - throw new WxErrorException(WxError.newBuilder().setErrorCode(-1).setErrorMsg("永久二维码的场景值目前只支持1--100000!").build()); + throw new WxErrorException(WxError.builder().errorCode(-1) + .errorMsg("永久二维码的场景值目前只支持1--100000!") + .build()); } String url = API_URL_PREFIX + "/create"; @@ -137,9 +139,7 @@ public class WxMpQrcodeServiceImpl implements WxMpQrcodeService { return resultUrl; } catch (UnsupportedEncodingException e) { - WxError error = WxError.newBuilder().setErrorCode(-1) - .setErrorMsg(e.getMessage()).build(); - throw new WxErrorException(error); + throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg(e.getMessage()).build()); } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java index 8fa30651..3901c61f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.datacube; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; * @author Binary Wang */ @Data +@EqualsAndHashCode(callSuper = true) public class WxDataCubeArticleResult extends WxDataCubeBaseResult { private static final long serialVersionUID = -9222452497954511765L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java index f1c98296..bef0e66d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java @@ -3,37 +3,38 @@ package me.chanjar.weixin.mp.bean.datacube; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; /** - * 图文分析数据接口返回结果对象 - *

+ * 图文分析数据接口返回结果对象. * Created by Binary Wang on 2016/8/24. * * @author Binary Wang */ @Data +@EqualsAndHashCode(callSuper = true) public class WxDataCubeArticleTotal extends WxDataCubeBaseResult { private static final long serialVersionUID = -7634365687303052699L; /** - * msgid + * msgid. * 请注意:这里的msgid实际上是由msgid(图文消息id,这也就是群发接口调用后返回的msg_data_id)和index(消息次序索引)组成, 例如12003_3, 其中12003是msgid,即一次群发的消息的id; 3为index,假设该次群发的图文消息共5个文章(因为可能为多图文),3表示5个中的第3个 */ @SerializedName("msgid") private String msgId; /** - * title + * title. * 图文消息的标题 */ @SerializedName("title") private String title; /** - * details + * details. * 详细信息 */ @SerializedName("details") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java index f12b52b1..df86ab4e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** *

- *  统计接口的共用属性类
+ *  统计接口的共用属性类.
  *  Created by Binary Wang on 2016/8/25.
  * 
* @@ -21,7 +21,7 @@ public abstract class WxDataCubeBaseResult implements Serializable { protected static final JsonParser JSON_PARSER = new JsonParser(); /** - * ref_date + * ref_date. * 数据的日期,需在begin_date和end_date之间 */ @SerializedName("ref_date") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java index 2ffd7f99..b151c008 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.datacube; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; * @author Binary Wang */ @Data +@EqualsAndHashCode(callSuper = true) public class WxDataCubeInterfaceResult extends WxDataCubeBaseResult { private static final long serialVersionUID = 597734329161281398L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java index 27afd7bf..1e7e1f58 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java @@ -3,51 +3,52 @@ package me.chanjar.weixin.mp.bean.datacube; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; /** - * 消息分析数据接口返回结果对象 - *

+ * 消息分析数据接口返回结果对象. * Created by Binary Wang on 2016/8/29. * * @author Binary Wang */ @Data +@EqualsAndHashCode(callSuper = true) public class WxDataCubeMsgResult extends WxDataCubeBaseResult { private static final long serialVersionUID = 6932121822150573659L; /** - * ref_hour + * ref_hour. * 数据的小时,包括从000到2300,分别代表的是[000,100)到[2300,2400),即每日的第1小时和最后1小时 */ @SerializedName("ref_hour") private Integer refHour; /** - * msg_type + * msg_type. * 消息类型,代表含义如下:1代表文字 2代表图片 3代表语音 4代表视频 6代表第三方应用消息(链接消息) */ @SerializedName("msg_type") private Integer msgType; /** - * msg_user + * msg_user. * 上行发送了(向公众号发送了)消息的用户数 */ @SerializedName("msg_user") private Integer msgUser; /** - * msg_count + * msg_count. * 上行发送了消息的消息总数 */ @SerializedName("msg_count") private Integer msgCount; /** - * count_interval + * count_interval. * 当日发送消息量分布的区间,0代表 “0”,1代表“1-5”,2代表“6-10”,3代表“10次以上” */ @SerializedName("count_interval") @@ -61,7 +62,7 @@ public class WxDataCubeMsgResult extends WxDataCubeBaseResult { private Integer intPageReadCount; /** - * ori_page_read_user + * ori_page_read_user. * 原文页(点击图文页“阅读原文”进入的页面)的阅读人数,无原文页时此处数据为0 */ @SerializedName("ori_page_read_user") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java index 077f5189..5c66b0cd 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java @@ -2,12 +2,14 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class BaseResp extends AbstractDeviceBean { private static final long serialVersionUID = 4252655933699659073L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java index b618cdaf..601f8482 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java @@ -2,13 +2,15 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class RespMsg extends AbstractDeviceBean { private static final long serialVersionUID = -4241272701707684136L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java index 644a8132..f2b35da5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java @@ -2,14 +2,16 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.util.json.WxGsonBuilder; /** * - * @author keungtung + * @author keungtung. * @date 14/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class TransMsgResp extends AbstractDeviceBean { private static final long serialVersionUID = 5386954916622816491L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java index 454628c8..5e00c4fa 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Arrays; import java.util.LinkedList; @@ -12,6 +13,7 @@ import java.util.List; * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceAuthorize extends AbstractDeviceBean { private static final long serialVersionUID = 8786321356569903887L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java index 6cf01f4d..9608452c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java @@ -1,15 +1,17 @@ package me.chanjar.weixin.mp.bean.device; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.util.List; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceAuthorizeResult extends AbstractDeviceBean { private static final long serialVersionUID = 9105294570912249811L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java index 7a3c6399..aeb7f819 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java @@ -2,12 +2,14 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceBind extends AbstractDeviceBean { private static final long serialVersionUID = 467559769037590880L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java index 06786087..ec032e86 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java @@ -2,15 +2,17 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; /** - * @author keungtung + * @author keungtung. * @date 16/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceBindDeviceResult extends AbstractDeviceBean { private static final long serialVersionUID = 725870295905935355L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java index 1b04942b..f6c702aa 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java @@ -2,13 +2,15 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceBindResult extends AbstractDeviceBean { private static final long serialVersionUID = 4687725146279339359L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java index be9239b0..4128a9f8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java @@ -2,13 +2,15 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.util.ToStringUtils; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceMsg extends AbstractDeviceBean { private static final long serialVersionUID = -5567110858455277963L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java index 8e3327e5..95cf2a94 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java @@ -2,15 +2,17 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.util.List; /** - * @author keungtung + * @author keungtung. * @date 16/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceOpenIdResult extends AbstractDeviceBean { private static final long serialVersionUID = 4980885167833836220L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java index f8b6309e..0e0d96f4 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java @@ -2,13 +2,15 @@ package me.chanjar.weixin.mp.bean.device; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** - * @author keungtung + * @author keungtung. * @date 10/12/2016 */ @Data +@EqualsAndHashCode(callSuper = false) public class WxDeviceQrCodeResult extends AbstractDeviceBean { private static final long serialVersionUID = -4312858303060918266L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java index 9947de18..dbb0ab90 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java @@ -3,11 +3,13 @@ package me.chanjar.weixin.mp.bean.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter; @XStreamAlias("xml") @Data +@EqualsAndHashCode(callSuper = true) public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage { private static final long serialVersionUID = -2684778597067990723L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java index 7ec26a6e..f7405600 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; @@ -12,6 +13,7 @@ import java.util.List; @XStreamAlias("xml") @Data +@EqualsAndHashCode(callSuper = true) public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage { private static final long serialVersionUID = -4604402850905714772L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java index 208367b4..cbaa05ab 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java @@ -3,11 +3,13 @@ package me.chanjar.weixin.mp.bean.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; @XStreamAlias("xml") @Data +@EqualsAndHashCode(callSuper = true) public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage { private static final long serialVersionUID = -3972786455288763361L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java index aae4512b..5b085783 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; @@ -10,6 +11,7 @@ import java.io.Serializable; @XStreamAlias("xml") @Data +@EqualsAndHashCode(callSuper = true) public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage { private static final long serialVersionUID = 1850903037285841322L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java index 51ff5375..bd91b861 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java @@ -3,11 +3,13 @@ package me.chanjar.weixin.mp.bean.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter; @XStreamAlias("xml") @Data +@EqualsAndHashCode(callSuper = true) public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage { private static final long serialVersionUID = 240367390249860551L; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java index 09cb70d0..8a4f7462 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java @@ -9,7 +9,8 @@ import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialVoiceAndImageDownload import java.io.File; import java.io.InputStream; -public abstract class MaterialVoiceAndImageDownloadRequestExecutor implements RequestExecutor { +public abstract class MaterialVoiceAndImageDownloadRequestExecutor + implements RequestExecutor { protected RequestHttp requestHttp; protected File tmpDirFile; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java index 406eec01..af2e0257 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java @@ -32,7 +32,7 @@ public abstract class QrCodeRequestExecutor implements RequestExecutor executor, String uri, E data) throws WxErrorException { this.log.info("Executed"); - WxError error = new WxError(); - error.setErrorCode(-1); - throw new WxErrorException(error); + throw new WxErrorException(WxError.builder().errorCode(-1).build()); } };