diff --git a/README.md b/README.md
index b40876ec..8fbe9ac4 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
### 声明:本项目Fork自chanjarster/weixin-java-tools,但由于原项目已停止维护,故单独维护和发布,且发布到maven上的groupId也会不同,详细信息见下文。
-### 最新更新:2.0.0版发布!!! on 2016-07-31
-#### 由于本次更新涉及接口调整比较大,主要是公众号的调整,企业号无过多调整,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。因此版本号直接从1.X.X直接升级到2.0.0,所以如果习惯于1.X.X版本的同学不想做过多更改的话,请慎重考虑升级到最新版本。
+### 最新更新:2.1.0版发布!!! on 2016-08-31
+#### 自2.0.0版本以来,接口调整比较大,主要是公众号的调整,企业号无过多调整,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。所以如果习惯于1.X.X版本的同学不想做过多更改的话,请慎重考虑升级到2.X.X版本。
---
### 详细开发文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。
@@ -32,12 +32,12 @@
com.github.binarywang
weixin-java-mp
- 2.0.0
+ 2.1.0
```
```groovy
-compile 'com.github.binarywang:weixin-java-mp:2.0.0'
+compile 'com.github.binarywang:weixin-java-mp:2.1.0'
```
* 企业号:
@@ -45,12 +45,12 @@ compile 'com.github.binarywang:weixin-java-mp:2.0.0'
com.github.binarywang
weixin-java-cp
- 2.0.0
+ 2.1.0
```
```groovy
-compile 'com.github.binarywang:weixin-java-cp:2.0.0'
+compile 'com.github.binarywang:weixin-java-cp:2.1.0'
```
#### 本项目主要存放在github上,地址为 :
diff --git a/pom.xml b/pom.xml
index 54370f46..dded0cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
com.github.binarywang
weixin-java-parent
- 2.1.0-SNAPSHOT
+ 2.1.0
pom
WeiXin Java Tools - Parent
微信公众号、企业号上级POM
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 684cae1d..b916ccfa 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
com.github.binarywang
weixin-java-parent
- 2.1.0-SNAPSHOT
+ 2.1.0
weixin-java-common
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
index e45643b7..a6fd6317 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -61,7 +61,7 @@ public class WxConsts {
/**
* 群发反馈消息代码所对应的文字描述
*/
- public static final Map MASS_ST_2_DESC = new HashMap();
+ public static final Map MASS_ST_2_DESC = new HashMap<>();
///////////////////////
// 微信端推送过来的事件类型
///////////////////////
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java
index e0d4d08c..1281e260 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java
@@ -25,7 +25,7 @@ public class WxMessageInMemoryDuplicateChecker implements WxMessageDuplicateChec
/**
* 消息id->消息时间戳的map
*/
- private final ConcurrentHashMap msgId2Timestamp = new ConcurrentHashMap();
+ private final ConcurrentHashMap msgId2Timestamp = new ConcurrentHashMap<>();
/**
* 后台清理线程是否已经开启
@@ -56,7 +56,7 @@ public class WxMessageInMemoryDuplicateChecker implements WxMessageDuplicateChec
}
protected void checkBackgroundProcessStarted() {
- if (backgroundProcessStarted.getAndSet(true)) {
+ if (this.backgroundProcessStarted.getAndSet(true)) {
return;
}
Thread t = new Thread(new Runnable() {
@@ -64,11 +64,11 @@ public class WxMessageInMemoryDuplicateChecker implements WxMessageDuplicateChec
public void run() {
try {
while (true) {
- Thread.sleep(clearPeriod);
+ Thread.sleep(WxMessageInMemoryDuplicateChecker.this.clearPeriod);
Long now = System.currentTimeMillis();
- for (Map.Entry entry : msgId2Timestamp.entrySet()) {
- if (now - entry.getValue() > timeToLive) {
- msgId2Timestamp.entrySet().remove(entry);
+ for (Map.Entry entry : WxMessageInMemoryDuplicateChecker.this.msgId2Timestamp.entrySet()) {
+ if (now - entry.getValue() > WxMessageInMemoryDuplicateChecker.this.timeToLive) {
+ WxMessageInMemoryDuplicateChecker.this.msgId2Timestamp.entrySet().remove(entry);
}
}
}
@@ -87,7 +87,7 @@ public class WxMessageInMemoryDuplicateChecker implements WxMessageDuplicateChec
return false;
}
checkBackgroundProcessStarted();
- Long timestamp = msgId2Timestamp.putIfAbsent(messageId, System.currentTimeMillis());
+ Long timestamp = this.msgId2Timestamp.putIfAbsent(messageId, System.currentTimeMillis());
return timestamp != null;
}
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 eedecb84..6476205a 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
@@ -16,7 +16,7 @@ public class WxAccessToken implements Serializable {
}
public String getAccessToken() {
- return accessToken;
+ return this.accessToken;
}
public void setAccessToken(String accessToken) {
@@ -24,7 +24,7 @@ public class WxAccessToken implements Serializable {
}
public int getExpiresIn() {
- return expiresIn;
+ return this.expiresIn;
}
public void setExpiresIn(int 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 898decfa..2ff252c3 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
@@ -39,7 +39,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getAppId() {
- return appId;
+ return this.appId;
}
public void setAppId(String appId) {
@@ -47,7 +47,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getCardId() {
- return cardId;
+ return this.cardId;
}
public void setCardId(String cardId) {
@@ -55,7 +55,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getCardType() {
- return cardType;
+ return this.cardType;
}
public void setCardType(String cardType) {
@@ -63,7 +63,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getLocationId() {
- return locationId;
+ return this.locationId;
}
public void setLocationId(String locationId) {
@@ -71,7 +71,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getCode() {
- return code;
+ return this.code;
}
public void setCode(String code) {
@@ -79,7 +79,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getOpenId() {
- return openId;
+ return this.openId;
}
public void setOpenId(String openId) {
@@ -87,7 +87,7 @@ public class WxCardApiSignature implements Serializable {
}
public Long getTimestamp() {
- return timestamp;
+ return this.timestamp;
}
public void setTimestamp(Long timestamp) {
@@ -95,7 +95,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getNonceStr() {
- return nonceStr;
+ return this.nonceStr;
}
public void setNonceStr(String nonceStr) {
@@ -103,7 +103,7 @@ public class WxCardApiSignature implements Serializable {
}
public String getSignature() {
- return signature;
+ return this.signature;
}
public void setSignature(String 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 312860df..17799058 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
@@ -19,7 +19,7 @@ public class WxJsapiSignature implements Serializable {
private String signature;
public String getSignature() {
- return signature;
+ return this.signature;
}
public void setSignature(String signature) {
@@ -27,7 +27,7 @@ public class WxJsapiSignature implements Serializable {
}
public String getNoncestr() {
- return noncestr;
+ return this.noncestr;
}
public void setNoncestr(String noncestr) {
@@ -35,7 +35,7 @@ public class WxJsapiSignature implements Serializable {
}
public long getTimestamp() {
- return timestamp;
+ return this.timestamp;
}
public void setTimestamp(long timestamp) {
@@ -43,7 +43,7 @@ public class WxJsapiSignature implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -51,7 +51,7 @@ public class WxJsapiSignature implements Serializable {
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public void setAppid(String 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 7989b39a..6b43ed06 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
@@ -19,7 +19,7 @@ public class WxMenu implements Serializable {
private static final long serialVersionUID = -7083914585539687746L;
- private List buttons = new ArrayList();
+ private List buttons = new ArrayList<>();
private WxMenuRule matchRule;
@@ -40,7 +40,7 @@ public class WxMenu implements Serializable {
}
public List getButtons() {
- return buttons;
+ return this.buttons;
}
public void setButtons(List buttons) {
@@ -48,7 +48,7 @@ public class WxMenu implements Serializable {
}
public WxMenuRule getMatchRule() {
- return matchRule;
+ return this.matchRule;
}
public void setMatchRule(WxMenuRule matchRule) {
@@ -62,7 +62,7 @@ public class WxMenu implements Serializable {
@Override
public String toString() {
return "WxMenu{" +
- "buttons=" + buttons +
+ "buttons=" + this.buttons +
'}';
}
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 88033400..6a5e5426 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
@@ -14,7 +14,7 @@ public class WxMenuButton {
private String url;
private String mediaId;
- private List subButtons = new ArrayList();
+ private List subButtons = new ArrayList<>();
@Override
public String toString() {
@@ -23,7 +23,7 @@ public class WxMenuButton {
}
public String getType() {
- return type;
+ return this.type;
}
public void setType(String type) {
@@ -31,7 +31,7 @@ public class WxMenuButton {
}
public String getName() {
- return name;
+ return this.name;
}
public void setName(String name) {
@@ -39,7 +39,7 @@ public class WxMenuButton {
}
public String getKey() {
- return key;
+ return this.key;
}
public void setKey(String key) {
@@ -47,7 +47,7 @@ public class WxMenuButton {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -55,7 +55,7 @@ public class WxMenuButton {
}
public List getSubButtons() {
- return subButtons;
+ return this.subButtons;
}
public void setSubButtons(List subButtons) {
@@ -63,7 +63,7 @@ public class WxMenuButton {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
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 5cb9d8fe..b3e90886 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
@@ -13,7 +13,7 @@ public class WxMenuRule {
private String language;
public String getTagId() {
- return tagId;
+ return this.tagId;
}
public void setTagId(String tagId) {
@@ -21,7 +21,7 @@ public class WxMenuRule {
}
public String getSex() {
- return sex;
+ return this.sex;
}
public void setSex(String sex) {
@@ -29,7 +29,7 @@ public class WxMenuRule {
}
public String getCountry() {
- return country;
+ return this.country;
}
public void setCountry(String country) {
@@ -37,7 +37,7 @@ public class WxMenuRule {
}
public String getProvince() {
- return province;
+ return this.province;
}
public void setProvince(String province) {
@@ -45,7 +45,7 @@ public class WxMenuRule {
}
public String getCity() {
- return city;
+ return this.city;
}
public void setCity(String city) {
@@ -53,7 +53,7 @@ public class WxMenuRule {
}
public String getClientPlatformType() {
- return clientPlatformType;
+ return this.clientPlatformType;
}
public void setClientPlatformType(String clientPlatformType) {
@@ -61,7 +61,7 @@ public class WxMenuRule {
}
public String getLanguage() {
- return language;
+ return this.language;
}
public void setLanguage(String language) {
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 070ec720..54b8b1fd 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
@@ -29,7 +29,7 @@ public class WxError implements Serializable {
}
public int getErrorCode() {
- return errorCode;
+ return this.errorCode;
}
public void setErrorCode(int errorCode) {
@@ -37,7 +37,7 @@ public class WxError implements Serializable {
}
public String getErrorMsg() {
- return errorMsg;
+ return this.errorMsg;
}
public void setErrorMsg(String errorMsg) {
@@ -45,7 +45,7 @@ public class WxError implements Serializable {
}
public String getJson() {
- return json;
+ return this.json;
}
public void setJson(String json) {
@@ -54,10 +54,10 @@ public class WxError implements Serializable {
@Override
public String toString() {
- if (json != null) {
- return json;
+ if (this.json != null) {
+ return this.json;
}
- return "错误: Code=" + errorCode + ", Msg=" + errorMsg;
+ return "错误: Code=" + this.errorCode + ", Msg=" + this.errorMsg;
}
public static class Builder {
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 2e4b5fcd..09901c3e 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
@@ -17,7 +17,7 @@ public class WxMediaUploadResult implements Serializable {
}
public String getType() {
- return type;
+ return this.type;
}
public void setType(String type) {
@@ -25,7 +25,7 @@ public class WxMediaUploadResult implements Serializable {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -33,7 +33,7 @@ public class WxMediaUploadResult implements Serializable {
}
public long getCreatedAt() {
- return createdAt;
+ return this.createdAt;
}
public void setCreatedAt(long createdAt) {
@@ -41,7 +41,7 @@ public class WxMediaUploadResult implements Serializable {
}
public String getThumbMediaId() {
- return thumbMediaId;
+ return this.thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
@@ -50,8 +50,8 @@ public class WxMediaUploadResult implements Serializable {
@Override
public String toString() {
- return "WxUploadResult [type=" + type + ", media_id=" + mediaId + ", thumb_media_id=" + thumbMediaId
- + ", created_at=" + createdAt + "]";
+ return "WxUploadResult [type=" + this.type + ", media_id=" + this.mediaId + ", thumb_media_id=" + this.thumbMediaId
+ + ", created_at=" + this.createdAt + "]";
}
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/exception/WxErrorException.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/exception/WxErrorException.java
index 7e2e1941..51219a41 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/exception/WxErrorException.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/exception/WxErrorException.java
@@ -14,7 +14,7 @@ public class WxErrorException extends Exception {
}
public WxError getError() {
- return error;
+ return this.error;
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSession.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSession.java
index 9212c619..89d847d7 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSession.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSession.java
@@ -18,7 +18,7 @@ public class StandardSession implements WxSession, InternalSession {
*/
protected static final String EMPTY_ARRAY[] = new String[0];
// ------------------------------ WxSession
- protected Map attributes = new ConcurrentHashMap();
+ protected Map attributes = new ConcurrentHashMap<>();
/**
* The session identifier of this Session.
*/
@@ -47,7 +47,7 @@ public class StandardSession implements WxSession, InternalSession {
/**
* The current accessed time for this session.
*/
- protected volatile long thisAccessedTime = creationTime;
+ protected volatile long thisAccessedTime = this.creationTime;
/**
* The default maximum inactive interval for Sessions created by
* this Manager.
@@ -77,7 +77,7 @@ public class StandardSession implements WxSession, InternalSession {
if (name == null) return null;
- return (attributes.get(name));
+ return (this.attributes.get(name));
}
@Override
@@ -86,8 +86,8 @@ public class StandardSession implements WxSession, InternalSession {
throw new IllegalStateException
(sm.getString("sessionImpl.getAttributeNames.ise"));
- Set names = new HashSet();
- names.addAll(attributes.keySet());
+ Set names = new HashSet<>();
+ names.addAll(this.attributes.keySet());
return Collections.enumeration(names);
}
@@ -109,7 +109,7 @@ public class StandardSession implements WxSession, InternalSession {
throw new IllegalStateException(sm.getString(
"sessionImpl.setAttribute.ise", getIdInternal()));
- attributes.put(name, value);
+ this.attributes.put(name, value);
}
@@ -132,10 +132,10 @@ public class StandardSession implements WxSession, InternalSession {
@Override
public WxSession getSession() {
- if (facade == null) {
- facade = new StandardSessionFacade(this);
+ if (this.facade == null) {
+ this.facade = new StandardSessionFacade(this);
}
- return (facade);
+ return (this.facade);
}
@@ -157,15 +157,15 @@ public class StandardSession implements WxSession, InternalSession {
return true;
}
- if (accessCount.get() > 0) {
+ if (this.accessCount.get() > 0) {
return true;
}
- if (maxInactiveInterval > 0) {
+ if (this.maxInactiveInterval > 0) {
long timeNow = System.currentTimeMillis();
int timeIdle;
- timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
- if (timeIdle >= maxInactiveInterval) {
+ timeIdle = (int) ((timeNow - this.thisAccessedTime) / 1000L);
+ if (timeIdle >= this.maxInactiveInterval) {
expire();
}
}
@@ -193,7 +193,7 @@ public class StandardSession implements WxSession, InternalSession {
if (name == null) return;
// Remove this attribute from our collection
- attributes.remove(name);
+ this.attributes.remove(name);
}
@@ -202,7 +202,7 @@ public class StandardSession implements WxSession, InternalSession {
// Check to see if session has already been invalidated.
// Do not check expiring at this point as expire should not return until
// isValid is false
- if (!isValid)
+ if (!this.isValid)
return;
synchronized (this) {
@@ -210,24 +210,24 @@ public class StandardSession implements WxSession, InternalSession {
// Double check locking - isValid needs to be volatile
// The check of expiring is to ensure that an infinite loop is not
// entered as per bug 56339
- if (expiring || !isValid)
+ if (this.expiring || !this.isValid)
return;
- if (manager == null)
+ if (this.manager == null)
return;
// Mark this session as "being expired"
- expiring = true;
+ this.expiring = true;
- accessCount.set(0);
+ this.accessCount.set(0);
// Remove this session from our manager's active sessions
- manager.remove(this, true);
+ this.manager.remove(this, true);
// We have completed expire of this session
setValid(false);
- expiring = false;
+ this.expiring = false;
// Unbind any objects associated with this session
String keys[] = keys();
@@ -244,7 +244,7 @@ public class StandardSession implements WxSession, InternalSession {
public void access() {
this.thisAccessedTime = System.currentTimeMillis();
- accessCount.incrementAndGet();
+ this.accessCount.incrementAndGet();
}
@@ -253,7 +253,7 @@ public class StandardSession implements WxSession, InternalSession {
public void endAccess() {
this.thisAccessedTime = System.currentTimeMillis();
- accessCount.decrementAndGet();
+ this.accessCount.decrementAndGet();
}
@@ -273,13 +273,13 @@ public class StandardSession implements WxSession, InternalSession {
@Override
public void setId(String id) {
- if ((this.id != null) && (manager != null))
- manager.remove(this);
+ if ((this.id != null) && (this.manager != null))
+ this.manager.remove(this);
this.id = id;
- if (manager != null)
- manager.add(this);
+ if (this.manager != null)
+ this.manager.add(this);
}
/**
@@ -289,7 +289,7 @@ public class StandardSession implements WxSession, InternalSession {
*/
protected String[] keys() {
- return attributes.keySet().toArray(EMPTY_ARRAY);
+ return this.attributes.keySet().toArray(EMPTY_ARRAY);
}
@@ -300,31 +300,31 @@ public class StandardSession implements WxSession, InternalSession {
StandardSession session = (StandardSession) o;
- if (creationTime != session.creationTime) return false;
- if (expiring != session.expiring) return false;
- if (isValid != session.isValid) return false;
- if (maxInactiveInterval != session.maxInactiveInterval) return false;
- if (thisAccessedTime != session.thisAccessedTime) return false;
- if (!accessCount.equals(session.accessCount)) return false;
- if (!attributes.equals(session.attributes)) return false;
- if (!facade.equals(session.facade)) return false;
- if (!id.equals(session.id)) return false;
- return manager.equals(session.manager);
+ if (this.creationTime != session.creationTime) return false;
+ if (this.expiring != session.expiring) return false;
+ if (this.isValid != session.isValid) return false;
+ if (this.maxInactiveInterval != session.maxInactiveInterval) return false;
+ if (this.thisAccessedTime != session.thisAccessedTime) return false;
+ if (!this.accessCount.equals(session.accessCount)) return false;
+ if (!this.attributes.equals(session.attributes)) return false;
+ if (!this.facade.equals(session.facade)) return false;
+ if (!this.id.equals(session.id)) return false;
+ return this.manager.equals(session.manager);
}
@Override
public int hashCode() {
- int result = attributes.hashCode();
- result = 31 * result + id.hashCode();
- result = 31 * result + (isValid ? 1 : 0);
- result = 31 * result + (expiring ? 1 : 0);
- result = 31 * result + manager.hashCode();
- result = 31 * result + (int) (creationTime ^ (creationTime >>> 32));
- result = 31 * result + (int) (thisAccessedTime ^ (thisAccessedTime >>> 32));
- result = 31 * result + maxInactiveInterval;
- result = 31 * result + facade.hashCode();
- result = 31 * result + accessCount.hashCode();
+ int result = this.attributes.hashCode();
+ result = 31 * result + this.id.hashCode();
+ result = 31 * result + (this.isValid ? 1 : 0);
+ result = 31 * result + (this.expiring ? 1 : 0);
+ result = 31 * result + this.manager.hashCode();
+ result = 31 * result + (int) (this.creationTime ^ (this.creationTime >>> 32));
+ result = 31 * result + (int) (this.thisAccessedTime ^ (this.thisAccessedTime >>> 32));
+ result = 31 * result + this.maxInactiveInterval;
+ result = 31 * result + this.facade.hashCode();
+ result = 31 * result + this.accessCount.hashCode();
return result;
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionFacade.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionFacade.java
index a9631de6..e4493089 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionFacade.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionFacade.java
@@ -14,32 +14,32 @@ public class StandardSessionFacade implements WxSession {
}
public InternalSession getInternalSession() {
- return (InternalSession) session;
+ return (InternalSession) this.session;
}
@Override
public Object getAttribute(String name) {
- return session.getAttribute(name);
+ return this.session.getAttribute(name);
}
@Override
public Enumeration getAttributeNames() {
- return session.getAttributeNames();
+ return this.session.getAttributeNames();
}
@Override
public void setAttribute(String name, Object value) {
- session.setAttribute(name, value);
+ this.session.setAttribute(name, value);
}
@Override
public void removeAttribute(String name) {
- session.removeAttribute(name);
+ this.session.removeAttribute(name);
}
@Override
public void invalidate() {
- session.invalidate();
+ this.session.invalidate();
}
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
index cd14a1fd..7e6c95a2 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
@@ -32,7 +32,7 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
* The set of currently active Sessions for this Manager, keyed by
* session identifier.
*/
- protected Map sessions = new ConcurrentHashMap();
+ protected Map sessions = new ConcurrentHashMap<>();
/**
* The maximum number of active Sessions allowed, or -1 for no limit.
*/
@@ -117,7 +117,7 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
@Override
public void remove(InternalSession session, boolean update) {
if (session.getIdInternal() != null) {
- sessions.remove(session.getIdInternal());
+ this.sessions.remove(session.getIdInternal());
}
}
@@ -127,7 +127,7 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
if (id == null)
return (null);
- return sessions.get(id);
+ return this.sessions.get(id);
}
@@ -138,12 +138,12 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
(sm.getString("sessionManagerImpl.createSession.ise"));
}
- if ((maxActiveSessions >= 0) &&
- (getActiveSessions() >= maxActiveSessions)) {
- rejectedSessions++;
+ if ((this.maxActiveSessions >= 0) &&
+ (getActiveSessions() >= this.maxActiveSessions)) {
+ this.rejectedSessions++;
throw new TooManyActiveSessionsException(
sm.getString("sessionManagerImpl.createSession.tmase"),
- maxActiveSessions);
+ this.maxActiveSessions);
}
// Recycle or create a Session instance
@@ -155,7 +155,7 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
session.setMaxInactiveInterval(this.maxInactiveInterval);
String id = sessionId;
session.setId(id);
- sessionCounter++;
+ this.sessionCounter++;
return (session);
@@ -164,7 +164,7 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
@Override
public int getActiveSessions() {
- return sessions.size();
+ return this.sessions.size();
}
@@ -185,17 +185,17 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
public void add(InternalSession session) {
// 当第一次有session创建的时候,开启session清理线程
- if (!backgroundProcessStarted.getAndSet(true)) {
+ if (!this.backgroundProcessStarted.getAndSet(true)) {
Thread t = new Thread(new Runnable() {
@Override
public void run() {
while (true) {
try {
// 每秒清理一次
- Thread.sleep(backgroundProcessorDelay * 1000l);
+ Thread.sleep(StandardSessionManager.this.backgroundProcessorDelay * 1000l);
backgroundProcess();
} catch (InterruptedException e) {
- log.error("SessionManagerImpl.backgroundProcess error", e);
+ StandardSessionManager.this.log.error("SessionManagerImpl.backgroundProcess error", e);
}
}
}
@@ -204,12 +204,12 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
t.start();
}
- sessions.put(session.getIdInternal(), session);
+ this.sessions.put(session.getIdInternal(), session);
int size = getActiveSessions();
- if (size > maxActive) {
- synchronized (maxActiveUpdateLock) {
- if (size > maxActive) {
- maxActive = size;
+ if (size > this.maxActive) {
+ synchronized (this.maxActiveUpdateLock) {
+ if (size > this.maxActive) {
+ this.maxActive = size;
}
}
}
@@ -223,14 +223,14 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
@Override
public InternalSession[] findSessions() {
- return sessions.values().toArray(new InternalSession[0]);
+ return this.sessions.values().toArray(new InternalSession[0]);
}
@Override
public void backgroundProcess() {
- count = (count + 1) % processExpiresFrequency;
- if (count == 0)
+ this.count = (this.count + 1) % this.processExpiresFrequency;
+ if (this.count == 0)
processExpires();
}
@@ -243,17 +243,17 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
InternalSession sessions[] = findSessions();
int expireHere = 0;
- if (log.isDebugEnabled())
- log.debug("Start expire sessions {} at {} sessioncount {}", getName(), timeNow, sessions.length);
+ if (this.log.isDebugEnabled())
+ this.log.debug("Start expire sessions {} at {} sessioncount {}", getName(), timeNow, sessions.length);
for (int i = 0; i < sessions.length; i++) {
if (sessions[i] != null && !sessions[i].isValid()) {
expireHere++;
}
}
long timeEnd = System.currentTimeMillis();
- if (log.isDebugEnabled())
- log.debug("End expire sessions {} processingTime {} expired sessions: {}", getName(), timeEnd - timeNow, expireHere);
- processingTime += (timeEnd - timeNow);
+ if (this.log.isDebugEnabled())
+ this.log.debug("End expire sessions {} processingTime {} expired sessions: {}", getName(), timeEnd - timeNow, expireHere);
+ this.processingTime += (timeEnd - timeNow);
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/TooManyActiveSessionsException.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/TooManyActiveSessionsException.java
index 69fd89f8..72a2b4c4 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/TooManyActiveSessionsException.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/TooManyActiveSessionsException.java
@@ -40,7 +40,7 @@ public class TooManyActiveSessionsException
int maxActive) {
super(message);
- maxActiveSessions = maxActive;
+ this.maxActiveSessions = maxActive;
}
/**
@@ -49,6 +49,6 @@ public class TooManyActiveSessionsException
* @return The maximum number of sessions allowed by the session manager.
*/
public int getMaxActiveSessions() {
- return maxActiveSessions;
+ return this.maxActiveSessions;
}
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java
index a512e599..7ad976ab 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java
@@ -13,7 +13,7 @@ public class LogExceptionHandler implements WxErrorExceptionHandler {
@Override
public void handle(WxErrorException e) {
- log.error("Error happens", e);
+ this.log.error("Error happens", e);
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/ByteGroup.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/ByteGroup.java
index 6cd4a5ef..b12ec655 100755
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/ByteGroup.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/ByteGroup.java
@@ -3,24 +3,24 @@ package me.chanjar.weixin.common.util.crypto;
import java.util.ArrayList;
public class ByteGroup {
- ArrayList byteContainer = new ArrayList();
+ ArrayList byteContainer = new ArrayList<>();
public byte[] toBytes() {
- byte[] bytes = new byte[byteContainer.size()];
- for (int i = 0; i < byteContainer.size(); i++) {
- bytes[i] = byteContainer.get(i);
+ byte[] bytes = new byte[this.byteContainer.size()];
+ for (int i = 0; i < this.byteContainer.size(); i++) {
+ bytes[i] = this.byteContainer.get(i);
}
return bytes;
}
public ByteGroup addBytes(byte[] bytes) {
for (byte b : bytes) {
- byteContainer.add(b);
+ this.byteContainer.add(b);
}
return this;
}
public int size() {
- return byteContainer.size();
+ return this.byteContainer.size();
}
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/PKCS7Encoder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/PKCS7Encoder.java
index 2a01aae0..145896a5 100755
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/PKCS7Encoder.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/PKCS7Encoder.java
@@ -47,7 +47,7 @@ public class PKCS7Encoder {
* @return 删除补位字符后的明文
*/
public static byte[] decode(byte[] decrypted) {
- int pad = (int) decrypted[decrypted.length - 1];
+ int pad = decrypted[decrypted.length - 1];
if (pad < 1 || pad > 32) {
pad = 0;
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
index c1341e7b..4cc31039 100755
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
@@ -80,10 +80,10 @@ public class WxCryptUtil {
*/
public static String createSign(Map packageParams,
String signKey) {
- SortedMap sortedMap = new TreeMap();
+ SortedMap sortedMap = new TreeMap<>();
sortedMap.putAll(packageParams);
- List keys = new ArrayList(packageParams.keySet());
+ List keys = new ArrayList<>(packageParams.keySet());
Collections.sort(keys);
StringBuffer toSign = new StringBuffer();
@@ -131,7 +131,7 @@ public class WxCryptUtil {
String nonce = genRandomStr();
try {
- String signature = SHA1.gen(token, timeStamp, nonce, encryptedXml);
+ String signature = SHA1.gen(this.token, timeStamp, nonce, encryptedXml);
String result = generateXml(encryptedXml, signature, timeStamp, nonce);
return result;
} catch (NoSuchAlgorithmException e) {
@@ -151,7 +151,7 @@ public class WxCryptUtil {
byte[] plainTextBytes = plainText.getBytes(CHARSET);
byte[] bytesOfSizeInNetworkOrder = number2BytesInNetworkOrder(
plainTextBytes.length);
- byte[] appIdBytes = appidOrCorpid.getBytes(CHARSET);
+ byte[] appIdBytes = this.appidOrCorpid.getBytes(CHARSET);
// randomStr + networkBytesOrder + text + appid
byteCollector.addBytes(randomStringBytes);
@@ -169,8 +169,8 @@ public class WxCryptUtil {
try {
// 设置加密模式为AES的CBC模式
Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
- SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
- IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
+ SecretKeySpec keySpec = new SecretKeySpec(this.aesKey, "AES");
+ IvParameterSpec iv = new IvParameterSpec(this.aesKey, 0, 16);
cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
// 加密
@@ -207,7 +207,7 @@ public class WxCryptUtil {
try {
// 验证安全签名
- String signature = SHA1.gen(token, timeStamp, nonce, cipherText);
+ String signature = SHA1.gen(this.token, timeStamp, nonce, cipherText);
if (!signature.equals(msgSignature)) {
throw new RuntimeException("加密消息签名校验失败");
}
@@ -231,9 +231,9 @@ public class WxCryptUtil {
try {
// 设置解密模式为AES的CBC模式
Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
- SecretKeySpec key_spec = new SecretKeySpec(aesKey, "AES");
+ SecretKeySpec key_spec = new SecretKeySpec(this.aesKey, "AES");
IvParameterSpec iv = new IvParameterSpec(
- Arrays.copyOfRange(aesKey, 0, 16));
+ Arrays.copyOfRange(this.aesKey, 0, 16));
cipher.init(Cipher.DECRYPT_MODE, key_spec, iv);
// 使用BASE64对密文进行解码
@@ -264,7 +264,7 @@ public class WxCryptUtil {
}
// appid不相同的情况
- if (!from_appid.equals(appidOrCorpid)) {
+ if (!from_appid.equals(this.appidOrCorpid)) {
throw new RuntimeException("AppID不正确");
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/InputStreamResponseHandler.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/InputStreamResponseHandler.java
index 6433c472..0cc1562b 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/InputStreamResponseHandler.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/InputStreamResponseHandler.java
@@ -14,6 +14,7 @@ public class InputStreamResponseHandler implements ResponseHandler
public static final ResponseHandler INSTANCE = new InputStreamResponseHandler();
+ @Override
public InputStream handleResponse(final HttpResponse response) throws IOException {
final StatusLine statusLine = response.getStatusLine();
final HttpEntity entity = response.getEntity();
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
index 5ffac4bf..9a2bfb33 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
@@ -70,7 +70,7 @@ public class MediaDownloadRequestExecutor implements RequestExecutor {
public static final ResponseHandler INSTANCE = new Utf8ResponseHandler();
+ @Override
public String handleResponse(final HttpResponse response) throws IOException {
final StatusLine statusLine = response.getStatusLine();
final HttpEntity entity = response.getEntity();
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxAccessTokenAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxAccessTokenAdapter.java
index 58be83ac..e7d700e9 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxAccessTokenAdapter.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxAccessTokenAdapter.java
@@ -18,6 +18,7 @@ import java.lang.reflect.Type;
*/
public class WxAccessTokenAdapter implements JsonDeserializer {
+ @Override
public WxAccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxAccessToken accessToken = new WxAccessToken();
JsonObject accessTokenJsonObject = json.getAsJsonObject();
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 30c3708d..cc426bc8 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
@@ -18,6 +18,7 @@ import java.lang.reflect.Type;
*/
public class WxErrorAdapter implements JsonDeserializer {
+ @Override
public WxError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxError wxError = new WxError();
JsonObject wxErrorJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMediaUploadResultAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMediaUploadResultAdapter.java
index 16317a40..662b7442 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMediaUploadResultAdapter.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMediaUploadResultAdapter.java
@@ -18,6 +18,7 @@ import java.lang.reflect.Type;
*/
public class WxMediaUploadResultAdapter implements JsonDeserializer {
+ @Override
public WxMediaUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMediaUploadResult uploadResult = new WxMediaUploadResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
index 744df7e1..2cfbe252 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
@@ -29,6 +29,7 @@ import me.chanjar.weixin.common.bean.menu.WxMenuRule;
*/
public class WxMenuGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationContext context) {
JsonObject json = new JsonObject();
@@ -75,6 +76,7 @@ public class WxMenuGsonAdapter implements JsonSerializer, JsonDeserializ
return matchRule;
}
+ @Override
public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
/*
* 操蛋的微信
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/res/StringManager.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/res/StringManager.java
index 94303fec..32f4e42a 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/res/StringManager.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/res/StringManager.java
@@ -47,7 +47,7 @@ import java.util.*;
public class StringManager {
private static final Map> managers =
- new Hashtable>();
+ new Hashtable<>();
private static int LOCALE_CACHE_SIZE = 10;
/**
* The ResourceBundle for this StringManager.
@@ -81,10 +81,10 @@ public class StringManager {
}
}
}
- bundle = bnd;
+ this.bundle = bnd;
// Get the actual locale, which may be different from the requested one
- if (bundle != null) {
- Locale bundleLocale = bundle.getLocale();
+ if (this.bundle != null) {
+ Locale bundleLocale = this.bundle.getLocale();
if (bundleLocale.equals(Locale.ROOT)) {
this.locale = Locale.ENGLISH;
} else {
@@ -192,8 +192,8 @@ public class StringManager {
try {
// Avoid NPE if bundle is null and treat it like an MRE
- if (bundle != null) {
- str = bundle.getString(key);
+ if (this.bundle != null) {
+ str = this.bundle.getString(key);
}
} catch (MissingResourceException mre) {
//bad: shouldn't mask an exception the following way:
@@ -227,7 +227,7 @@ public class StringManager {
}
MessageFormat mf = new MessageFormat(value);
- mf.setLocale(locale);
+ mf.setLocale(this.locale);
return mf.format(args, new StringBuffer(), null).toString();
}
@@ -235,6 +235,6 @@ public class StringManager {
* Identify the Locale this StringManager is associated with
*/
public Locale getLocale() {
- return locale;
+ return this.locale;
}
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
index 109acfc0..d885327a 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
@@ -25,9 +25,9 @@ public class XStreamInitializer {
@Override
protected void writeText(QuickWriter writer, String text) {
- if (text.startsWith(PREFIX_CDATA) && text.endsWith(SUFFIX_CDATA)) {
+ if (text.startsWith(this.PREFIX_CDATA) && text.endsWith(this.SUFFIX_CDATA)) {
writer.write(text);
- } else if (text.startsWith(PREFIX_MEDIA_ID) && text.endsWith(SUFFIX_MEDIA_ID)) {
+ } else if (text.startsWith(this.PREFIX_MEDIA_ID) && text.endsWith(this.SUFFIX_MEDIA_ID)) {
writer.write(text);
} else {
super.writeText(writer, text);
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/crypto/WxCryptUtilTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/crypto/WxCryptUtilTest.java
index a5fa0c41..e7692165 100755
--- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/crypto/WxCryptUtilTest.java
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/crypto/WxCryptUtilTest.java
@@ -34,8 +34,8 @@ public class WxCryptUtilTest {
String afterAesEncrypt2 = "jn1L23DB+6ELqJ+6bruv23M2GmYfkv0xBh2h+XTBOKVKcgDFHle6gqcZ1cZrk3e1qjPQ1F4RsLWzQRG9udbKWesxlkupqcEcW7ZQweImX9+wLMa0GaUzpkycA8+IamDBxn5loLgZpnS7fVAbExOkK5DYHBmv5tptA9tklE/fTIILHR8HLXa5nQvFb3tYPKAlHF3rtTeayNf0QuM+UW/wM9enGIDIJHF7CLHiDNAYxr+r+OrJCmPQyTy8cVWlu9iSvOHPT/77bZqJucQHQ04sq7KZI27OcqpQNSto2OdHCoTccjggX5Z9Mma0nMJBU+jLKJ38YB1fBIz+vBzsYjrTmFQ44YfeEuZ+xRTQwr92vhA9OxchWVINGC50qE/6lmkwWTwGX9wtQpsJKhP+oS7rvTY8+VdzETdfakjkwQ5/Xka042OlUb1/slTwo4RscuQ+RdxSGvDahxAJ6+EAjLt9d8igHngxIbf6YyqqROxuxqIeIch3CssH/LqRs+iAcILvApYZckqmA7FNERspKA5f8GoJ9sv8xmGvZ9Yrf57cExWtnX8aCMMaBropU/1k+hKP5LVdzbWCG0hGwx/dQudYR/eXp3P0XxjlFiy+9DMlaFExWUZQDajPkdPrEeOwofJb";
public void testNormal() throws ParserConfigurationException, SAXException, IOException {
- WxCryptUtil pc = new WxCryptUtil(token, encodingAesKey, appId);
- String encryptedXml = pc.encrypt(replyMsg);
+ WxCryptUtil pc = new WxCryptUtil(this.token, this.encodingAesKey, this.appId);
+ String encryptedXml = pc.encrypt(this.replyMsg);
System.out.println(encryptedXml);
@@ -56,31 +56,31 @@ public class WxCryptUtilTest {
String nonce = root.getElementsByTagName("Nonce").item(0).getTextContent();
System.out.println(nonce);
- String messageText = String.format(xmlFormat, cipherText);
+ String messageText = String.format(this.xmlFormat, cipherText);
System.out.println(messageText);
// 第三方收到企业号平台发送的消息
String plainMessage = pc.decrypt(cipherText);
System.out.println(plainMessage);
- assertEquals(plainMessage, replyMsg);
+ assertEquals(plainMessage, this.replyMsg);
}
public void testAesEncrypt() {
- WxCryptUtil pc = new WxCryptUtil(token, encodingAesKey, appId);
- assertEquals(pc.encrypt(randomStr, replyMsg), afterAesEncrypt);
+ WxCryptUtil pc = new WxCryptUtil(this.token, this.encodingAesKey, this.appId);
+ assertEquals(pc.encrypt(this.randomStr, this.replyMsg), this.afterAesEncrypt);
}
public void testAesEncrypt2() {
- WxCryptUtil pc = new WxCryptUtil(token, encodingAesKey, appId);
- assertEquals(pc.encrypt(randomStr, replyMsg2), afterAesEncrypt2);
+ WxCryptUtil pc = new WxCryptUtil(this.token, this.encodingAesKey, this.appId);
+ assertEquals(pc.encrypt(this.randomStr, this.replyMsg2), this.afterAesEncrypt2);
}
public void testValidateSignatureError() throws ParserConfigurationException, SAXException,
IOException {
try {
- WxCryptUtil pc = new WxCryptUtil(token, encodingAesKey, appId);
- String afterEncrpt = pc.encrypt(replyMsg);
+ WxCryptUtil pc = new WxCryptUtil(this.token, this.encodingAesKey, this.appId);
+ String afterEncrpt = pc.encrypt(this.replyMsg);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
StringReader sr = new StringReader(afterEncrpt);
@@ -91,8 +91,8 @@ public class WxCryptUtilTest {
NodeList nodelist1 = root.getElementsByTagName("Encrypt");
String encrypt = nodelist1.item(0).getTextContent();
- String fromXML = String.format(xmlFormat, encrypt);
- pc.decrypt("12345", timestamp, nonce, fromXML); // 这里签名错误
+ String fromXML = String.format(this.xmlFormat, encrypt);
+ pc.decrypt("12345", this.timestamp, this.nonce, fromXML); // 这里签名错误
} catch (RuntimeException e) {
assertEquals(e.getMessage(), "加密消息签名校验失败");
return;
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 0d2c217b..7b996256 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -6,7 +6,7 @@
com.github.binarywang
weixin-java-parent
- 2.1.0-SNAPSHOT
+ 2.1.0
weixin-java-cp
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 516f058c..2ed00145 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -6,7 +6,7 @@
com.github.binarywang
weixin-java-parent
- 2.1.0-SNAPSHOT
+ 2.1.0
weixin-java-mp
WeiXin Java Tools - MP
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
index 885077a3..765f6d53 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
@@ -191,6 +191,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
this.oauth2redirectUri = oauth2redirectUri;
}
+ @Override
public String getHttpProxyHost() {
return this.httpProxyHost;
}
@@ -199,6 +200,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
this.httpProxyHost = httpProxyHost;
}
+ @Override
public int getHttpProxyPort() {
return this.httpProxyPort;
}
@@ -207,6 +209,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
this.httpProxyPort = httpProxyPort;
}
+ @Override
public String getHttpProxyUsername() {
return this.httpProxyUsername;
}
@@ -215,6 +218,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
this.httpProxyUsername = httpProxyUsername;
}
+ @Override
public String getHttpProxyPassword() {
return this.httpProxyPassword;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
index 1de7ba90..b72cc45a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -54,7 +54,7 @@ public class WxMpMessageRouter {
private static final int DEFAULT_THREAD_POOL_SIZE = 100;
- private final List rules = new ArrayList();
+ private final List rules = new ArrayList<>();
private final WxMpService wxMpService;
@@ -139,9 +139,9 @@ public class WxMpMessageRouter {
return null;
}
- final List matchRules = new ArrayList();
+ final List matchRules = new ArrayList<>();
// 收集匹配的规则
- for (final WxMpMessageRouterRule rule : rules) {
+ for (final WxMpMessageRouterRule rule : this.rules) {
if (rule.test(wxMessage)) {
matchRules.add(rule);
if(!rule.isReEnter()) {
@@ -155,39 +155,40 @@ public class WxMpMessageRouter {
}
WxMpXmlOutMessage res = null;
- final List futures = new ArrayList();
+ final List futures = new ArrayList<>();
for (final WxMpMessageRouterRule rule : matchRules) {
// 返回最后一个非异步的rule的执行结果
if(rule.isAsync()) {
futures.add(
- executorService.submit(new Runnable() {
+ this.executorService.submit(new Runnable() {
+ @Override
public void run() {
- rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
+ rule.service(wxMessage, WxMpMessageRouter.this.wxMpService, WxMpMessageRouter.this.sessionManager, WxMpMessageRouter.this.exceptionHandler);
}
})
);
} else {
- res = rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
+ res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler);
// 在同步操作结束,session访问结束
- log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
+ this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
sessionEndAccess(wxMessage);
}
}
if (futures.size() > 0) {
- executorService.submit(new Runnable() {
+ this.executorService.submit(new Runnable() {
@Override
public void run() {
for (Future future : futures) {
try {
future.get();
- log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
+ WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
// 异步操作结束,session访问结束
sessionEndAccess(wxMessage);
} catch (InterruptedException e) {
- log.error("Error happened when wait task finish", e);
+ WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
} catch (ExecutionException e) {
- log.error("Error happened when wait task finish", e);
+ WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
}
}
}
@@ -209,7 +210,7 @@ public class WxMpMessageRouter {
messageId.append(wxMessage.getMsgId());
}
- return messageDuplicateChecker.isDuplicate(messageId.toString());
+ return this.messageDuplicateChecker.isDuplicate(messageId.toString());
}
@@ -219,7 +220,7 @@ public class WxMpMessageRouter {
*/
protected void sessionEndAccess(WxMpXmlMessage wxMessage) {
- InternalSession session = ((InternalSessionManager)sessionManager).findSession(wxMessage.getFromUserName());
+ InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUserName());
if (session != null) {
session.endAccess();
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
index 22629d83..deaf85ab 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserService.java
@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.api;
-import java.util.List;
-
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.bean.WxMpUserQuery;
import me.chanjar.weixin.mp.bean.result.WxMpUser;
import me.chanjar.weixin.mp.bean.result.WxMpUserList;
+import java.util.List;
+
/**
* 用户管理和统计相关操作接口
*
@@ -42,7 +42,7 @@ public interface WxMpUserService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=批量获取用户基本信息
*
*
- * @param openid 用户openid, lang 使用默认(zh_CN 简体)
+ * @param openidList 用户openid列表
*/
List userInfoList(List openidList) throws WxErrorException;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java
index 1270e7f5..da5b5134 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java
@@ -13,7 +13,7 @@ public class Industry implements Serializable {
private String secondClass;
public String getId() {
- return id;
+ return this.id;
}
public void setId(String id) {
@@ -21,7 +21,7 @@ public class Industry implements Serializable {
}
public String getFirstClass() {
- return firstClass;
+ return this.firstClass;
}
public void setFirstClass(String firstClass) {
@@ -29,7 +29,7 @@ public class Industry implements Serializable {
}
public String getSecondClass() {
- return secondClass;
+ return this.secondClass;
}
public void setSecondClass(String secondClass) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
index d530fbe8..7bb4330f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
@@ -20,7 +20,7 @@ public class WxMpCard {
private Boolean canConsume;
public String getCardId() {
- return cardId;
+ return this.cardId;
}
public void setCardId(String cardId) {
@@ -28,7 +28,7 @@ public class WxMpCard {
}
public Long getBeginTime() {
- return beginTime;
+ return this.beginTime;
}
public void setBeginTime(Long beginTime) {
@@ -36,7 +36,7 @@ public class WxMpCard {
}
public Long getEndTime() {
- return endTime;
+ return this.endTime;
}
public void setEndTime(Long endTime) {
@@ -44,7 +44,7 @@ public class WxMpCard {
}
public String getUserCardStatus() {
- return userCardStatus;
+ return this.userCardStatus;
}
public void setUserCardStatus(String userCardStatus) {
@@ -52,7 +52,7 @@ public class WxMpCard {
}
public Boolean getCanConsume() {
- return canConsume;
+ return this.canConsume;
}
public void setCanConsume(Boolean canConsume) {
@@ -62,11 +62,11 @@ public class WxMpCard {
@Override
public String toString() {
return "WxMpCard{" +
- "cardId='" + cardId + '\'' +
- ", beginTime=" + beginTime +
- ", endTime=" + endTime +
- ", userCardStatus='" + userCardStatus + '\'' +
- ", canConsume=" + canConsume +
+ "cardId='" + this.cardId + '\'' +
+ ", beginTime=" + this.beginTime +
+ ", endTime=" + this.endTime +
+ ", userCardStatus='" + this.userCardStatus + '\'' +
+ ", canConsume=" + this.canConsume +
'}';
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
index 5fce97a3..04eee332 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
@@ -182,7 +182,7 @@ public class WxMpCustomMessage implements Serializable {
}
public String getKfAccount() {
- return kfAccount;
+ return this.kfAccount;
}
public void setKfAccount(String kfAccount) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java
index 9cef8c1b..7dfd4ccc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java
@@ -11,23 +11,27 @@ import java.io.Serializable;
*/
public class WxMpGroup implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1554709708638735270L;
private long id = -1;
private String name;
private long count;
public long getId() {
- return id;
+ return this.id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
- return name;
+ return this.name;
}
public void setName(String name) {
this.name = name;
}
public long getCount() {
- return count;
+ return this.count;
}
public void setCount(long count) {
this.count = count;
@@ -42,7 +46,7 @@ public class WxMpGroup implements Serializable {
}
@Override
public String toString() {
- return "WxMpGroup [id=" + id + ", name=" + name + ", count=" + count + "]";
+ return "WxMpGroup [id=" + this.id + ", name=" + this.name + ", count=" + this.count + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java
index be62084d..281b9315 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java
@@ -22,7 +22,7 @@ public class WxMpIndustry implements Serializable {
}
public Industry getPrimaryIndustry() {
- return primaryIndustry;
+ return this.primaryIndustry;
}
public void setPrimaryIndustry(Industry primaryIndustry) {
@@ -30,7 +30,7 @@ public class WxMpIndustry implements Serializable {
}
public Industry getSecondIndustry() {
- return secondIndustry;
+ return this.secondIndustry;
}
public void setSecondIndustry(Industry secondIndustry) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java
index b5faef72..d77605a6 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java
@@ -11,6 +11,10 @@ import java.io.Serializable;
*/
public class WxMpMassGroupMessage implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6625914040986749286L;
private Long groupId;
private String msgtype;
private String content;
@@ -21,7 +25,7 @@ public class WxMpMassGroupMessage implements Serializable {
}
public String getMsgtype() {
- return msgtype;
+ return this.msgtype;
}
/**
@@ -41,7 +45,7 @@ public class WxMpMassGroupMessage implements Serializable {
}
public String getContent() {
- return content;
+ return this.content;
}
public void setContent(String content) {
@@ -49,7 +53,7 @@ public class WxMpMassGroupMessage implements Serializable {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -61,7 +65,7 @@ public class WxMpMassGroupMessage implements Serializable {
}
public Long getGroupId() {
- return groupId;
+ return this.groupId;
}
/**
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
index 215bff52..4b059ea8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
@@ -13,10 +13,14 @@ import java.util.List;
*/
public class WxMpMassNews implements Serializable {
- private List articles = new ArrayList();
+ /**
+ *
+ */
+ private static final long serialVersionUID = 565937155013581016L;
+ private List articles = new ArrayList<>();
public List getArticles() {
- return articles;
+ return this.articles;
}
public void addArticle(WxMpMassNewsArticle article) {
@@ -28,7 +32,7 @@ public class WxMpMassNews implements Serializable {
}
public boolean isEmpty() {
- return articles == null || articles.isEmpty();
+ return this.articles == null || this.articles.isEmpty();
}
/**
@@ -76,7 +80,7 @@ public class WxMpMassNews implements Serializable {
private boolean showCoverPic;
public String getThumbMediaId() {
- return thumbMediaId;
+ return this.thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
@@ -84,7 +88,7 @@ public class WxMpMassNews implements Serializable {
}
public String getAuthor() {
- return author;
+ return this.author;
}
public void setAuthor(String author) {
@@ -92,7 +96,7 @@ public class WxMpMassNews implements Serializable {
}
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -100,7 +104,7 @@ public class WxMpMassNews implements Serializable {
}
public String getContentSourceUrl() {
- return contentSourceUrl;
+ return this.contentSourceUrl;
}
public void setContentSourceUrl(String contentSourceUrl) {
@@ -108,7 +112,7 @@ public class WxMpMassNews implements Serializable {
}
public String getContent() {
- return content;
+ return this.content;
}
public void setContent(String content) {
@@ -116,7 +120,7 @@ public class WxMpMassNews implements Serializable {
}
public String getDigest() {
- return digest;
+ return this.digest;
}
public void setDigest(String digest) {
@@ -124,7 +128,7 @@ public class WxMpMassNews implements Serializable {
}
public boolean isShowCoverPic() {
- return showCoverPic;
+ return this.showCoverPic;
}
public void setShowCoverPic(boolean showCoverPic) {
@@ -133,14 +137,14 @@ public class WxMpMassNews implements Serializable {
@Override
public String toString() {
- return "WxMpMassNewsArticle [" + "thumbMediaId=" + thumbMediaId + ", author=" + author + ", title=" + title +
- ", contentSourceUrl=" + contentSourceUrl + ", content=" + content + ", digest=" + digest +
- ", showCoverPic=" + showCoverPic + "]";
+ return "WxMpMassNewsArticle [" + "thumbMediaId=" + this.thumbMediaId + ", author=" + this.author + ", title=" + this.title +
+ ", contentSourceUrl=" + this.contentSourceUrl + ", content=" + this.content + ", digest=" + this.digest +
+ ", showCoverPic=" + this.showCoverPic + "]";
}
}
@Override
public String toString() {
- return "WxMpMassNews [" + "articles=" + articles + "]";
+ return "WxMpMassNews [" + "articles=" + this.articles + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
index 154195db..78e699e9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
@@ -8,6 +8,10 @@ import java.io.Serializable;
* @author miller
*/
public class WxMpMassPreviewMessage implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 9095211638358424020L;
private String toWxUsername;
private String msgType;
private String content;
@@ -18,7 +22,7 @@ public class WxMpMassPreviewMessage implements Serializable {
}
public String getToWxUsername() {
- return toWxUsername;
+ return this.toWxUsername;
}
public void setToWxUsername(String toWxUsername) {
@@ -26,7 +30,7 @@ public class WxMpMassPreviewMessage implements Serializable {
}
public String getMsgType() {
- return msgType;
+ return this.msgType;
}
/**
@@ -47,7 +51,7 @@ public class WxMpMassPreviewMessage implements Serializable {
}
public String getContent() {
- return content;
+ return this.content;
}
public void setContent(String content) {
@@ -55,7 +59,7 @@ public class WxMpMassPreviewMessage implements Serializable {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
index c2f04610..ec94092c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
@@ -11,12 +11,16 @@ import java.io.Serializable;
*/
public class WxMpMassVideo implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 9153925016061915637L;
private String mediaId;
private String title;
private String description;
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -24,7 +28,7 @@ public class WxMpMassVideo implements Serializable {
}
public String getDescription() {
- return description;
+ return this.description;
}
public void setDescription(String description) {
@@ -32,7 +36,7 @@ public class WxMpMassVideo implements Serializable {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterial.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterial.java
index 582825aa..058d9034 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterial.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterial.java
@@ -22,14 +22,14 @@ public class WxMpMaterial {
}
public Map getForm() {
- Map form = new HashMap();
- form.put("title", videoTitle);
- form.put("introduction", videoIntroduction);
+ Map form = new HashMap<>();
+ form.put("title", this.videoTitle);
+ form.put("introduction", this.videoIntroduction);
return form;
}
public String getVideoTitle() {
- return videoTitle;
+ return this.videoTitle;
}
public void setVideoTitle(String videoTitle) {
@@ -37,7 +37,7 @@ public class WxMpMaterial {
}
public String getVideoIntroduction() {
- return videoIntroduction;
+ return this.videoIntroduction;
}
public void setVideoIntroduction(String videoIntroduction) {
@@ -45,7 +45,7 @@ public class WxMpMaterial {
}
public String getName() {
- return name;
+ return this.name;
}
public void setName(String name) {
@@ -53,7 +53,7 @@ public class WxMpMaterial {
}
public File getFile() {
- return file;
+ return this.file;
}
public void setFile(File file) {
@@ -62,6 +62,6 @@ public class WxMpMaterial {
@Override
public String toString() {
- return "WxMpMaterial [" + "name=" + name + ", file=" + file + ", videoTitle=" + videoTitle + ", videoIntroduction=" + videoIntroduction + "]";
+ return "WxMpMaterial [" + "name=" + this.name + ", file=" + this.file + ", videoTitle=" + this.videoTitle + ", videoIntroduction=" + this.videoIntroduction + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialArticleUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialArticleUpdate.java
index be8e75f8..f8ee265e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialArticleUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialArticleUpdate.java
@@ -6,12 +6,16 @@ import java.io.Serializable;
public class WxMpMaterialArticleUpdate implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -7611963949517780270L;
private String mediaId;
private int index;
private WxMpMaterialNews.WxMpMaterialNewsArticle articles;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -19,7 +23,7 @@ public class WxMpMaterialArticleUpdate implements Serializable {
}
public int getIndex() {
- return index;
+ return this.index;
}
public void setIndex(int index) {
@@ -27,7 +31,7 @@ public class WxMpMaterialArticleUpdate implements Serializable {
}
public WxMpMaterialNews.WxMpMaterialNewsArticle getArticles() {
- return articles;
+ return this.articles;
}
public void setArticles(WxMpMaterialNews.WxMpMaterialNewsArticle articles) {
@@ -40,6 +44,6 @@ public class WxMpMaterialArticleUpdate implements Serializable {
@Override
public String toString() {
- return "WxMpMaterialArticleUpdate [" + "mediaId=" + mediaId + ", index=" + index + ", articles=" + articles + "]";
+ return "WxMpMaterialArticleUpdate [" + "mediaId=" + this.mediaId + ", index=" + this.index + ", articles=" + this.articles + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialNews.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialNews.java
index 75ee479f..df40f6c3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialNews.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialNews.java
@@ -8,10 +8,14 @@ import java.util.List;
public class WxMpMaterialNews implements Serializable {
- private List articles = new ArrayList();
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3283203652013494976L;
+ private List articles = new ArrayList<>();
public List getArticles() {
- return articles;
+ return this.articles;
}
public void addArticle(WxMpMaterialNewsArticle article) {
@@ -23,7 +27,7 @@ public class WxMpMaterialNews implements Serializable {
}
public boolean isEmpty() {
- return articles == null || articles.isEmpty();
+ return this.articles == null || this.articles.isEmpty();
}
/**
@@ -82,7 +86,7 @@ public class WxMpMaterialNews implements Serializable {
private String url;
public String getThumbMediaId() {
- return thumbMediaId;
+ return this.thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
@@ -90,7 +94,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getAuthor() {
- return author;
+ return this.author;
}
public void setAuthor(String author) {
@@ -98,7 +102,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -106,7 +110,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getContentSourceUrl() {
- return contentSourceUrl;
+ return this.contentSourceUrl;
}
public void setContentSourceUrl(String contentSourceUrl) {
@@ -114,7 +118,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getContent() {
- return content;
+ return this.content;
}
public void setContent(String content) {
@@ -122,7 +126,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getDigest() {
- return digest;
+ return this.digest;
}
public void setDigest(String digest) {
@@ -130,7 +134,7 @@ public class WxMpMaterialNews implements Serializable {
}
public boolean isShowCoverPic() {
- return showCoverPic;
+ return this.showCoverPic;
}
public void setShowCoverPic(boolean showCoverPic) {
@@ -138,7 +142,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -146,7 +150,7 @@ public class WxMpMaterialNews implements Serializable {
}
public String getThumbUrl() {
- return thumbUrl;
+ return this.thumbUrl;
}
public void setThumbUrl(String thumbUrl) {
@@ -155,14 +159,14 @@ public class WxMpMaterialNews implements Serializable {
@Override
public String toString() {
- return "WxMpMassNewsArticle [" + "thumbMediaId=" + thumbMediaId + "thumbUrl=" + thumbUrl + ", author=" + author + ", title=" + title +
- ", contentSourceUrl=" + contentSourceUrl + ", content=" + content + ", digest=" + digest +
- ", showCoverPic=" + showCoverPic +", url=" + url + "]";
+ return "WxMpMassNewsArticle [" + "thumbMediaId=" + this.thumbMediaId + "thumbUrl=" + this.thumbUrl + ", author=" + this.author + ", title=" + this.title +
+ ", contentSourceUrl=" + this.contentSourceUrl + ", content=" + this.content + ", digest=" + this.digest +
+ ", showCoverPic=" + this.showCoverPic +", url=" + this.url + "]";
}
}
@Override
public String toString() {
- return "WxMpMaterialNews [" + "articles=" + articles + "]";
+ return "WxMpMaterialNews [" + "articles=" + this.articles + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
index faf0ec77..c17f38e9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
@@ -13,6 +13,10 @@ import java.io.Serializable;
*/
public class WxMpSemanticQuery implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7685873048199870690L;
private String query;
private String category;
private Float latitude;
@@ -23,7 +27,7 @@ public class WxMpSemanticQuery implements Serializable {
private String uid;
public String getQuery() {
- return query;
+ return this.query;
}
public void setQuery(String query) {
@@ -31,7 +35,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public String getCategory() {
- return category;
+ return this.category;
}
public void setCategory(String category) {
@@ -39,7 +43,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public Float getLatitude() {
- return latitude;
+ return this.latitude;
}
public void setLatitude(Float latitude) {
@@ -47,7 +51,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public Float getLongitude() {
- return longitude;
+ return this.longitude;
}
public void setLongitude(Float longitude) {
@@ -55,7 +59,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public String getCity() {
- return city;
+ return this.city;
}
public void setCity(String city) {
@@ -63,7 +67,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public String getRegion() {
- return region;
+ return this.region;
}
public void setRegion(String region) {
@@ -71,7 +75,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public void setAppid(String appid) {
@@ -79,7 +83,7 @@ public class WxMpSemanticQuery implements Serializable {
}
public String getUid() {
- return uid;
+ return this.uid;
}
public void setUid(String uid) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
index 51d29e28..ff83baa9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
@@ -7,6 +7,10 @@ import java.io.Serializable;
*/
public class WxMpTemplateData implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6301835292940277870L;
private String name;
private String value;
private String color;
@@ -26,7 +30,7 @@ public class WxMpTemplateData implements Serializable {
}
public String getName() {
- return name;
+ return this.name;
}
public void setName(String name) {
@@ -34,7 +38,7 @@ public class WxMpTemplateData implements Serializable {
}
public String getValue() {
- return value;
+ return this.value;
}
public void setValue(String value) {
@@ -42,7 +46,7 @@ public class WxMpTemplateData implements Serializable {
}
public String getColor() {
- return color;
+ return this.color;
}
public void setColor(String color) {
this.color = color;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
index dd822ba5..eec25eda 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
@@ -8,14 +8,18 @@ import java.util.List;
public class WxMpTemplateMessage implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5063374783759519418L;
private String toUser;
private String templateId;
private String url;
private String topColor;
- private List data = new ArrayList();
+ private List data = new ArrayList<>();
public String getToUser() {
- return toUser;
+ return this.toUser;
}
public void setToUser(String toUser) {
@@ -23,7 +27,7 @@ public class WxMpTemplateMessage implements Serializable {
}
public String getTemplateId() {
- return templateId;
+ return this.templateId;
}
public void setTemplateId(String templateId) {
@@ -31,7 +35,7 @@ public class WxMpTemplateMessage implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -39,7 +43,7 @@ public class WxMpTemplateMessage implements Serializable {
}
public String getTopColor() {
- return topColor;
+ return this.topColor;
}
public void setTopColor(String topColor) {
@@ -47,7 +51,7 @@ public class WxMpTemplateMessage implements Serializable {
}
public List getData() {
- return data;
+ return this.data;
}
public void setData(List data) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
index c33b9569..f16c004c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
@@ -24,7 +24,6 @@ public class WxMpUserQuery {
/**
* 语言使用默认(zh_CN)
*
- * @description
* @param openIdList
*/
public WxMpUserQuery(List openIdList) {
@@ -53,7 +52,7 @@ public class WxMpUserQuery {
* @return {@link WxMpUserQuery}
*/
public WxMpUserQuery add(String openId, String lang) {
- queryParamList.add(new WxMpUserQueryParam(openId, lang));
+ this.queryParamList.add(new WxMpUserQueryParam(openId, lang));
return this;
}
@@ -68,7 +67,7 @@ public class WxMpUserQuery {
* @return {@link WxMpUserQuery}
*/
public WxMpUserQuery add(String openId) {
- queryParamList.add(new WxMpUserQueryParam(openId));
+ this.queryParamList.add(new WxMpUserQueryParam(openId));
return this;
}
@@ -79,7 +78,7 @@ public class WxMpUserQuery {
* @return {@link WxMpUserQuery}
*/
public WxMpUserQuery remove(String openId) {
- queryParamList.remove(new WxMpUserQueryParam(openId));
+ this.queryParamList.remove(new WxMpUserQueryParam(openId));
return this;
}
@@ -91,22 +90,21 @@ public class WxMpUserQuery {
* @return {@link WxMpUserQuery}
*/
public WxMpUserQuery remove(String openId, String lang) {
- queryParamList.remove(new WxMpUserQueryParam(openId, lang));
+ this.queryParamList.remove(new WxMpUserQueryParam(openId, lang));
return this;
}
/**
* 获取查询参数列表
*
- * @return
*/
public List getQueryParamList() {
- return queryParamList;
+ return this.queryParamList;
}
public String toJsonString() {
Map map = new HashMap<>();
- map.put("user_list", queryParamList);
+ map.put("user_list", this.queryParamList);
return new Gson().toJson(map);
}
@@ -136,7 +134,7 @@ public class WxMpUserQuery {
}
public String getOpenid() {
- return openid;
+ return this.openid;
}
public void setOpenid(String openid) {
@@ -144,7 +142,7 @@ public class WxMpUserQuery {
}
public String getLang() {
- return lang;
+ return this.lang;
}
public void setLang(String lang) {
@@ -156,8 +154,8 @@ public class WxMpUserQuery {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
- result = prime * result + ((lang == null) ? 0 : lang.hashCode());
- result = prime * result + ((openid == null) ? 0 : openid.hashCode());
+ result = prime * result + ((this.lang == null) ? 0 : this.lang.hashCode());
+ result = prime * result + ((this.openid == null) ? 0 : this.openid.hashCode());
return result;
}
@@ -172,15 +170,15 @@ public class WxMpUserQuery {
WxMpUserQueryParam other = (WxMpUserQueryParam) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
- if (lang == null) {
+ if (this.lang == null) {
if (other.lang != null)
return false;
- } else if (!lang.equals(other.lang))
+ } else if (!this.lang.equals(other.lang))
return false;
- if (openid == null) {
+ if (this.openid == null) {
if (other.openid != null)
return false;
- } else if (!openid.equals(other.openid))
+ } else if (!this.openid.equals(other.openid))
return false;
return true;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessage.java
index 6f6510c2..18204a51 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessage.java
@@ -8,12 +8,16 @@ import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
@XStreamAlias("xml")
public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2684778597067990723L;
@XStreamAlias("Image")
@XStreamConverter(value = XStreamMediaIdConverter.class)
private String mediaId;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMusicMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMusicMessage.java
index b6fefdac..ec71167c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMusicMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMusicMessage.java
@@ -8,6 +8,10 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
@XStreamAlias("xml")
public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4159937804975448945L;
@XStreamAlias("Music")
protected final Music music = new Music();
@@ -16,43 +20,43 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
}
public String getTitle() {
- return music.getTitle();
+ return this.music.getTitle();
}
public void setTitle(String title) {
- music.setTitle(title);
+ this.music.setTitle(title);
}
public String getDescription() {
- return music.getDescription();
+ return this.music.getDescription();
}
public void setDescription(String description) {
- music.setDescription(description);
+ this.music.setDescription(description);
}
public String getThumbMediaId() {
- return music.getThumbMediaId();
+ return this.music.getThumbMediaId();
}
public void setThumbMediaId(String thumbMediaId) {
- music.setThumbMediaId(thumbMediaId);
+ this.music.setThumbMediaId(thumbMediaId);
}
public String getMusicUrl() {
- return music.getMusicUrl();
+ return this.music.getMusicUrl();
}
public void setMusicUrl(String musicUrl) {
- music.setMusicUrl(musicUrl);
+ this.music.setMusicUrl(musicUrl);
}
public String getHqMusicUrl() {
- return music.getHqMusicUrl();
+ return this.music.getHqMusicUrl();
}
public void setHqMusicUrl(String hqMusicUrl) {
- music.setHqMusicUrl(hqMusicUrl);
+ this.music.setHqMusicUrl(hqMusicUrl);
}
@XStreamAlias("Music")
@@ -79,7 +83,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
private String hqMusicUrl;
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -87,7 +91,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
}
public String getDescription() {
- return description;
+ return this.description;
}
public void setDescription(String description) {
@@ -95,7 +99,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
}
public String getThumbMediaId() {
- return thumbMediaId;
+ return this.thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
@@ -103,7 +107,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
}
public String getMusicUrl() {
- return musicUrl;
+ return this.musicUrl;
}
public void setMusicUrl(String musicUrl) {
@@ -111,7 +115,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
}
public String getHqMusicUrl() {
- return hqMusicUrl;
+ return this.hqMusicUrl;
}
public void setHqMusicUrl(String hqMusicUrl) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutNewsMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutNewsMessage.java
index 4b76b4f5..170023a3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutNewsMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutNewsMessage.java
@@ -11,18 +11,23 @@ import java.util.List;
@XStreamAlias("xml")
public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4604402850905714772L;
+
@XStreamAlias("ArticleCount")
protected int articleCount;
@XStreamAlias("Articles")
- protected final List- articles = new ArrayList
- ();
+ protected final List
- articles = new ArrayList<>();
public WxMpXmlOutNewsMessage() {
this.msgType = WxConsts.XML_MSG_NEWS;
}
public int getArticleCount() {
- return articleCount;
+ return this.articleCount;
}
public void addArticle(Item item) {
@@ -31,7 +36,7 @@ public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
}
public List
- getArticles() {
- return articles;
+ return this.articles;
}
@@ -55,35 +60,35 @@ public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
private String Url;
public String getTitle() {
- return Title;
+ return this.Title;
}
public void setTitle(String title) {
- Title = title;
+ this.Title = title;
}
public String getDescription() {
- return Description;
+ return this.Description;
}
public void setDescription(String description) {
- Description = description;
+ this.Description = description;
}
public String getPicUrl() {
- return PicUrl;
+ return this.PicUrl;
}
public void setPicUrl(String picUrl) {
- PicUrl = picUrl;
+ this.PicUrl = picUrl;
}
public String getUrl() {
- return Url;
+ return this.Url;
}
public void setUrl(String url) {
- Url = url;
+ this.Url = url;
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutTextMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutTextMessage.java
index e2458a03..4c439a7c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutTextMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutTextMessage.java
@@ -8,6 +8,10 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
@XStreamAlias("xml")
public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3972786455288763361L;
@XStreamAlias("Content")
@XStreamConverter(value=XStreamCDataConverter.class)
private String content;
@@ -17,7 +21,7 @@ public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
}
public String getContent() {
- return content;
+ return this.content;
}
public void setContent(String content) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVideoMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVideoMessage.java
index fb0520c1..a8f751cf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVideoMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVideoMessage.java
@@ -8,6 +8,10 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
@XStreamAlias("xml")
public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1745902309380113978L;
@XStreamAlias("Video")
protected final Video video = new Video();
@@ -16,27 +20,27 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
}
public String getMediaId() {
- return video.getMediaId();
+ return this.video.getMediaId();
}
public void setMediaId(String mediaId) {
- video.setMediaId(mediaId);
+ this.video.setMediaId(mediaId);
}
public String getTitle() {
- return video.getTitle();
+ return this.video.getTitle();
}
public void setTitle(String title) {
- video.setTitle(title);
+ this.video.setTitle(title);
}
public String getDescription() {
- return video.getDescription();
+ return this.video.getDescription();
}
public void setDescription(String description) {
- video.setDescription(description);
+ this.video.setDescription(description);
}
@@ -56,7 +60,7 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
private String description;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -64,7 +68,7 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
}
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -72,7 +76,7 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
}
public String getDescription() {
- return description;
+ return this.description;
}
public void setDescription(String description) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVoiceMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVoiceMessage.java
index 29c74e90..a47766dc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVoiceMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVoiceMessage.java
@@ -8,6 +8,10 @@ import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
@XStreamAlias("xml")
public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 240367390249860551L;
@XStreamAlias("Voice")
@XStreamConverter(value = XStreamMediaIdConverter.class)
private String mediaId;
@@ -17,7 +21,7 @@ public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
}
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/ImageBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/ImageBuilder.java
index 1c37b46e..1fb5363c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/ImageBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/ImageBuilder.java
@@ -23,6 +23,7 @@ public final class ImageBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/MusicBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/MusicBuilder.java
index 5c1abe38..7a9994ad 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/MusicBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/MusicBuilder.java
@@ -52,13 +52,14 @@ public final class MusicBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMusicUrl(this.musicUrl);
m.setHqMusicUrl(this.hqMusicUrl);
- m.setTitle(title);
- m.setDescription(description);
- m.setThumbMediaId(thumbMediaId);
+ m.setTitle(this.title);
+ m.setDescription(this.description);
+ m.setThumbMediaId(this.thumbMediaId);
return m;
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/NewsBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/NewsBuilder.java
index 825e72f8..ad0efb23 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/NewsBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/NewsBuilder.java
@@ -17,7 +17,7 @@ import java.util.List;
*/
public final class NewsBuilder extends BaseBuilder {
- private List articles = new ArrayList();
+ private List articles = new ArrayList<>();
public NewsBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_NEWS;
@@ -28,6 +28,7 @@ public final class NewsBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setArticles(this.articles);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/TextBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/TextBuilder.java
index 11249d6d..7f458457 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/TextBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/TextBuilder.java
@@ -23,6 +23,7 @@ public final class TextBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setContent(this.content);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VideoBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VideoBuilder.java
index a871d491..bda6ef7c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VideoBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VideoBuilder.java
@@ -47,12 +47,13 @@ public final class VideoBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
- m.setTitle(title);
- m.setDescription(description);
- m.setThumbMediaId(thumbMediaId);
+ m.setTitle(this.title);
+ m.setDescription(this.description);
+ m.setThumbMediaId(this.thumbMediaId);
return m;
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VoiceBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VoiceBuilder.java
index 3f81aeb0..867c8aff 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VoiceBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VoiceBuilder.java
@@ -23,6 +23,7 @@ public final class VoiceBuilder extends BaseBuilder {
return this;
}
+ @Override
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
index 5078a2e5..570f2def 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
@@ -21,7 +21,7 @@ public class WxMpKfMsgList {
private Long msgId;
public List getRecords() {
- return records;
+ return this.records;
}
public void setRecords(List records) {
@@ -29,7 +29,7 @@ public class WxMpKfMsgList {
}
public Integer getNumber() {
- return number;
+ return this.number;
}
public void setNumber(Integer number) {
@@ -37,7 +37,7 @@ public class WxMpKfMsgList {
}
public Long getMsgId() {
- return msgId;
+ return this.msgId;
}
public void setMsgId(Long msgId) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
index 00b7771e..3fe2002c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
@@ -46,7 +46,7 @@ public class WxMpKfMsgRecord {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
public String getWorker() {
- return worker;
+ return this.worker;
}
public void setWorker(String worker) {
@@ -54,7 +54,7 @@ public class WxMpKfMsgRecord {
}
public String getOpenid() {
- return openid;
+ return this.openid;
}
public void setOpenid(String openid) {
@@ -62,7 +62,7 @@ public class WxMpKfMsgRecord {
}
public String getText() {
- return text;
+ return this.text;
}
public void setText(String text) {
@@ -70,7 +70,7 @@ public class WxMpKfMsgRecord {
}
public Long getTime() {
- return time;
+ return this.time;
}
public void setTime(Long time) {
@@ -78,7 +78,7 @@ public class WxMpKfMsgRecord {
}
public Integer getOperateCode() {
- return operateCode;
+ return this.operateCode;
}
public void setOperateCode(Integer operateCode) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/ImageBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/ImageBuilder.java
index e263e57f..ee265bf3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/ImageBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/ImageBuilder.java
@@ -15,6 +15,7 @@ public final class ImageBuilder extends BaseBuilder {
- protected final List articles = new ArrayList();
+ protected final List articles = new ArrayList<>();
public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item item) {
this.articles.add(item);
return this;
}
+ @Override
public WxMpXmlOutNewsMessage build() {
WxMpXmlOutNewsMessage m = new WxMpXmlOutNewsMessage();
- for(WxMpXmlOutNewsMessage.Item item : articles) {
+ for(WxMpXmlOutNewsMessage.Item item : this.articles) {
m.addArticle(item);
}
setCommon(m);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/TextBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/TextBuilder.java
index 8352ddea..f8075e44 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/TextBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/TextBuilder.java
@@ -15,6 +15,7 @@ public final class TextBuilder extends BaseBuilder items;
public int getTotalCount() {
- return totalCount;
+ return this.totalCount;
}
public void setTotalCount(int totalCount) {
@@ -19,7 +23,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
}
public int getItemCount() {
- return itemCount;
+ return this.itemCount;
}
public void setItemCount(int itemCount) {
@@ -27,7 +31,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
}
public List getItems() {
- return items;
+ return this.items;
}
public void setItems(List items) {
@@ -36,7 +40,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
@Override
public String toString() {
- return "WxMpMaterialFileBatchGetResult [" + "totalCount=" + totalCount + ", itemCount=" + itemCount + ", items=" + items + "]";
+ return "WxMpMaterialFileBatchGetResult [" + "totalCount=" + this.totalCount + ", itemCount=" + this.itemCount + ", items=" + this.items + "]";
}
public static class WxMaterialFileBatchGetNewsItem {
@@ -46,7 +50,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
private String url;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -54,7 +58,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
}
public Date getUpdateTime() {
- return updateTime;
+ return this.updateTime;
}
public void setUpdateTime(Date updateTime) {
@@ -62,7 +66,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
}
public String getName() {
- return name;
+ return this.name;
}
public void setName(String name) {
@@ -70,7 +74,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -79,7 +83,7 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
@Override
public String toString() {
- return "WxMaterialFileBatchGetNewsItem [" + "mediaId=" + mediaId + ", updateTime=" + updateTime + ", name=" + name + ", url=" + url + "]";
+ return "WxMaterialFileBatchGetNewsItem [" + "mediaId=" + this.mediaId + ", updateTime=" + this.updateTime + ", name=" + this.name + ", url=" + this.url + "]";
}
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialNewsBatchGetResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialNewsBatchGetResult.java
index 2d78ab8c..48563244 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialNewsBatchGetResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialNewsBatchGetResult.java
@@ -8,12 +8,16 @@ import java.util.List;
public class WxMpMaterialNewsBatchGetResult implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1617952797921001666L;
private int totalCount;
private int itemCount;
private List items;
public int getTotalCount() {
- return totalCount;
+ return this.totalCount;
}
public void setTotalCount(int totalCount) {
@@ -21,7 +25,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
}
public int getItemCount() {
- return itemCount;
+ return this.itemCount;
}
public void setItemCount(int itemCount) {
@@ -29,7 +33,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
}
public List getItems() {
- return items;
+ return this.items;
}
public void setItems(List items) {
@@ -38,7 +42,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
@Override
public String toString() {
- return "WxMpMaterialNewsBatchGetResult [" + "totalCount=" + totalCount + ", itemCount=" + itemCount + ", items=" + items + "]";
+ return "WxMpMaterialNewsBatchGetResult [" + "totalCount=" + this.totalCount + ", itemCount=" + this.itemCount + ", items=" + this.items + "]";
}
public static class WxMaterialNewsBatchGetNewsItem {
@@ -47,7 +51,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
private WxMpMaterialNews content;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -55,7 +59,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
}
public Date getUpdateTime() {
- return updateTime;
+ return this.updateTime;
}
public void setUpdateTime(Date updateTime) {
@@ -63,7 +67,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
}
public WxMpMaterialNews getContent() {
- return content;
+ return this.content;
}
public void setContent(WxMpMaterialNews content) {
@@ -72,7 +76,7 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
@Override
public String toString() {
- return "WxMaterialNewsBatchGetNewsItem [" + "mediaId=" + mediaId + ", updateTime=" + updateTime + ", content=" + content + "]";
+ return "WxMaterialNewsBatchGetNewsItem [" + "mediaId=" + this.mediaId + ", updateTime=" + this.updateTime + ", content=" + this.content + "]";
}
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialUploadResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialUploadResult.java
index 2c2bf4d6..cb9cecd1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialUploadResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialUploadResult.java
@@ -6,11 +6,15 @@ import java.io.Serializable;
public class WxMpMaterialUploadResult implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -128818731449449537L;
private String mediaId;
private String url;
public String getMediaId() {
- return mediaId;
+ return this.mediaId;
}
public void setMediaId(String mediaId) {
@@ -18,7 +22,7 @@ public class WxMpMaterialUploadResult implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
@@ -31,7 +35,7 @@ public class WxMpMaterialUploadResult implements Serializable {
@Override
public String toString() {
- return "WxMpMaterialUploadResult [media_id=" + mediaId + ", url=" + url + "]";
+ return "WxMpMaterialUploadResult [media_id=" + this.mediaId + ", url=" + this.url + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialVideoInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialVideoInfoResult.java
index 1650c760..456544d1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialVideoInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialVideoInfoResult.java
@@ -6,12 +6,16 @@ import java.io.Serializable;
public class WxMpMaterialVideoInfoResult implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1269131745333792202L;
private String title;
private String description;
private String downUrl;
public String getTitle() {
- return title;
+ return this.title;
}
public void setTitle(String title) {
@@ -19,7 +23,7 @@ public class WxMpMaterialVideoInfoResult implements Serializable {
}
public String getDescription() {
- return description;
+ return this.description;
}
public void setDescription(String description) {
@@ -27,7 +31,7 @@ public class WxMpMaterialVideoInfoResult implements Serializable {
}
public String getDownUrl() {
- return downUrl;
+ return this.downUrl;
}
public void setDownUrl(String downUrl) {
@@ -40,7 +44,7 @@ public class WxMpMaterialVideoInfoResult implements Serializable {
@Override
public String toString() {
- return "WxMpMaterialVideoInfoResult [title=" + title + ", description=" + description + ", downUrl=" + downUrl + "]";
+ return "WxMpMaterialVideoInfoResult [title=" + this.title + ", description=" + this.description + ", downUrl=" + this.downUrl + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
index 6ac77c83..d38317ce 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
@@ -6,6 +6,11 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
public class WxMpOAuth2AccessToken implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1345910558078620805L;
+
private String accessToken;
private int expiresIn = -1;
@@ -19,7 +24,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
private String unionId;
public String getRefreshToken() {
- return refreshToken;
+ return this.refreshToken;
}
public void setRefreshToken(String refreshToken) {
@@ -27,7 +32,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
}
public String getOpenId() {
- return openId;
+ return this.openId;
}
public void setOpenId(String openId) {
@@ -35,7 +40,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
}
public String getScope() {
- return scope;
+ return this.scope;
}
public void setScope(String scope) {
@@ -43,7 +48,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
}
public String getAccessToken() {
- return accessToken;
+ return this.accessToken;
}
public void setAccessToken(String accessToken) {
@@ -51,7 +56,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
}
public int getExpiresIn() {
- return expiresIn;
+ return this.expiresIn;
}
public void setExpiresIn(int expiresIn) {
@@ -59,7 +64,7 @@ public class WxMpOAuth2AccessToken implements Serializable {
}
public String getUnionId() {
- return unionId;
+ return this.unionId;
}
public void setUnionId(String unionId) {
@@ -73,12 +78,12 @@ public class WxMpOAuth2AccessToken implements Serializable {
@Override
public String toString() {
return "WxMpOAuth2AccessToken{" +
- "accessToken='" + accessToken + '\'' +
- ", expiresTime=" + expiresIn +
- ", refreshToken='" + refreshToken + '\'' +
- ", openId='" + openId + '\'' +
- ", scope='" + scope + '\'' +
- ", unionId='" + unionId + '\'' +
+ "accessToken='" + this.accessToken + '\'' +
+ ", expiresTime=" + this.expiresIn +
+ ", refreshToken='" + this.refreshToken + '\'' +
+ ", openId='" + this.openId + '\'' +
+ ", scope='" + this.scope + '\'' +
+ ", unionId='" + this.unionId + '\'' +
'}';
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java
index 18aeda4d..6e96f5e2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java
@@ -12,6 +12,10 @@ import java.io.Serializable;
* @author ukid
*/
public class WxMpPayCallback implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4143804055690843641L;
private String return_code;
private String return_msg;
@@ -42,111 +46,111 @@ public class WxMpPayCallback implements Serializable {
private String time_end;
public String getReturn_code() {
- return return_code;
+ return this.return_code;
}
public String getReturn_msg() {
- return return_msg;
+ return this.return_msg;
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public String getMch_id() {
- return mch_id;
+ return this.mch_id;
}
public String getDevice_info() {
- return device_info;
+ return this.device_info;
}
public String getNonce_str() {
- return nonce_str;
+ return this.nonce_str;
}
public String getSign() {
- return sign;
+ return this.sign;
}
public String getResult_code() {
- return result_code;
+ return this.result_code;
}
public String getErr_code() {
- return err_code;
+ return this.err_code;
}
public String getErr_code_des() {
- return err_code_des;
+ return this.err_code_des;
}
public String getOpenid() {
- return openid;
+ return this.openid;
}
public String getIs_subscribe() {
- return is_subscribe;
+ return this.is_subscribe;
}
public String getTrade_type() {
- return trade_type;
+ return this.trade_type;
}
public String getBank_type() {
- return bank_type;
+ return this.bank_type;
}
public String getTotal_fee() {
- return total_fee;
+ return this.total_fee;
}
public String getFee_type() {
- return fee_type;
+ return this.fee_type;
}
public String getCash_fee() {
- return cash_fee;
+ return this.cash_fee;
}
public String getCash_fee_type() {
- return cash_fee_type;
+ return this.cash_fee_type;
}
public String getCoupon_fee() {
- return coupon_fee;
+ return this.coupon_fee;
}
public String getCoupon_count() {
- return coupon_count;
+ return this.coupon_count;
}
public String getCoupon_batch_id_$n() {
- return coupon_batch_id_$n;
+ return this.coupon_batch_id_$n;
}
public String getCoupon_id_$n() {
- return coupon_id_$n;
+ return this.coupon_id_$n;
}
public String getCoupon_fee_$n() {
- return coupon_fee_$n;
+ return this.coupon_fee_$n;
}
public String getTransaction_id() {
- return transaction_id;
+ return this.transaction_id;
}
public String getOut_trade_no() {
- return out_trade_no;
+ return this.out_trade_no;
}
public String getAttach() {
- return attach;
+ return this.attach;
}
public String getTime_end() {
- return time_end;
+ return this.time_end;
}
public void setReturn_code(String return_code) {
@@ -259,21 +263,21 @@ public class WxMpPayCallback implements Serializable {
@Override
public String toString() {
- return "WxMpPayCallback [return_code=" + return_code + ", return_msg="
- + return_msg + ", appid=" + appid + ", mch_id=" + mch_id
- + ", device_info=" + device_info + ", nonce_str=" + nonce_str
- + ", sign=" + sign + ", result_code=" + result_code
- + ", err_code=" + err_code + ", err_code_des=" + err_code_des
- + ", openid=" + openid + ", is_subscribe=" + is_subscribe
- + ", trade_type=" + trade_type + ", bank_type=" + bank_type
- + ", total_fee=" + total_fee + ", fee_type=" + fee_type
- + ", cash_fee=" + cash_fee + ", cash_fee_type=" + cash_fee_type
- + ", coupon_fee=" + coupon_fee + ", coupon_count="
- + coupon_count + ", coupon_batch_id_$n=" + coupon_batch_id_$n
- + ", coupon_id_$n=" + coupon_id_$n + ", coupon_fee_$n="
- + coupon_fee_$n + ", transaction_id=" + transaction_id
- + ", out_trade_no=" + out_trade_no + ", attach=" + attach
- + ", time_end=" + time_end + "]";
+ return "WxMpPayCallback [return_code=" + this.return_code + ", return_msg="
+ + this.return_msg + ", appid=" + this.appid + ", mch_id=" + this.mch_id
+ + ", device_info=" + this.device_info + ", nonce_str=" + this.nonce_str
+ + ", sign=" + this.sign + ", result_code=" + this.result_code
+ + ", err_code=" + this.err_code + ", err_code_des=" + this.err_code_des
+ + ", openid=" + this.openid + ", is_subscribe=" + this.is_subscribe
+ + ", trade_type=" + this.trade_type + ", bank_type=" + this.bank_type
+ + ", total_fee=" + this.total_fee + ", fee_type=" + this.fee_type
+ + ", cash_fee=" + this.cash_fee + ", cash_fee_type=" + this.cash_fee_type
+ + ", coupon_fee=" + this.coupon_fee + ", coupon_count="
+ + this.coupon_count + ", coupon_batch_id_$n=" + this.coupon_batch_id_$n
+ + ", coupon_id_$n=" + this.coupon_id_$n + ", coupon_fee_$n="
+ + this.coupon_fee_$n + ", transaction_id=" + this.transaction_id
+ + ", out_trade_no=" + this.out_trade_no + ", attach=" + this.attach
+ + ", time_end=" + this.time_end + "]";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java
index 1e8327e3..4d51e8f4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java
@@ -85,7 +85,7 @@ public class WxMpPayRefundResult implements Serializable {
private String couponRefundId;
public String getReturnCode() {
- return returnCode;
+ return this.returnCode;
}
public void setReturnCode(String returnCode) {
@@ -93,7 +93,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getReturnMsg() {
- return returnMsg;
+ return this.returnMsg;
}
public void setReturnMsg(String returnMsg) {
@@ -101,7 +101,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getResultCode() {
- return resultCode;
+ return this.resultCode;
}
public void setResultCode(String resultCode) {
@@ -109,7 +109,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getErrCode() {
- return errCode;
+ return this.errCode;
}
public void setErrCode(String errCode) {
@@ -117,7 +117,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getErrCodeDes() {
- return errCodeDes;
+ return this.errCodeDes;
}
public void setErrCodeDes(String errCodeDes) {
@@ -125,7 +125,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public void setAppid(String appid) {
@@ -133,7 +133,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getMchId() {
- return mchId;
+ return this.mchId;
}
public void setMchId(String mchId) {
@@ -141,7 +141,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getDeviceInfo() {
- return deviceInfo;
+ return this.deviceInfo;
}
public void setDeviceInfo(String deviceInfo) {
@@ -149,7 +149,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getNonceStr() {
- return nonceStr;
+ return this.nonceStr;
}
public void setNonceStr(String nonceStr) {
@@ -157,7 +157,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getSign() {
- return sign;
+ return this.sign;
}
public void setSign(String sign) {
@@ -165,7 +165,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getTransactionId() {
- return transactionId;
+ return this.transactionId;
}
public void setTransactionId(String transactionId) {
@@ -173,7 +173,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getOutTradeNo() {
- return outTradeNo;
+ return this.outTradeNo;
}
public void setOutTradeNo(String outTradeNo) {
@@ -181,7 +181,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getOutRefundNo() {
- return outRefundNo;
+ return this.outRefundNo;
}
public void setOutRefundNo(String outRefundNo) {
@@ -189,7 +189,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getRefundId() {
- return refundId;
+ return this.refundId;
}
public void setRefundId(String refundId) {
@@ -197,7 +197,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getRefundChannel() {
- return refundChannel;
+ return this.refundChannel;
}
public void setRefundChannel(String refundChannel) {
@@ -205,7 +205,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getRefundFee() {
- return refundFee;
+ return this.refundFee;
}
public void setRefundFee(String refundFee) {
@@ -213,7 +213,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getTotalFee() {
- return totalFee;
+ return this.totalFee;
}
public void setTotalFee(String totalFee) {
@@ -221,7 +221,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getFeeType() {
- return feeType;
+ return this.feeType;
}
public void setFeeType(String feeType) {
@@ -229,7 +229,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getCashFee() {
- return cashFee;
+ return this.cashFee;
}
public void setCashFee(String cashFee) {
@@ -237,7 +237,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getCashRefundfee() {
- return cashRefundfee;
+ return this.cashRefundfee;
}
public void setCashRefundfee(String cashRefundfee) {
@@ -245,7 +245,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getCouponRefundFee() {
- return couponRefundFee;
+ return this.couponRefundFee;
}
public void setCouponRefundFee(String couponRefundFee) {
@@ -253,7 +253,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getCouponRefundCount() {
- return couponRefundCount;
+ return this.couponRefundCount;
}
public void setCouponRefundCount(String couponRefundCount) {
@@ -261,7 +261,7 @@ public class WxMpPayRefundResult implements Serializable {
}
public String getCouponRefundId() {
- return couponRefundId;
+ return this.couponRefundId;
}
public void setCouponRefundId(String couponRefundId) {
@@ -271,8 +271,8 @@ public class WxMpPayRefundResult implements Serializable {
@Override
public String toString() {
return "[" +
- "return_code:" + returnCode + ";" +
- "return_msg" + returnMsg + ";";
+ "return_code:" + this.returnCode + ";" +
+ "return_msg" + this.returnMsg + ";";
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
index 3c788729..1ea8fd65 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
@@ -43,91 +43,91 @@ public class WxMpPayResult implements Serializable {
private String time_end;
public String getReturn_code() {
- return return_code;
+ return this.return_code;
}
public String getReturn_msg() {
- return return_msg;
+ return this.return_msg;
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public String getMch_id() {
- return mch_id;
+ return this.mch_id;
}
public String getNonce_str() {
- return nonce_str;
+ return this.nonce_str;
}
public String getSign() {
- return sign;
+ return this.sign;
}
public String getResult_code() {
- return result_code;
+ return this.result_code;
}
public String getErr_code() {
- return err_code;
+ return this.err_code;
}
public String getErr_code_des() {
- return err_code_des;
+ return this.err_code_des;
}
public String getTrade_state() {
- return trade_state;
+ return this.trade_state;
}
public String getDevice_info() {
- return device_info;
+ return this.device_info;
}
public String getOpenid() {
- return openid;
+ return this.openid;
}
public String getIs_subscribe() {
- return is_subscribe;
+ return this.is_subscribe;
}
public String getTrade_type() {
- return trade_type;
+ return this.trade_type;
}
public String getBank_type() {
- return bank_type;
+ return this.bank_type;
}
public String getTotal_fee() {
- return total_fee;
+ return this.total_fee;
}
public String getCoupon_fee() {
- return coupon_fee;
+ return this.coupon_fee;
}
public String getFee_type() {
- return fee_type;
+ return this.fee_type;
}
public String getTransaction_id() {
- return transaction_id;
+ return this.transaction_id;
}
public String getOut_trade_no() {
- return out_trade_no;
+ return this.out_trade_no;
}
public String getAttach() {
- return attach;
+ return this.attach;
}
public String getTime_end() {
- return time_end;
+ return this.time_end;
}
public void setReturn_code(String return_code) {
@@ -219,7 +219,7 @@ public class WxMpPayResult implements Serializable {
}
public String getTrade_state_desc() {
- return trade_state_desc;
+ return this.trade_state_desc;
}
public void setTrade_state_desc(String trade_state_desc) {
@@ -229,29 +229,29 @@ public class WxMpPayResult implements Serializable {
@Override
public String toString() {
return "WxMpPayResult{" +
- "return_code=" + return_code +
- ", return_msg='" + return_msg + '\'' +
- ", appid='" + appid + '\'' +
- ", mch_id='" + mch_id + '\'' +
- ", nonce_str='" + nonce_str + '\'' +
- ", sign='" + sign + '\'' +
- ", result_code='" + result_code + '\'' +
- ", err_code='" + err_code + '\'' +
- ", err_code_des='" + err_code_des + '\'' +
- ", trade_state=" + trade_state +
- ", trade_state_desc=" + trade_state_desc +
- ", device_info='" + device_info + '\'' +
- ", openid='" + openid + '\'' +
- ", is_subscribe='" + is_subscribe + '\'' +
- ", trade_type='" + trade_type + '\'' +
- ", bank_type='" + bank_type + '\'' +
- ", total_fee='" + total_fee + '\'' +
- ", coupon_fee='" + coupon_fee + '\'' +
- ", fee_type='" + fee_type + '\'' +
- ", transaction_id='" + transaction_id + '\'' +
- ", out_trade_no='" + out_trade_no + '\'' +
- ", attach='" + attach + '\'' +
- ", time_end='" + time_end + '\'' +
+ "return_code=" + this.return_code +
+ ", return_msg='" + this.return_msg + '\'' +
+ ", appid='" + this.appid + '\'' +
+ ", mch_id='" + this.mch_id + '\'' +
+ ", nonce_str='" + this.nonce_str + '\'' +
+ ", sign='" + this.sign + '\'' +
+ ", result_code='" + this.result_code + '\'' +
+ ", err_code='" + this.err_code + '\'' +
+ ", err_code_des='" + this.err_code_des + '\'' +
+ ", trade_state=" + this.trade_state +
+ ", trade_state_desc=" + this.trade_state_desc +
+ ", device_info='" + this.device_info + '\'' +
+ ", openid='" + this.openid + '\'' +
+ ", is_subscribe='" + this.is_subscribe + '\'' +
+ ", trade_type='" + this.trade_type + '\'' +
+ ", bank_type='" + this.bank_type + '\'' +
+ ", total_fee='" + this.total_fee + '\'' +
+ ", coupon_fee='" + this.coupon_fee + '\'' +
+ ", fee_type='" + this.fee_type + '\'' +
+ ", transaction_id='" + this.transaction_id + '\'' +
+ ", out_trade_no='" + this.out_trade_no + '\'' +
+ ", attach='" + this.attach + '\'' +
+ ", time_end='" + this.time_end + '\'' +
'}';
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java
index b5c09b21..e930fc13 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java
@@ -13,6 +13,10 @@ import java.io.Serializable;
* @author chanjarster
*/
public class WxMpPrepayIdResult implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8970574397788396143L;
private String return_code;
private String return_msg;
private String appid;
@@ -27,7 +31,7 @@ public class WxMpPrepayIdResult implements Serializable {
private String code_url;
public String getReturn_code() {
- return return_code;
+ return this.return_code;
}
public void setReturn_code(String return_code) {
@@ -35,7 +39,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getReturn_msg() {
- return return_msg;
+ return this.return_msg;
}
public void setReturn_msg(String return_msg) {
@@ -43,7 +47,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getAppid() {
- return appid;
+ return this.appid;
}
public void setAppid(String appid) {
@@ -51,7 +55,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getMch_id() {
- return mch_id;
+ return this.mch_id;
}
public void setMch_id(String mch_id) {
@@ -59,7 +63,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getNonce_str() {
- return nonce_str;
+ return this.nonce_str;
}
public void setNonce_str(String nonce_str) {
@@ -67,7 +71,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getSign() {
- return sign;
+ return this.sign;
}
public void setSign(String sign) {
@@ -75,7 +79,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getResult_code() {
- return result_code;
+ return this.result_code;
}
public void setResult_code(String result_code) {
@@ -83,7 +87,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getPrepay_id() {
- return prepay_id;
+ return this.prepay_id;
}
public void setPrepay_id(String prepay_id) {
@@ -91,7 +95,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getTrade_type() {
- return trade_type;
+ return this.trade_type;
}
public void setTrade_type(String trade_type) {
@@ -99,7 +103,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getErr_code() {
- return err_code;
+ return this.err_code;
}
public void setErr_code(String err_code) {
@@ -107,7 +111,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getErr_code_des() {
- return err_code_des;
+ return this.err_code_des;
}
public void setErr_code_des(String err_code_des) {
@@ -115,7 +119,7 @@ public class WxMpPrepayIdResult implements Serializable {
}
public String getCode_url() {
- return code_url;
+ return this.code_url;
}
public void setCode_url(String code_url) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
index 537b771c..a2917ecc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
@@ -11,12 +11,16 @@ import java.io.Serializable;
*/
public class WxMpQrCodeTicket implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5777119669111011584L;
protected String ticket;
protected int expire_seconds = -1;
protected String url;
public String getTicket() {
- return ticket;
+ return this.ticket;
}
public void setTicket(String ticket) {
@@ -27,7 +31,7 @@ public class WxMpQrCodeTicket implements Serializable {
* 如果返回-1说明是永久
*/
public int getExpire_seconds() {
- return expire_seconds;
+ return this.expire_seconds;
}
public void setExpire_seconds(int expire_seconds) {
@@ -35,7 +39,7 @@ public class WxMpQrCodeTicket implements Serializable {
}
public String getUrl() {
- return url;
+ return this.url;
}
public void setUrl(String url) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
index 936cfbfe..c8a01d3e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
@@ -13,6 +13,10 @@ import java.io.Serializable;
*/
public class WxMpSemanticQueryResult implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4811088544804441365L;
private String query;
private String type;
private String semantic;
@@ -21,7 +25,7 @@ public class WxMpSemanticQueryResult implements Serializable {
private String text;
public String getQuery() {
- return query;
+ return this.query;
}
public void setQuery(String query) {
@@ -29,7 +33,7 @@ public class WxMpSemanticQueryResult implements Serializable {
}
public String getType() {
- return type;
+ return this.type;
}
public void setType(String type) {
@@ -37,7 +41,7 @@ public class WxMpSemanticQueryResult implements Serializable {
}
public String getSemantic() {
- return semantic;
+ return this.semantic;
}
public void setSemantic(String semantic) {
@@ -45,7 +49,7 @@ public class WxMpSemanticQueryResult implements Serializable {
}
public String getResult() {
- return result;
+ return this.result;
}
public void setResult(String result) {
@@ -53,7 +57,7 @@ public class WxMpSemanticQueryResult implements Serializable {
}
public String getAnswer() {
- return answer;
+ return this.answer;
}
public void setAnswer(String answer) {
@@ -61,7 +65,7 @@ public class WxMpSemanticQueryResult implements Serializable {
}
public String getText() {
- return text;
+ return this.text;
}
public void setText(String text) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
index e0e34228..76670f02 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -37,70 +37,70 @@ public class WxMpUser implements Serializable {
protected Integer groupId;
public Boolean getSubscribe() {
- return subscribe;
+ return this.subscribe;
}
public Boolean isSubscribe() {
- return subscribe;
+ return this.subscribe;
}
public void setSubscribe(Boolean subscribe) {
this.subscribe = subscribe;
}
public String getOpenId() {
- return openId;
+ return this.openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public String getNickname() {
- return nickname;
+ return this.nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
public String getSex() {
- return sex;
+ return this.sex;
}
public void setSex(String sex) {
this.sex = sex;
}
public String getLanguage() {
- return language;
+ return this.language;
}
public void setLanguage(String language) {
this.language = language;
}
public String getCity() {
- return city;
+ return this.city;
}
public void setCity(String city) {
this.city = city;
}
public String getProvince() {
- return province;
+ return this.province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCountry() {
- return country;
+ return this.country;
}
public void setCountry(String country) {
this.country = country;
}
public String getHeadImgUrl() {
- return headImgUrl;
+ return this.headImgUrl;
}
public void setHeadImgUrl(String headImgUrl) {
this.headImgUrl = headImgUrl;
}
public Long getSubscribeTime() {
- return subscribeTime;
+ return this.subscribeTime;
}
public void setSubscribeTime(Long subscribeTime) {
this.subscribeTime = subscribeTime;
}
public String getUnionId() {
- return unionId;
+ return this.unionId;
}
public void setUnionId(String unionId) {
this.unionId = unionId;
@@ -108,7 +108,7 @@ public class WxMpUser implements Serializable {
public Integer getSexId() {
- return sexId;
+ return this.sexId;
}
public void setSexId(Integer sexId) {
@@ -116,13 +116,13 @@ public class WxMpUser implements Serializable {
}
public String getRemark() {
- return remark;
+ return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getGroupId() {
- return groupId;
+ return this.groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
@@ -142,19 +142,19 @@ public class WxMpUser implements Serializable {
@Override
public String toString() {
return "WxMpUser{" +
- "subscribe=" + subscribe +
- ", openId='" + openId + '\'' +
- ", nickname='" + nickname + '\'' +
- ", sex='" + sex + '\'' +
- ", language='" + language + '\'' +
- ", city='" + city + '\'' +
- ", province='" + province + '\'' +
- ", country='" + country + '\'' +
- ", headImgUrl='" + headImgUrl + '\'' +
- ", subscribeTime=" + subscribeTime +
- ", unionId='" + unionId + '\'' +
- ", remark='" + remark + '\'' +
- ", groupId='" + groupId + '\'' +
+ "subscribe=" + this.subscribe +
+ ", openId='" + this.openId + '\'' +
+ ", nickname='" + this.nickname + '\'' +
+ ", sex='" + this.sex + '\'' +
+ ", language='" + this.language + '\'' +
+ ", city='" + this.city + '\'' +
+ ", province='" + this.province + '\'' +
+ ", country='" + this.country + '\'' +
+ ", headImgUrl='" + this.headImgUrl + '\'' +
+ ", subscribeTime=" + this.subscribeTime +
+ ", unionId='" + this.unionId + '\'' +
+ ", remark='" + this.remark + '\'' +
+ ", groupId='" + this.groupId + '\'' +
'}';
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
index 842f1327..94b51f6c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
@@ -14,28 +14,28 @@ public class WxMpUserList {
protected int total = -1;
protected int count = -1;
- protected List openIds = new ArrayList();
+ protected List openIds = new ArrayList<>();
protected String nextOpenId;
public int getTotal() {
- return total;
+ return this.total;
}
public void setTotal(int total) {
this.total = total;
}
public int getCount() {
- return count;
+ return this.count;
}
public void setCount(int count) {
this.count = count;
}
public List getOpenIds() {
- return openIds;
+ return this.openIds;
}
public void setOpenIds(List openIds) {
this.openIds = openIds;
}
public String getNextOpenId() {
- return nextOpenId;
+ return this.nextOpenId;
}
public void setNextOpenId(String nextOpenId) {
this.nextOpenId = nextOpenId;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java
index 37121247..be328668 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java
@@ -47,72 +47,72 @@ public class WxRedpackResult implements Serializable {
String sendListid;
public String getErrCode() {
- return errCode;
+ return this.errCode;
}
public String getErrCodeDes() {
- return errCodeDes;
+ return this.errCodeDes;
}
public String getReturnCode() {
- return returnCode;
+ return this.returnCode;
}
public String getReturnMsg() {
- return returnMsg;
+ return this.returnMsg;
}
public String getSign() {
- return sign;
+ return this.sign;
}
public String getResultCode() {
- return resultCode;
+ return this.resultCode;
}
public String getMchBillno() {
- return mchBillno;
+ return this.mchBillno;
}
public String getMchId() {
- return mchId;
+ return this.mchId;
}
public String getWxappid() {
- return wxappid;
+ return this.wxappid;
}
public String getReOpenid() {
- return reOpenid;
+ return this.reOpenid;
}
public int getTotalAmount() {
- return totalAmount;
+ return this.totalAmount;
}
public String getSendTime() {
- return sendTime;
+ return this.sendTime;
}
public String getSendListid() {
- return sendListid;
+ return this.sendListid;
}
@Override
public String toString() {
return "WxRedpackResult{" +
- "returnCode=" + returnCode +
- ", returnMsg=" + returnMsg +
- ", sign=" + sign +
- ", errCode=" + errCode +
- ", errCodeDes=" + errCodeDes +
- ", mchBillno=" + mchBillno +
- ", mchId=" + mchId +
- ", wxappid=" + wxappid +
- ", reOpenid=" + reOpenid +
- ", totalAmount=" + totalAmount +
- ", sendTime=" + sendTime +
- ", sendListid=" + sendListid +
+ "returnCode=" + this.returnCode +
+ ", returnMsg=" + this.returnMsg +
+ ", sign=" + this.sign +
+ ", errCode=" + this.errCode +
+ ", errCodeDes=" + this.errCodeDes +
+ ", mchBillno=" + this.mchBillno +
+ ", mchId=" + this.mchId +
+ ", wxappid=" + this.wxappid +
+ ", reOpenid=" + this.reOpenid +
+ ", totalAmount=" + this.totalAmount +
+ ", sendTime=" + this.sendTime +
+ ", sendListid=" + this.sendListid +
'}';
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java
index e0529bd3..9502afe6 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java
@@ -6,7 +6,6 @@ import me.chanjar.weixin.common.util.http.RequestExecutor;
import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import org.apache.http.HttpHost;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
@@ -24,6 +23,7 @@ public class MaterialDeleteRequestExecutor implements RequestExecutor {
@@ -34,6 +34,7 @@ public class MaterialVoiceAndImageDownloadRequestExecutor implements RequestExec
this.tmpDirFile = tmpDirFile;
}
+ @Override
public InputStream execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, String materialId) throws WxErrorException, IOException {
HttpPost httpPost = new HttpPost(uri);
if (httpProxy != null) {
@@ -44,9 +45,9 @@ public class MaterialVoiceAndImageDownloadRequestExecutor implements RequestExec
Map params = new HashMap<>();
params.put("media_id", materialId);
httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
- try(CloseableHttpResponse response = httpclient.execute(httpPost)){
+ try (CloseableHttpResponse response = httpclient.execute(httpPost);
+ InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);){
// 下载媒体文件出错
- InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
byte[] responseContent = IOUtils.toByteArray(inputStream);
String responseContentString = new String(responseContent, "UTF-8");
if (responseContentString.length() < 100) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java
index 8e901443..49606031 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java
@@ -7,7 +7,6 @@ import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
import me.chanjar.weixin.mp.bean.result.WxMediaImgUploadResult;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
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 96e444e7..2486ca80 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
@@ -9,7 +9,6 @@ import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
import org.apache.http.Header;
import org.apache.http.HttpHost;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -47,7 +46,8 @@ public class QrCodeRequestExecutor implements RequestExecutor 0) {
// 出错
@@ -56,8 +56,6 @@ public class QrCodeRequestExecutor implements RequestExecutor {
+ @Override
public JsonElement serialize(WxMpCustomMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
messageJson.addProperty("touser", message.getToUser());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
index 58e6f98d..a6a48ed7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Type;
public class WxMpGroupGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMpGroup group, Type typeOfSrc, JsonSerializationContext context) {
JsonObject json = new JsonObject();
JsonObject groupJson = new JsonObject();
@@ -26,6 +27,7 @@ public class WxMpGroupGsonAdapter implements JsonSerializer, JsonDese
return json;
}
+ @Override
public WxMpGroup deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpGroup group = new WxMpGroup();
JsonObject groupJson = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
index 79a9a0c6..4ad45848 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
@@ -19,6 +19,7 @@ import java.lang.reflect.Type;
public class WxMpMassGroupMessageGsonAdapter implements JsonSerializer {
+ @Override
public JsonElement serialize(WxMpMassGroupMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
index 32bda068..e4d88403 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Type;
public class WxMpMassNewsArticleGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMpMassNews.WxMpMassNewsArticle article, Type typeOfSrc, JsonSerializationContext context) {
JsonObject articleJson = new JsonObject();
@@ -35,6 +36,7 @@ public class WxMpMassNewsArticleGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMpMassNews message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject newsJson = new JsonObject();
@@ -28,6 +29,7 @@ public class WxMpMassNewsGsonAdapter implements JsonSerializer, Js
return newsJson;
}
+ @Override
public WxMpMassNews deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
WxMpMassNews wxMpMassNews = new WxMpMassNews();
JsonObject json = jsonElement.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassOpenIdsMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassOpenIdsMessageGsonAdapter.java
index 84063da4..cfb1f374 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassOpenIdsMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassOpenIdsMessageGsonAdapter.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Type;
public class WxMpMassOpenIdsMessageGsonAdapter implements JsonSerializer {
+ @Override
public JsonElement serialize(WxMpMassOpenIdsMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java
index 658ac358..eeea9bc5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Type;
*/
public class WxMpMassSendResultAdapter implements JsonDeserializer {
+ @Override
public WxMpMassSendResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMassSendResult sendResult = new WxMpMassSendResult();
JsonObject sendResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java
index 73f03382..75564b63 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Type;
*/
public class WxMpMassUploadResultAdapter implements JsonDeserializer {
+ @Override
public WxMpMassUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMassUploadResult uploadResult = new WxMpMassUploadResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java
index d4b37b81..264a57b3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Type;
*/
public class WxMpMassVideoAdapter implements JsonSerializer {
+ @Override
public JsonElement serialize(WxMpMassVideo message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
messageJson.addProperty("media_id", message.getMediaId());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
index 93391732..d9657083 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
@@ -19,6 +19,7 @@ import java.lang.reflect.Type;
public class WxMpMaterialArticleUpdateGsonAdapter implements JsonSerializer {
+ @Override
public JsonElement serialize(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate, Type typeOfSrc, JsonSerializationContext context) {
JsonObject articleUpdateJson = new JsonObject();
articleUpdateJson.addProperty("media_id", wxMpMaterialArticleUpdate.getMediaId());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialCountResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialCountResultAdapter.java
index 0178a368..ab8a22cc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialCountResultAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialCountResultAdapter.java
@@ -19,6 +19,7 @@ import java.lang.reflect.Type;
*/
public class WxMpMaterialCountResultAdapter implements JsonDeserializer {
+ @Override
public WxMpMaterialCountResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMaterialCountResult countResult = new WxMpMaterialCountResult();
JsonObject materialCountResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonAdapter.java
index 74e3edad..a94e8f1d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonAdapter.java
@@ -18,6 +18,7 @@ import java.util.List;
public class WxMpMaterialFileBatchGetGsonAdapter implements JsonDeserializer {
+ @Override
public WxMpMaterialFileBatchGetResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
WxMpMaterialFileBatchGetResult wxMpMaterialFileBatchGetResult = new WxMpMaterialFileBatchGetResult();
JsonObject json = jsonElement.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonItemAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonItemAdapter.java
index 5be696ad..e5314ed6 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonItemAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialFileBatchGetGsonItemAdapter.java
@@ -17,6 +17,7 @@ import java.util.Date;
public class WxMpMaterialFileBatchGetGsonItemAdapter implements JsonDeserializer {
+ @Override
public WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem wxMaterialFileBatchGetNewsItem = new WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem();
JsonObject json = jsonElement.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
index 96cc6aab..71020886 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Type;
public class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMpMaterialNews.WxMpMaterialNewsArticle article, Type typeOfSrc, JsonSerializationContext context) {
JsonObject articleJson = new JsonObject();
@@ -39,6 +40,7 @@ public class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer {
+ @Override
public WxMpMaterialNewsBatchGetResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
WxMpMaterialNewsBatchGetResult wxMpMaterialNewsBatchGetResult = new WxMpMaterialNewsBatchGetResult();
JsonObject json = jsonElement.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsBatchGetGsonItemAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsBatchGetGsonItemAdapter.java
index 8df7c20d..0fdf0ece 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsBatchGetGsonItemAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsBatchGetGsonItemAdapter.java
@@ -18,6 +18,7 @@ import java.util.Date;
public class WxMpMaterialNewsBatchGetGsonItemAdapter implements JsonDeserializer {
+ @Override
public WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem wxMaterialNewsBatchGetNewsItem = new WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem();
JsonObject json = jsonElement.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
index 93c002a4..2513597f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
@@ -15,6 +15,7 @@ import java.lang.reflect.Type;
public class WxMpMaterialNewsGsonAdapter implements JsonSerializer, JsonDeserializer {
+ @Override
public JsonElement serialize(WxMpMaterialNews wxMpMaterialNews, Type typeOfSrc, JsonSerializationContext context) {
JsonObject newsJson = new JsonObject();
@@ -28,6 +29,7 @@ public class WxMpMaterialNewsGsonAdapter implements JsonSerializer {
+ @Override
public WxMpMaterialUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMaterialUploadResult uploadResult = new WxMpMaterialUploadResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialVideoInfoResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialVideoInfoResultAdapter.java
index 6f4ce928..a1c7c0a2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialVideoInfoResultAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialVideoInfoResultAdapter.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Type;
*/
public class WxMpMaterialVideoInfoResultAdapter implements JsonDeserializer {
+ @Override
public WxMpMaterialVideoInfoResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMaterialVideoInfoResult uploadResult = new WxMpMaterialVideoInfoResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
index 753e22d1..d4f8fd55 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
@@ -13,6 +13,7 @@ import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer {
+ @Override
public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws
JsonParseException {
WxMpOAuth2AccessToken accessToken = new WxMpOAuth2AccessToken();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java
index 822357df..2e354597 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Type;
*/
public class WxMpSemanticQueryResultAdapter implements JsonDeserializer {
+ @Override
public WxMpSemanticQueryResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpSemanticQueryResult result = new WxMpSemanticQueryResult();
JsonObject resultJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
index be792df5..4c2d1227 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
@@ -19,6 +19,7 @@ import java.lang.reflect.Type;
public class WxMpTemplateMessageGsonAdapter implements JsonSerializer {
+ @Override
public JsonElement serialize(WxMpTemplateMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
messageJson.addProperty("touser", message.getToUser());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java
index 991c2043..fcf1d403 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java
@@ -25,6 +25,7 @@ public class WxMpUserCumulateGsonAdapter implements JsonDeserializer {
+ @Override
public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
JsonObject o = json.getAsJsonObject();
WxMpUser wxMpUser = new WxMpUser();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java
index e869b5c5..848b82ce 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java
@@ -23,6 +23,7 @@ public class WxMpUserSummaryGsonAdapter implements JsonDeserializer {
+ @Override
public WxMpQrCodeTicket deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpQrCodeTicket ticket = new WxMpQrCodeTicket();
JsonObject ticketJsonObject = json.getAsJsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java
index 5e2b9981..1c06d074 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Type;
public class WxUserListGsonAdapter implements JsonDeserializer {
+ @Override
public WxMpUserList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
JsonObject o = json.getAsJsonObject();
WxMpUserList wxMpUserList = new WxMpUserList();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XStreamTransformer.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XStreamTransformer.java
index 472bac55..61ecac41 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XStreamTransformer.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XStreamTransformer.java
@@ -45,7 +45,7 @@ public class XStreamTransformer {
}
private static Map configXStreamInstance() {
- Map map = new HashMap();
+ Map map = new HashMap<>();
map.put(WxMpXmlMessage.class, config_WxMpXmlMessage());
map.put(WxMpXmlOutMusicMessage.class, config_WxMpXmlOutMusicMessage());
map.put(WxMpXmlOutNewsMessage.class, config_WxMpXmlOutNewsMessage());
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpCustomMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpCustomMessageAPITest.java
index 4cca2e3c..730ab726 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpCustomMessageAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpCustomMessageAPITest.java
@@ -21,7 +21,7 @@ public class WxMpCustomMessageAPITest {
protected WxMpServiceImpl wxService;
public void testSendCustomMessage() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
WxMpCustomMessage message = new WxMpCustomMessage();
message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
message.setToUser(configStorage.getOpenId());
@@ -31,7 +31,7 @@ public class WxMpCustomMessageAPITest {
}
public void testSendCustomMessageWithKfAccount() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
WxMpCustomMessage message = new WxMpCustomMessage();
message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
message.setToUser(configStorage.getOpenId());
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
index dacc2ab8..c6a4556d 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
@@ -24,7 +24,7 @@ public class WxMpJsAPITest {
public void testJsapiTicket() throws WxErrorException {
- String jsapiTicket = wxService.getJsapiTicket(false);
+ String jsapiTicket = this.wxService.getJsapiTicket(false);
System.out.println(jsapiTicket);
Assert.assertNotNull(jsapiTicket);
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
index 5b50b5a4..168f96cf 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
@@ -1,6 +1,15 @@
package me.chanjar.weixin.mp.api;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
import com.google.inject.Inject;
+
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.common.exception.WxErrorException;
@@ -11,13 +20,6 @@ import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
import me.chanjar.weixin.mp.bean.WxMpMassVideo;
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.io.InputStream;
/**
* 测试群发消息
@@ -34,27 +36,32 @@ public class WxMpMassMessageAPITest {
@Test
public void testTextMassOpenIdsMessageSend() throws WxErrorException {
// 发送群发消息
- ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+ .getWxMpConfigStorage();
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
massMessage.setContent("测试群发消息\n欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
massMessage.getToUsers().add(configProvider.getOpenId());
- WxMpMassSendResult massResult = wxService.massOpenIdsMessageSend(massMessage);
+ WxMpMassSendResult massResult = this.wxService
+ .massOpenIdsMessageSend(massMessage);
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
@Test(dataProvider="massMessages")
- public void testMediaMassOpenIdsMessageSend(String massMsgType, String mediaId) throws WxErrorException, IOException {
+ public void testMediaMassOpenIdsMessageSend(String massMsgType,
+ String mediaId) throws WxErrorException {
// 发送群发消息
- ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+ .getWxMpConfigStorage();
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
massMessage.setMsgType(massMsgType);
massMessage.setMediaId(mediaId);
massMessage.getToUsers().add(configProvider.getOpenId());
- WxMpMassSendResult massResult = wxService.massOpenIdsMessageSend(massMessage);
+ WxMpMassSendResult massResult = this.wxService
+ .massOpenIdsMessageSend(massMessage);
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
@@ -64,21 +71,26 @@ public class WxMpMassMessageAPITest {
WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
massMessage.setMsgtype(WxConsts.MASS_MSG_TEXT);
massMessage.setContent("测试群发消息\n欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
- massMessage.setGroupId(wxService.getGroupService().groupGet().get(0).getId());
+ massMessage
+ .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
- WxMpMassSendResult massResult = wxService.massGroupMessageSend(massMessage);
+ WxMpMassSendResult massResult = this.wxService
+ .massGroupMessageSend(massMessage);
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
@Test(dataProvider="massMessages")
- public void testMediaMassGroupMessageSend(String massMsgType, String mediaId) throws WxErrorException, IOException {
+ public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
+ throws WxErrorException {
WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
massMessage.setMsgtype(massMsgType);
massMessage.setMediaId(mediaId);
- massMessage.setGroupId(wxService.getGroupService().groupGet().get(0).getId());
+ massMessage
+ .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
- WxMpMassSendResult massResult = wxService.massGroupMessageSend(massMessage);
+ WxMpMassSendResult massResult = this.wxService
+ .massGroupMessageSend(massMessage);
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
@@ -86,13 +98,15 @@ public class WxMpMassMessageAPITest {
@DataProvider
public Object[][] massMessages() throws WxErrorException, IOException {
Object[][] messages = new Object[4][];
+
/*
* 视频素材
*/
- {
+ try (InputStream inputStream = ClassLoader
+ .getSystemResourceAsStream("mm.mp4")) {
// 上传视频到媒体库
- InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.mp4");
- WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
+ WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+ .mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
@@ -101,38 +115,44 @@ public class WxMpMassMessageAPITest {
video.setTitle("测试标题");
video.setDescription("测试描述");
video.setMediaId(uploadMediaRes.getMediaId());
- WxMpMassUploadResult uploadResult = wxService.massVideoUpload(video);
+ WxMpMassUploadResult uploadResult = this.wxService.massVideoUpload(video);
Assert.assertNotNull(uploadResult);
Assert.assertNotNull(uploadResult.getMediaId());
messages[0] = new Object[] { WxConsts.MASS_MSG_VIDEO, uploadResult.getMediaId() };
}
+
/**
* 图片素材
*/
- {
- InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.jpeg");
- WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
+ try (InputStream inputStream = ClassLoader
+ .getSystemResourceAsStream("mm.jpeg")) {
+ WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+ .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
messages[1] = new Object[] { WxConsts.MASS_MSG_IMAGE, uploadMediaRes.getMediaId() };
}
+
/**
* 语音素材
*/
- {
- InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.mp3");
- WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, inputStream);
+ try (InputStream inputStream = ClassLoader
+ .getSystemResourceAsStream("mm.mp3")) {
+ WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+ .mediaUpload(WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
messages[2] = new Object[] { WxConsts.MASS_MSG_VOICE, uploadMediaRes.getMediaId() };
}
+
/**
* 图文素材
*/
- {
+ try (InputStream inputStream = ClassLoader
+ .getSystemResourceAsStream("mm.jpeg")) {
// 上传照片到媒体库
- InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.jpeg");
- WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
+ WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+ .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
@@ -154,11 +174,13 @@ public class WxMpMassMessageAPITest {
article2.setDigest("摘要2");
news.addArticle(article2);
- WxMpMassUploadResult massUploadResult = wxService.massNewsUpload(news);
+ WxMpMassUploadResult massUploadResult = this.wxService
+ .massNewsUpload(news);
Assert.assertNotNull(massUploadResult);
Assert.assertNotNull(uploadMediaRes.getMediaId());
messages[3] = new Object[] { WxConsts.MASS_MSG_NEWS, massUploadResult.getMediaId() };
}
+
return messages;
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
index a6cb0a63..07a1b75a 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
@@ -163,7 +163,7 @@ public class WxMpMessageRouterTest {
@Override
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService wxMpService,
WxSessionManager sessionManager) {
- sb.append(this.echoStr).append(',');
+ this.sb.append(this.echoStr).append(',');
return null;
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java
index 3d80836f..de0725ea 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java
@@ -23,7 +23,7 @@ public class WxMpMiscAPITest {
@Test
public void testGetCallbackIP() throws WxErrorException {
- String[] ipArray = wxService.getCallbackIP();
+ String[] ipArray = this.wxService.getCallbackIP();
System.out.println(Arrays.toString(ipArray));
Assert.assertNotNull(ipArray);
Assert.assertNotEquals(ipArray.length, 0);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpShortUrlAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpShortUrlAPITest.java
index 091f62ee..d392d1f5 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpShortUrlAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpShortUrlAPITest.java
@@ -20,7 +20,7 @@ public class WxMpShortUrlAPITest {
protected WxMpServiceImpl wxService;
public void testShortUrl() throws WxErrorException {
- String shortUrl = wxService.shortUrl("www.baidu.com");
+ String shortUrl = this.wxService.shortUrl("www.baidu.com");
Assert.assertNotNull(shortUrl);
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
index a28723c5..b7981dbd 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
@@ -42,7 +42,7 @@ public class WxMpCardServiceImplTest {
public void testCreateCardApiSignature() throws Exception {
//app_id, card_id, card_type, code, openid, location_id
- String[] param = {"123", cardId, "", code, openid, ""};
+ String[] param = {"123", this.cardId, "", this.code, this.openid, ""};
WxCardApiSignature cardApiSignature = this.wxService.getCardService().createCardApiSignature(param);
assertNotNull(cardApiSignature);
System.out.println(cardApiSignature);
@@ -58,34 +58,34 @@ public class WxMpCardServiceImplTest {
@Test
public void testQueryCardCode() throws Exception {
- WxMpCardResult wxMpCardResult = this.wxService.getCardService().queryCardCode(cardId, code, false);
+ WxMpCardResult wxMpCardResult = this.wxService.getCardService().queryCardCode(this.cardId, this.code, false);
assertNotNull(wxMpCardResult);
System.out.println(wxMpCardResult);
}
@Test
public void testConsumeCardCode() throws Exception {
- String result = this.wxService.getCardService().consumeCardCode(code);
+ String result = this.wxService.getCardService().consumeCardCode(this.code);
assertNotNull(result);
System.out.println(result);
}
@Test
public void testConsumeCardCodeWithCardId() throws Exception {
- String result = this.wxService.getCardService().consumeCardCode(code, cardId);
+ String result = this.wxService.getCardService().consumeCardCode(this.code, this.cardId);
assertNotNull(result);
System.out.println(result);
}
@Test
public void testMarkCardCode() throws Exception {
- this.wxService.getCardService().markCardCode(code, cardId, openid, true);
+ this.wxService.getCardService().markCardCode(this.code, this.cardId, this.openid, true);
System.out.println("done");
}
@Test
public void testGetCardDetail() throws Exception {
- String result = this.wxService.getCardService().getCardDetail(cardId);
+ String result = this.wxService.getCardService().getCardDetail(this.cardId);
assertNotNull(result);
System.out.println(result);
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
index f2dd8f64..249af392 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
@@ -35,15 +35,15 @@ public class WxMpGroupServiceImplTest {
Assert.assertNotNull(groupList);
Assert.assertTrue(groupList.size() > 0);
for (WxMpGroup g : groupList) {
- group = g;
+ this.group = g;
Assert.assertNotNull(g.getName());
}
}
@Test(dependsOnMethods={"testGroupGet", "testGroupCreate"})
public void getGroupUpdate() throws WxErrorException {
- group.setName("分组改名");
- this.wxService.getGroupService().groupUpdate(group);
+ this.group.setName("分组改名");
+ this.wxService.getGroupService().groupUpdate(this.group);
}
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
index 6ab7c7c4..ed67a79b 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
@@ -1,6 +1,26 @@
package me.chanjar.weixin.mp.api.impl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
import com.google.inject.Inject;
+
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.common.exception.WxErrorException;
@@ -9,17 +29,11 @@ import me.chanjar.weixin.mp.api.ApiTestModule;
import me.chanjar.weixin.mp.bean.WxMpMaterial;
import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate;
import me.chanjar.weixin.mp.bean.WxMpMaterialNews;
-import me.chanjar.weixin.mp.bean.result.*;
-import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult;
/**
* 素材管理相关接口的测试
@@ -56,34 +70,44 @@ public class WxMpMaterialServiceImplTest {
@Test(dataProvider = "uploadMedia")
public void testUploadMaterial(String mediaType, String fileType, String fileName) throws WxErrorException, IOException {
- if (wxMaterialCountResultBeforeTest == null) {
- wxMaterialCountResultBeforeTest = this.wxService.getMaterialService().materialCount();
- }
- InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName);
- File tempFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType);
- WxMpMaterial wxMaterial = new WxMpMaterial();
- wxMaterial.setFile(tempFile);
- wxMaterial.setName(fileName);
- if (WxConsts.MEDIA_VIDEO.equals(mediaType)) {
- wxMaterial.setVideoTitle("title");
- wxMaterial.setVideoIntroduction("test video description");
- }
- WxMpMaterialUploadResult res = this.wxService.getMaterialService().materialFileUpload(mediaType, wxMaterial);
- Assert.assertNotNull(res.getMediaId());
- if (WxConsts.MEDIA_IMAGE.equals(mediaType) || WxConsts.MEDIA_THUMB.equals(mediaType)) {
- Assert.assertNotNull(res.getUrl());
- }
- if (WxConsts.MEDIA_THUMB.equals(mediaType)) {
- thumbMediaId = res.getMediaId();
+ if (this.wxMaterialCountResultBeforeTest == null) {
+ this.wxMaterialCountResultBeforeTest = this.wxService.getMaterialService()
+ .materialCount();
}
- Map materialInfo = new HashMap<>();
- materialInfo.put("media_id", res.getMediaId());
- materialInfo.put("length", tempFile.length());
- materialInfo.put("filename", tempFile.getName());
- media_ids.put(res.getMediaId(), materialInfo);
+ try (InputStream inputStream = ClassLoader
+ .getSystemResourceAsStream(fileName)) {
+ File tempFile = FileUtils.createTmpFile(inputStream,
+ UUID.randomUUID().toString(), fileType);
+ WxMpMaterial wxMaterial = new WxMpMaterial();
+ wxMaterial.setFile(tempFile);
+ wxMaterial.setName(fileName);
+ if (WxConsts.MEDIA_VIDEO.equals(mediaType)) {
+ wxMaterial.setVideoTitle("title");
+ wxMaterial.setVideoIntroduction("test video description");
+ }
+
+ WxMpMaterialUploadResult res = this.wxService.getMaterialService()
+ .materialFileUpload(mediaType, wxMaterial);
+ assertNotNull(res.getMediaId());
- System.out.println(res);
+ if (WxConsts.MEDIA_IMAGE.equals(mediaType)
+ || WxConsts.MEDIA_THUMB.equals(mediaType)) {
+ assertNotNull(res.getUrl());
+ }
+
+ if (WxConsts.MEDIA_THUMB.equals(mediaType)) {
+ this.thumbMediaId = res.getMediaId();
+ }
+
+ Map materialInfo = new HashMap<>();
+ materialInfo.put("media_id", res.getMediaId());
+ materialInfo.put("length", tempFile.length());
+ materialInfo.put("filename", tempFile.getName());
+ this.media_ids.put(res.getMediaId(), materialInfo);
+
+ System.out.println(res);
+ }
}
@Test(dependsOnMethods = {"testUploadMaterial"})
@@ -93,7 +117,7 @@ public class WxMpMaterialServiceImplTest {
WxMpMaterialNews wxMpMaterialNewsSingle = new WxMpMaterialNews();
WxMpMaterialNews.WxMpMaterialNewsArticle mpMaterialNewsArticleSingle = new WxMpMaterialNews.WxMpMaterialNewsArticle();
mpMaterialNewsArticleSingle.setAuthor("author");
- mpMaterialNewsArticleSingle.setThumbMediaId(thumbMediaId);
+ mpMaterialNewsArticleSingle.setThumbMediaId(this.thumbMediaId);
mpMaterialNewsArticleSingle.setTitle("single title");
mpMaterialNewsArticleSingle.setContent("single content");
mpMaterialNewsArticleSingle.setContentSourceUrl("content url");
@@ -105,7 +129,7 @@ public class WxMpMaterialServiceImplTest {
WxMpMaterialNews wxMpMaterialNewsMultiple = new WxMpMaterialNews();
WxMpMaterialNews.WxMpMaterialNewsArticle wxMpMaterialNewsArticleMultiple1 = new WxMpMaterialNews.WxMpMaterialNewsArticle();
wxMpMaterialNewsArticleMultiple1.setAuthor("author1");
- wxMpMaterialNewsArticleMultiple1.setThumbMediaId(thumbMediaId);
+ wxMpMaterialNewsArticleMultiple1.setThumbMediaId(this.thumbMediaId);
wxMpMaterialNewsArticleMultiple1.setTitle("multi title1");
wxMpMaterialNewsArticleMultiple1.setContent("content 1");
wxMpMaterialNewsArticleMultiple1.setContentSourceUrl("content url");
@@ -114,7 +138,7 @@ public class WxMpMaterialServiceImplTest {
WxMpMaterialNews.WxMpMaterialNewsArticle wxMpMaterialNewsArticleMultiple2 = new WxMpMaterialNews.WxMpMaterialNewsArticle();
wxMpMaterialNewsArticleMultiple2.setAuthor("author2");
- wxMpMaterialNewsArticleMultiple2.setThumbMediaId(thumbMediaId);
+ wxMpMaterialNewsArticleMultiple2.setThumbMediaId(this.thumbMediaId);
wxMpMaterialNewsArticleMultiple2.setTitle("multi title2");
wxMpMaterialNewsArticleMultiple2.setContent("content 2");
wxMpMaterialNewsArticleMultiple2.setContentSourceUrl("content url");
@@ -125,81 +149,97 @@ public class WxMpMaterialServiceImplTest {
wxMpMaterialNewsMultiple.addArticle(wxMpMaterialNewsArticleMultiple2);
WxMpMaterialUploadResult resSingle = this.wxService.getMaterialService().materialNewsUpload(wxMpMaterialNewsSingle);
- singleNewsMediaId = resSingle.getMediaId();
+ this.singleNewsMediaId = resSingle.getMediaId();
WxMpMaterialUploadResult resMulti = this.wxService.getMaterialService().materialNewsUpload(wxMpMaterialNewsMultiple);
- multiNewsMediaId = resMulti.getMediaId();
+ this.multiNewsMediaId = resMulti.getMediaId();
}
@Test(dependsOnMethods = {"testAddNews"})
public void testMaterialCount() throws WxErrorException {
WxMpMaterialCountResult wxMaterialCountResult = this.wxService.getMaterialService().materialCount();
// 测试上传过程中添加了一个音频,一个视频,两个图片,两个图文消息
- Assert.assertEquals(wxMaterialCountResultBeforeTest.getVoiceCount() + 1, wxMaterialCountResult.getVoiceCount());
- Assert.assertEquals(wxMaterialCountResultBeforeTest.getVideoCount() + 1, wxMaterialCountResult.getVideoCount());
- Assert.assertEquals(wxMaterialCountResultBeforeTest.getImageCount() + 2, wxMaterialCountResult.getImageCount());
- Assert.assertEquals(wxMaterialCountResultBeforeTest.getNewsCount() + 2, wxMaterialCountResult.getNewsCount());
+ assertEquals(
+ this.wxMaterialCountResultBeforeTest.getVoiceCount() + 1,
+ wxMaterialCountResult.getVoiceCount());
+ assertEquals(
+ this.wxMaterialCountResultBeforeTest.getVideoCount() + 1,
+ wxMaterialCountResult.getVideoCount());
+ assertEquals(
+ this.wxMaterialCountResultBeforeTest.getImageCount() + 2,
+ wxMaterialCountResult.getImageCount());
+ assertEquals(this.wxMaterialCountResultBeforeTest.getNewsCount() + 2,
+ wxMaterialCountResult.getNewsCount());
}
@Test(dependsOnMethods = {"testMaterialCount"}, dataProvider = "downloadMaterial")
public void testDownloadMaterial(String media_id) throws WxErrorException, IOException {
- Map materialInfo = media_ids.get(media_id);
- Assert.assertNotNull(materialInfo);
+ Map materialInfo = this.media_ids.get(media_id);
+ assertNotNull(materialInfo);
String filename = materialInfo.get("filename").toString();
if (filename.endsWith(".mp3") || filename.endsWith(".jpeg")) {
- InputStream inputStream = this.wxService.getMaterialService().materialImageOrVoiceDownload(media_id);
- Assert.assertNotNull(inputStream);
- IOUtils.closeQuietly(inputStream);
+ try (InputStream inputStream = this.wxService.getMaterialService()
+ .materialImageOrVoiceDownload(media_id)) {
+ assertNotNull(inputStream);
+ }
}
if (filename.endsWith("mp4")) {
WxMpMaterialVideoInfoResult wxMaterialVideoInfoResult = this.wxService.getMaterialService().materialVideoInfo(media_id);
- Assert.assertNotNull(wxMaterialVideoInfoResult);
- Assert.assertNotNull(wxMaterialVideoInfoResult.getDownUrl());
+ assertNotNull(wxMaterialVideoInfoResult);
+ assertNotNull(wxMaterialVideoInfoResult.getDownUrl());
}
}
@Test(dependsOnMethods = {"testAddNews"})
public void testGetNewsInfo() throws WxErrorException {
- WxMpMaterialNews wxMpMaterialNewsSingle = this.wxService.getMaterialService().materialNewsInfo(singleNewsMediaId);
- WxMpMaterialNews wxMpMaterialNewsMultiple = this.wxService.getMaterialService().materialNewsInfo(multiNewsMediaId);
- Assert.assertNotNull(wxMpMaterialNewsSingle);
- Assert.assertNotNull(wxMpMaterialNewsMultiple);
+ WxMpMaterialNews wxMpMaterialNewsSingle = this.wxService
+ .getMaterialService().materialNewsInfo(this.singleNewsMediaId);
+ WxMpMaterialNews wxMpMaterialNewsMultiple = this.wxService
+ .getMaterialService().materialNewsInfo(this.multiNewsMediaId);
+ assertNotNull(wxMpMaterialNewsSingle);
+ assertNotNull(wxMpMaterialNewsMultiple);
}
@Test(dependsOnMethods = {"testGetNewsInfo"})
public void testUpdateNewsInfo() throws WxErrorException {
- WxMpMaterialNews wxMpMaterialNewsSingle = this.wxService.getMaterialService().materialNewsInfo(singleNewsMediaId);
- Assert.assertNotNull(wxMpMaterialNewsSingle);
+ WxMpMaterialNews wxMpMaterialNewsSingle = this.wxService
+ .getMaterialService().materialNewsInfo(this.singleNewsMediaId);
+ assertNotNull(wxMpMaterialNewsSingle);
WxMpMaterialArticleUpdate wxMpMaterialArticleUpdateSingle = new WxMpMaterialArticleUpdate();
WxMpMaterialNews.WxMpMaterialNewsArticle articleSingle = wxMpMaterialNewsSingle.getArticles().get(0);
articleSingle.setContent("content single update");
- wxMpMaterialArticleUpdateSingle.setMediaId(singleNewsMediaId);
+ wxMpMaterialArticleUpdateSingle.setMediaId(this.singleNewsMediaId);
wxMpMaterialArticleUpdateSingle.setArticles(articleSingle);
wxMpMaterialArticleUpdateSingle.setIndex(0);
boolean resultSingle = this.wxService.getMaterialService().materialNewsUpdate(wxMpMaterialArticleUpdateSingle);
- Assert.assertTrue(resultSingle);
- wxMpMaterialNewsSingle = this.wxService.getMaterialService().materialNewsInfo(singleNewsMediaId);
- Assert.assertNotNull(wxMpMaterialNewsSingle);
- Assert.assertEquals("content single update", wxMpMaterialNewsSingle.getArticles().get(0).getContent());
+ assertTrue(resultSingle);
+ wxMpMaterialNewsSingle = this.wxService.getMaterialService()
+ .materialNewsInfo(this.singleNewsMediaId);
+ assertNotNull(wxMpMaterialNewsSingle);
+ assertEquals("content single update",
+ wxMpMaterialNewsSingle.getArticles().get(0).getContent());
- WxMpMaterialNews wxMpMaterialNewsMultiple = this.wxService.getMaterialService().materialNewsInfo(multiNewsMediaId);
- Assert.assertNotNull(wxMpMaterialNewsMultiple);
+ WxMpMaterialNews wxMpMaterialNewsMultiple = this.wxService
+ .getMaterialService().materialNewsInfo(this.multiNewsMediaId);
+ assertNotNull(wxMpMaterialNewsMultiple);
WxMpMaterialArticleUpdate wxMpMaterialArticleUpdateMulti = new WxMpMaterialArticleUpdate();
WxMpMaterialNews.WxMpMaterialNewsArticle articleMulti = wxMpMaterialNewsMultiple.getArticles().get(1);
articleMulti.setContent("content 2 update");
- wxMpMaterialArticleUpdateMulti.setMediaId(multiNewsMediaId);
+ wxMpMaterialArticleUpdateMulti.setMediaId(this.multiNewsMediaId);
wxMpMaterialArticleUpdateMulti.setArticles(articleMulti);
wxMpMaterialArticleUpdateMulti.setIndex(1);
boolean resultMulti = this.wxService.getMaterialService().materialNewsUpdate(wxMpMaterialArticleUpdateMulti);
- Assert.assertTrue(resultMulti);
- wxMpMaterialNewsMultiple = this.wxService.getMaterialService().materialNewsInfo(multiNewsMediaId);
- Assert.assertNotNull(wxMpMaterialNewsMultiple);
- Assert.assertEquals("content 2 update", wxMpMaterialNewsMultiple.getArticles().get(1).getContent());
+ assertTrue(resultMulti);
+ wxMpMaterialNewsMultiple = this.wxService.getMaterialService()
+ .materialNewsInfo(this.multiNewsMediaId);
+ assertNotNull(wxMpMaterialNewsMultiple);
+ assertEquals("content 2 update",
+ wxMpMaterialNewsMultiple.getArticles().get(1).getContent());
}
@Test(dependsOnMethods = {"testUpdateNewsInfo"})
public void testMaterialNewsList() throws WxErrorException {
WxMpMaterialNewsBatchGetResult wxMpMaterialNewsBatchGetResult = this.wxService.getMaterialService().materialNewsBatchGet(0, 20);
- return;
+ assertNotNull(wxMpMaterialNewsBatchGetResult);
}
@Test(dependsOnMethods = {"testMaterialNewsList"})
@@ -207,13 +247,15 @@ public class WxMpMaterialServiceImplTest {
WxMpMaterialFileBatchGetResult wxMpMaterialVoiceBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_VOICE, 0, 20);
WxMpMaterialFileBatchGetResult wxMpMaterialVideoBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_VIDEO, 0, 20);
WxMpMaterialFileBatchGetResult wxMpMaterialImageBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_IMAGE, 0, 20);
- return;
+ assertNotNull(wxMpMaterialVoiceBatchGetResult);
+ assertNotNull(wxMpMaterialVideoBatchGetResult);
+ assertNotNull(wxMpMaterialImageBatchGetResult);
}
@Test(dependsOnMethods = {"testMaterialFileList"}, dataProvider = "allTestMaterial")
public void testDeleteMaterial(String mediaId) throws WxErrorException {
boolean result = this.wxService.getMaterialService().materialDelete(mediaId);
- Assert.assertTrue(result);
+ assertTrue(result);
}
@DataProvider
@@ -244,9 +286,9 @@ public class WxMpMaterialServiceImplTest {
public void testUploadMedia(String mediaType, String fileType, String fileName) throws WxErrorException, IOException {
try(InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName)){
WxMediaUploadResult res = this.wxService.getMaterialService().mediaUpload(mediaType, fileType, inputStream);
- Assert.assertNotNull(res.getType());
- Assert.assertNotNull(res.getCreatedAt());
- Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
+ assertNotNull(res.getType());
+ assertNotNull(res.getCreatedAt());
+ assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
if (res.getMediaId() != null) {
this.mediaIds.add(res.getMediaId());
@@ -263,7 +305,7 @@ public class WxMpMaterialServiceImplTest {
@Test(dependsOnMethods = { "testUploadMedia" }, dataProvider="downloadMedia")
public void testDownloadMedia(String media_id) throws WxErrorException {
File file = this.wxService.getMaterialService().mediaDownload(media_id);
- Assert.assertNotNull(file);
+ assertNotNull(file);
System.out.println(file.getAbsolutePath());
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
index 05ac40c9..07503516 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
@@ -25,12 +25,12 @@ public class WxMpUserServiceImplTest {
protected WxMpServiceImpl wxService;
public void testUserUpdateRemark() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
this.wxService.getUserService().userUpdateRemark(configProvider.getOpenId(), "测试备注名");
}
public void testUserInfo() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
WxMpUser user = this.wxService.getUserService().userInfo(configProvider.getOpenId(), null);
Assert.assertNotNull(user);
System.out.println(user);
@@ -46,13 +46,13 @@ public class WxMpUserServiceImplTest {
}
public void testGroupQueryUserGroup() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenId());
Assert.assertTrue(groupid != -1l);
}
public void testGroupMoveUser() throws WxErrorException {
- ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenId(), this.wxService.getGroupService().groupGet().get(3).getId());
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java
index f7913aef..77e7c172 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java
@@ -16,8 +16,8 @@ public class WxRedpackResultTest {
@Before
public void setup() {
- xstream = XStreamInitializer.getInstance();
- xstream.processAnnotations(WxRedpackResult.class);
+ this.xstream = XStreamInitializer.getInstance();
+ this.xstream.processAnnotations(WxRedpackResult.class);
}
@Test public void loadSuccessResult() {
@@ -35,7 +35,7 @@ public class WxRedpackResultTest {
"100000000020150520314766074200\n" +
"20150520102602\n" +
"";
- WxRedpackResult wxMpRedpackResult = (WxRedpackResult) xstream.fromXML(successSample);
+ WxRedpackResult wxMpRedpackResult = (WxRedpackResult) this.xstream.fromXML(successSample);
assertEquals("SUCCESS", wxMpRedpackResult.getReturnCode());
assertEquals("SUCCESS", wxMpRedpackResult.getResultCode());
assertEquals("20150520102602", wxMpRedpackResult.getSendTime());
@@ -54,7 +54,7 @@ public class WxRedpackResultTest {
"\n" +
"1\n" +
"";
- WxRedpackResult wxMpRedpackResult = (WxRedpackResult) xstream.fromXML(failureSample);
+ WxRedpackResult wxMpRedpackResult = (WxRedpackResult) this.xstream.fromXML(failureSample);
assertEquals("FAIL", wxMpRedpackResult.getReturnCode());
assertEquals("FAIL", wxMpRedpackResult.getResultCode());
assertEquals("onqOjjmM1tad-3ROpncN-yUfa6uI", wxMpRedpackResult.getReOpenid());
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
index 345ec9f2..6db18923 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
@@ -30,7 +30,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
}
private boolean isUserAnswering(WxMpXmlMessage message) {
- return pattern.matcher(message.getContent()).matches();
+ return this.pattern.matcher(message.getContent()).matches();
}
@Override
@@ -68,7 +68,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
}
session.setAttribute("guessing", Boolean.TRUE);
- session.setAttribute("number", random.nextInt(100));
+ session.setAttribute("number", this.random.nextInt(100));
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java
index becfbeb4..44b80647 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java
@@ -15,8 +15,8 @@ class WxMpDemoInMemoryConfigStorage extends WxMpInMemoryConfigStorage {
@Override
public String toString() {
- return "SimpleWxConfigProvider [appId=" + appId + ", secret=" + secret + ", accessToken=" + accessToken
- + ", expiresTime=" + expiresTime + ", token=" + token + ", aesKey=" + aesKey + "]";
+ return "SimpleWxConfigProvider [appId=" + this.appId + ", secret=" + this.secret + ", accessToken=" + this.accessToken
+ + ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
index b89b2796..98b8d0cc 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
@@ -1,13 +1,18 @@
package me.chanjar.weixin.mp.demo;
-import me.chanjar.weixin.common.api.WxConsts;
-import me.chanjar.weixin.mp.api.*;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import java.io.InputStream;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.mp.api.WxMpConfigStorage;
+import me.chanjar.weixin.mp.api.WxMpMessageHandler;
+import me.chanjar.weixin.mp.api.WxMpMessageRouter;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
public class WxMpDemoServer {
@@ -23,10 +28,13 @@ public class WxMpDemoServer {
ServletHandler servletHandler = new ServletHandler();
server.setHandler(servletHandler);
- ServletHolder endpointServletHolder = new ServletHolder(new WxMpEndpointServlet(wxMpConfigStorage, wxMpService, wxMpMessageRouter));
+ ServletHolder endpointServletHolder = new ServletHolder(
+ new WxMpEndpointServlet(wxMpConfigStorage, wxMpService,
+ wxMpMessageRouter));
servletHandler.addServletWithMapping(endpointServletHolder, "/*");
- ServletHolder oauthServletHolder = new ServletHolder(new WxMpOAuth2Servlet(wxMpService));
+ ServletHolder oauthServletHolder = new ServletHolder(
+ new WxMpOAuth2Servlet(wxMpService));
servletHandler.addServletWithMapping(oauthServletHolder, "/oauth2/*");
server.start();
@@ -34,27 +42,30 @@ public class WxMpDemoServer {
}
private static void initWeixin() {
- InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml");
- WxMpDemoInMemoryConfigStorage config = WxMpDemoInMemoryConfigStorage.fromXml(is1);
-
- wxMpConfigStorage = config;
- wxMpService = new WxMpServiceImpl();
- wxMpService.setWxMpConfigStorage(config);
-
- WxMpMessageHandler logHandler = new DemoLogHandler();
- WxMpMessageHandler textHandler = new DemoTextHandler();
- WxMpMessageHandler imageHandler = new DemoImageHandler();
- WxMpMessageHandler oauth2handler = new DemoOAuth2Handler();
- DemoGuessNumberHandler guessNumberHandler = new DemoGuessNumberHandler();
-
- wxMpMessageRouter = new WxMpMessageRouter(wxMpService);
- wxMpMessageRouter
- .rule().handler(logHandler).next()
- .rule().msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler).handler(guessNumberHandler).end()
- .rule().async(false).content("哈哈").handler(textHandler).end()
- .rule().async(false).content("图片").handler(imageHandler).end()
- .rule().async(false).content("oauth").handler(oauth2handler).end()
- ;
+ try (InputStream is1 = ClassLoader
+ .getSystemResourceAsStream("test-config.xml")) {
+ WxMpDemoInMemoryConfigStorage config = WxMpDemoInMemoryConfigStorage
+ .fromXml(is1);
+
+ wxMpConfigStorage = config;
+ wxMpService = new WxMpServiceImpl();
+ wxMpService.setWxMpConfigStorage(config);
+
+ WxMpMessageHandler logHandler = new DemoLogHandler();
+ WxMpMessageHandler textHandler = new DemoTextHandler();
+ WxMpMessageHandler imageHandler = new DemoImageHandler();
+ WxMpMessageHandler oauth2handler = new DemoOAuth2Handler();
+ DemoGuessNumberHandler guessNumberHandler = new DemoGuessNumberHandler();
+ wxMpMessageRouter = new WxMpMessageRouter(wxMpService);
+ wxMpMessageRouter.rule().handler(logHandler).next().rule()
+ .msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler)
+ .handler(guessNumberHandler).end().rule().async(false).content("哈哈")
+ .handler(textHandler).end().rule().async(false).content("图片")
+ .handler(imageHandler).end().rule().async(false).content("oauth")
+ .handler(oauth2handler).end();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java
index 2921e5fb..e8ee2fab 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java
@@ -18,6 +18,10 @@ import java.io.IOException;
*/
public class WxMpEndpointServlet extends HttpServlet {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected WxMpConfigStorage wxMpConfigStorage;
protected WxMpService wxMpService;
protected WxMpMessageRouter wxMpMessageRouter;
@@ -39,7 +43,7 @@ public class WxMpEndpointServlet extends HttpServlet {
String nonce = request.getParameter("nonce");
String timestamp = request.getParameter("timestamp");
- if (!wxMpService.checkSignature(timestamp, nonce, signature)) {
+ if (!this.wxMpService.checkSignature(timestamp, nonce, signature)) {
// 消息签名不正确,说明不是公众平台发过来的消息
response.getWriter().println("非法请求");
return;
@@ -59,7 +63,7 @@ public class WxMpEndpointServlet extends HttpServlet {
if ("raw".equals(encryptType)) {
// 明文传输的消息
WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(request.getInputStream());
- WxMpXmlOutMessage outMessage = wxMpMessageRouter.route(inMessage);
+ WxMpXmlOutMessage outMessage = this.wxMpMessageRouter.route(inMessage);
if (outMessage != null) {
response.getWriter().write(outMessage.toXml());
}
@@ -69,9 +73,9 @@ public class WxMpEndpointServlet extends HttpServlet {
if ("aes".equals(encryptType)) {
// 是aes加密的消息
String msgSignature = request.getParameter("msg_signature");
- WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), wxMpConfigStorage, timestamp, nonce, msgSignature);
- WxMpXmlOutMessage outMessage = wxMpMessageRouter.route(inMessage);
- response.getWriter().write(outMessage.toEncryptedXml(wxMpConfigStorage));
+ WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), this.wxMpConfigStorage, timestamp, nonce, msgSignature);
+ WxMpXmlOutMessage outMessage = this.wxMpMessageRouter.route(inMessage);
+ response.getWriter().write(outMessage.toEncryptedXml(this.wxMpConfigStorage));
return;
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java
index e0291b10..15ec942a 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java
@@ -13,6 +13,10 @@ import java.io.IOException;
public class WxMpOAuth2Servlet extends HttpServlet {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected WxMpService wxMpService;
public WxMpOAuth2Servlet(WxMpService wxMpService) {
@@ -30,15 +34,15 @@ public class WxMpOAuth2Servlet extends HttpServlet {
response.getWriter().println("
code
");
response.getWriter().println(code);
- WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.oauth2getAccessToken(code);
+ WxMpOAuth2AccessToken wxMpOAuth2AccessToken = this.wxMpService.oauth2getAccessToken(code);
response.getWriter().println("access token
");
response.getWriter().println(wxMpOAuth2AccessToken.toString());
- WxMpUser wxMpUser = wxMpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
+ WxMpUser wxMpUser = this.wxMpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
response.getWriter().println("user info
");
response.getWriter().println(wxMpUser.toString());
- wxMpOAuth2AccessToken = wxMpService.oauth2refreshAccessToken(wxMpOAuth2AccessToken.getRefreshToken());
+ wxMpOAuth2AccessToken = this.wxMpService.oauth2refreshAccessToken(wxMpOAuth2AccessToken.getRefreshToken());
response.getWriter().println("after refresh
");
response.getWriter().println(wxMpOAuth2AccessToken.toString());