瀏覽代碼

使用lombok的@Data注解简化mp模块的所有bean类

master
Binary Wang 7 年之前
父節點
當前提交
4c79eec2a5
共有 96 個文件被更改,包括 319 次插入4958 次删除
  1. +2
    -40
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
  2. +3
    -60
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
  3. +14
    -59
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java
  4. +8
    -47
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
  5. +18
    -63
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java
  6. +2
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
  7. +2
    -64
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
  8. +9
    -114
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java
  9. +2
    -15
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java
  10. +3
    -52
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
  11. +2
    -103
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java
  12. +2
    -23
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java
  13. +2
    -211
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java
  14. +2
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java
  15. +2
    -40
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java
  16. +2
    -56
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
  17. +2
    -16
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java
  18. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserSummary.java
  19. +3
    -2
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java
  20. +6
    -41
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java
  21. +5
    -18
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java
  22. +5
    -33
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java
  23. +4
    -89
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java
  24. +4
    -33
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java
  25. +4
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java
  26. +4
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java
  27. +5
    -16
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java
  28. +4
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java
  29. +4
    -33
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java
  30. +4
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java
  31. +4
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java
  32. +3
    -134
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java
  33. +2
    -64
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfAccountRequest.java
  34. +2
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfSessionRequest.java
  35. +2
    -79
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfInfo.java
  36. +2
    -7
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java
  37. +5
    -25
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
  38. +5
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
  39. +2
    -7
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java
  40. +2
    -31
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java
  41. +2
    -16
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java
  42. +2
    -7
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java
  43. +2
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java
  44. +2
    -7
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java
  45. +3
    -37
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java
  46. +2
    -29
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java
  47. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java
  48. +3
    -56
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java
  49. +3
    -104
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java
  50. +3
    -48
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNewsBatchGetResult.java
  51. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java
  52. +2
    -29
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java
  53. +5
    -16
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
  54. +6
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
  55. +2
    -40
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
  56. +2
    -95
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
  57. +2
    -103
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
  58. +2
    -40
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
  59. +2
    -84
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
  60. +2
    -15
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java
  61. +3
    -39
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
  62. +6
    -135
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
  63. +2
    -16
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java
  64. +2
    -7
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java
  65. +3
    -41
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java
  66. +3
    -19
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java
  67. +2
    -563
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
  68. +2
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java
  69. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java
  70. +3
    -80
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java
  71. +7
    -46
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
  72. +2
    -9
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java
  73. +3
    -15
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java
  74. +3
    -49
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java
  75. +2
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java
  76. +2
    -48
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java
  77. +9
    -211
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
  78. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java
  79. +2
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java
  80. +2
    -48
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
  81. +6
    -28
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
  82. +2
    -48
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
  83. +5
    -124
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
  84. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
  85. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
  86. +5
    -361
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
  87. +2
    -9
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
  88. +2
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
  89. +3
    -32
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
  90. +2
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
  91. +2
    -48
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java
  92. +3
    -24
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java
  93. +3
    -39
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java
  94. +3
    -117
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
  95. +1
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxQrCodeTicketAdapter.java
  96. +3
    -3
      weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java

+ 2
- 40
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean;


import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.io.Serializable;
* @author YuJian
* @version 15/11/11
*/
@Data
public class WxMpCard implements Serializable{
private static final long serialVersionUID = 9214301870017772921L;

@@ -24,46 +26,6 @@ public class WxMpCard implements Serializable{

private Boolean canConsume;

public String getCardId() {
return this.cardId;
}

public void setCardId(String cardId) {
this.cardId = cardId;
}

public Long getBeginTime() {
return this.beginTime;
}

public void setBeginTime(Long beginTime) {
this.beginTime = beginTime;
}

public Long getEndTime() {
return this.endTime;
}

public void setEndTime(Long endTime) {
this.endTime = endTime;
}

public String getUserCardStatus() {
return this.userCardStatus;
}

public void setUserCardStatus(String userCardStatus) {
this.userCardStatus = userCardStatus;
}

public Boolean getCanConsume() {
return this.canConsume;
}

public void setCanConsume(Boolean canConsume) {
this.canConsume = canConsume;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 3
- 60
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -12,15 +13,12 @@ import java.util.List;
*
* @author chanjarster
*/
@Data
public class WxMpMassNews implements Serializable {
private static final long serialVersionUID = 565937155013581016L;

private List<WxMpMassNewsArticle> articles = new ArrayList<>();

public List<WxMpMassNewsArticle> getArticles() {
return this.articles;
}

public void addArticle(WxMpMassNewsArticle article) {
this.articles.add(article);
}
@@ -52,6 +50,7 @@ public class WxMpMassNews implements Serializable {
*
* @author chanjarster
*/
@Data
public static class WxMpMassNewsArticle {
/**
* (必填) 图文消息缩略图的media_id,可以在基础支持-上传多媒体文件接口中获得
@@ -82,62 +81,6 @@ public class WxMpMassNews implements Serializable {
*/
private boolean showCoverPic;

public String getThumbMediaId() {
return this.thumbMediaId;
}

public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}

public String getAuthor() {
return this.author;
}

public void setAuthor(String author) {
this.author = author;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getContentSourceUrl() {
return this.contentSourceUrl;
}

public void setContentSourceUrl(String contentSourceUrl) {
this.contentSourceUrl = contentSourceUrl;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getDigest() {
return this.digest;
}

public void setDigest(String digest) {
this.digest = digest;
}

public boolean isShowCoverPic() {
return this.showCoverPic;
}

public void setShowCoverPic(boolean showCoverPic) {
this.showCoverPic = showCoverPic;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 14
- 59
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -11,22 +12,14 @@ import java.util.List;
*
* @author chanjarster
*/
@Data
public class WxMpMassOpenIdsMessage implements Serializable {
private static final long serialVersionUID = -8022910911104788999L;

/**
* openid列表,最多支持10,000个
*/
private List<String> toUsers = new ArrayList<>();
private String msgType;
private String content;
private String mediaId;
private boolean sendIgnoreReprint = false;

public WxMpMassOpenIdsMessage() {
super();
}

public String getMsgType() {
return this.msgType;
}

/**
* <pre>
@@ -38,66 +31,28 @@ public class WxMpMassOpenIdsMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话,会返回系统繁忙的错误
* </pre>
*
* @param msgType
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getMediaId() {
return this.mediaId;
}
private String msgType;
private String content;
private String mediaId;
/**
* 文章被判定为转载时,是否继续进行群发操作。
*/
private boolean sendIgnoreReprint = false;

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
public WxMpMassOpenIdsMessage() {
super();
}

public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

/**
* openid列表,最多支持10,000个
*/
public List<String> getToUsers() {
return this.toUsers;
}

/**
* 提供set方法,方便客户端直接设置所有群发对象的openid列表
*
* @param toUsers
*/
public void setToUsers(List<String> toUsers) {
this.toUsers = toUsers;
}

/**
* 添加openid,最多支持10,000个
*
* @param openid
*/
public void addUser(String openid) {
this.toUsers.add(openid);
}

public boolean isSendIgnoreReprint() {
return sendIgnoreReprint;
}

/**
* @param sendIgnoreReprint 文章被判定为转载时,是否继续进行群发操作。
*/
public void setSendIgnoreReprint(boolean sendIgnoreReprint) {
this.sendIgnoreReprint = sendIgnoreReprint;
}
}

+ 8
- 47
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -7,33 +8,15 @@ import java.io.Serializable;
/**
* @author miller
*/
@Data
public class WxMpMassPreviewMessage implements Serializable {
private static final long serialVersionUID = 9095211638358424020L;

private String toWxUserName;
private String toWxUserOpenid;
private String msgType;
private String content;
private String mediaId;

public WxMpMassPreviewMessage() {
super();
}

public String getToWxUserName() {
return this.toWxUserName;
}

public void setToWxUserName(String toWxUserName) {
this.toWxUserName = toWxUserName;
}

public String getMsgType() {
return this.msgType;
}

/**
* <pre>
* 消息类型
* 请使用
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_IMAGE}
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_NEWS}
@@ -42,35 +25,13 @@ public class WxMpMassPreviewMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话,会返回系统繁忙的错误
* </pre>
*
* @param msgType 消息类型
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String getToWxUserOpenid() {
return this.toWxUserOpenid;
}
private String msgType;
private String content;
private String mediaId;

public void setToWxUserOpenid(String toWxUserOpenid) {
this.toWxUserOpenid = toWxUserOpenid;
public WxMpMassPreviewMessage() {
super();
}

public String toJson() {


+ 18
- 63
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -9,26 +10,17 @@ import java.io.Serializable;
*
* @author chanjarster
*/
@Data
public class WxMpMassTagMessage implements Serializable {
private static final long serialVersionUID = -6625914040986749286L;

/**
* 标签id,如果不设置则就意味着发给所有用户
*/
private Long tagId;
private String msgType;
private String content;
private String mediaId;
private boolean isSendAll = false;
private boolean sendIgnoreReprint = false;

public WxMpMassTagMessage() {
super();
}

public String getMsgType() {
return this.msgType;
}

/**
* <pre>
* 消息类型
* 请使用
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_IMAGE}
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_NEWS}
@@ -37,62 +29,25 @@ public class WxMpMassTagMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话,会返回系统繁忙的错误
* </pre>
*
* @param msgType 消息类型
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

public Long getTagId() {
return this.tagId;
}

private String msgType;
private String content;
private String mediaId;
/**
* 如果不设置则就意味着发给所有用户
*
* @param tagId 标签id
* 是否群发给所有用户
*/
public void setTagId(Long tagId) {
this.tagId = tagId;
}

public boolean isSendIgnoreReprint() {
return sendIgnoreReprint;
}

private boolean isSendAll = false;
/**
* @param sendIgnoreReprint 文章被判定为转载时,是否继续进行群发操作。
* 文章被判定为转载时,是否继续进行群发操作。
*/
public void setSendIgnoreReprint(boolean sendIgnoreReprint) {
this.sendIgnoreReprint = sendIgnoreReprint;
private boolean sendIgnoreReprint = false;

public WxMpMassTagMessage() {
super();
}

/**
* 是否群发给所有用户
*/
public boolean isSendAll() {
return isSendAll;
public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

public void setSendAll(boolean sendAll) {


+ 2
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.io.Serializable;
*
* @author chanjarster
*/
@Data
public class WxMpMassVideo implements Serializable {
private static final long serialVersionUID = 9153925016061915637L;

@@ -16,30 +18,6 @@ public class WxMpMassVideo implements Serializable {
private String title;
private String description;

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}


+ 2
- 64
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.io.Serializable;
*
* @author Daniel Qian
*/
@Data
public class WxMpSemanticQuery implements Serializable {
private static final long serialVersionUID = 7685873048199870690L;

@@ -23,70 +25,6 @@ public class WxMpSemanticQuery implements Serializable {
private String appid;
private String uid;

public String getQuery() {
return this.query;
}

public void setQuery(String query) {
this.query = query;
}

public String getCategory() {
return this.category;
}

public void setCategory(String category) {
this.category = category;
}

public Float getLatitude() {
return this.latitude;
}

public void setLatitude(Float latitude) {
this.latitude = latitude;
}

public Float getLongitude() {
return this.longitude;
}

public void setLongitude(Float longitude) {
this.longitude = longitude;
}

public String getCity() {
return this.city;
}

public void setCity(String city) {
this.city = city;
}

public String getRegion() {
return this.region;
}

public void setRegion(String region) {
this.region = region;
}

public String getAppid() {
return this.appid;
}

public void setAppid(String appid) {
this.appid = appid;
}

public String getUid() {
return this.uid;
}

public void setUid(String uid) {
this.uid = uid;
}

public String toJson() {
return WxMpGsonBuilder.create().toJson(this);
}


+ 9
- 114
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -10,6 +11,7 @@ import java.io.Serializable;
*
* @author rememberber
*/
@Data
public class WxMpShakeInfoResult implements Serializable {
private static final long serialVersionUID = -1604561297395395468L;

@@ -17,13 +19,15 @@ public class WxMpShakeInfoResult implements Serializable {

private String errmsg;

private Data data;
private ShakeInfoData data;

public static WxMpShakeInfoResult fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpShakeInfoResult.class);
}

public class Data {
@Data
public class ShakeInfoData implements Serializable {
private static final long serialVersionUID = -4828142206067489488L;

private String page_id;

@@ -35,7 +39,9 @@ public class WxMpShakeInfoResult implements Serializable {

private BeaconInfo beacon_info;

public class BeaconInfo {
@Data
public class BeaconInfo implements Serializable {
private static final long serialVersionUID = -8995733049982933362L;

private double distance;

@@ -48,118 +54,7 @@ public class WxMpShakeInfoResult implements Serializable {
private Integer rssi;

private String uuid;

public double getDistance() {
return distance;
}

public void setDistance(double distance) {
this.distance = distance;
}

public Integer getMajor() {
return major;
}

public void setMajor(Integer major) {
this.major = major;
}

public Integer getMeasure_power() {
return measure_power;
}

public void setMeasure_power(Integer measure_power) {
this.measure_power = measure_power;
}

public Integer getMinor() {
return minor;
}

public void setMinor(Integer minor) {
this.minor = minor;
}

public Integer getRssi() {
return rssi;
}

public void setRssi(Integer rssi) {
this.rssi = rssi;
}

public String getUuid() {
return uuid;
}

public void setUuid(String uuid) {
this.uuid = uuid;
}
}

public String getPage_id() {
return page_id;
}

public void setPage_id(String page_id) {
this.page_id = page_id;
}

public String getOpenid() {
return openid;
}

public void setOpenid(String openid) {
this.openid = openid;
}

public String getPoi_id() {
return poi_id;
}

public void setPoi_id(String poi_id) {
this.poi_id = poi_id;
}

public BeaconInfo getBeacon_info() {
return beacon_info;
}

public void setBeacon_info(BeaconInfo beacon_info) {
this.beacon_info = beacon_info;
}

public String getBrand_userame() {
return brand_userame;
}

public void setBrand_userame(String brand_userame) {
this.brand_userame = brand_userame;
}
}

public Integer getErrcode() {
return errcode;
}

public void setErrcode(Integer errcode) {
this.errcode = errcode;
}

public String getErrmsg() {
return errmsg;
}

public void setErrmsg(String errmsg) {
this.errmsg = errmsg;
}

public Data getData() {
return data;
}

public void setData(Data data) {
this.data = data;
}
}

+ 2
- 15
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean;

import com.google.gson.Gson;
import lombok.Data;

import java.io.Serializable;
import java.util.HashMap;
@@ -11,6 +12,7 @@ import java.util.Map;
*
* @author rememberber
*/
@Data
public class WxMpShakeQuery implements Serializable {
private static final long serialVersionUID = 4316527352035275412L;

@@ -25,19 +27,4 @@ public class WxMpShakeQuery implements Serializable {
return new Gson().toJson(map);
}

public String getTicket() {
return ticket;
}

public void setTicket(String ticket) {
this.ticket = ticket;
}

public int getNeedPoi() {
return needPoi;
}

public void setNeedPoi(int needPoi) {
this.needPoi = needPoi;
}
}

+ 3
- 52
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean;

import com.google.gson.Gson;
import lombok.Data;

import java.io.Serializable;
import java.util.ArrayList;
@@ -14,6 +15,7 @@ import java.util.Map;
*
* @author LiuJunGuang
*/
@Data
public class WxMpUserQuery implements Serializable {
private static final long serialVersionUID = -1344224837373149313L;

@@ -110,19 +112,18 @@ public class WxMpUserQuery implements Serializable {
}

// 查询参数封装
@Data
public class WxMpUserQueryParam implements Serializable {
private static final long serialVersionUID = -6863571795702385319L;
private String openid;
private String lang;

public WxMpUserQueryParam(String openid, String lang) {
super();
this.openid = openid;
this.lang = lang;
}

public WxMpUserQueryParam(String openid) {
super();
this.openid = openid;
this.lang = "zh_CN";
}
@@ -131,56 +132,6 @@ public class WxMpUserQuery implements Serializable {
super();
}

public String getOpenid() {
return this.openid;
}

public void setOpenid(String openid) {
this.openid = openid;
}

public String getLang() {
return this.lang;
}

public void setLang(String lang) {
this.lang = lang;
}

@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((this.lang == null) ? 0 : this.lang.hashCode());
result = prime * result + ((this.openid == null) ? 0 : this.openid.hashCode());
return result;
}

@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
WxMpUserQueryParam other = (WxMpUserQueryParam) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (this.lang == null) {
if (other.lang != null)
return false;
} else if (!this.lang.equals(other.lang))
return false;
if (this.openid == null) {
if (other.openid != null)
return false;
} else if (!this.openid.equals(other.openid))
return false;
return true;
}

private WxMpUserQuery getOuterType() {
return WxMpUserQuery.this;
}


+ 2
- 103
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
private static final long serialVersionUID = -9222452497954511765L;

@@ -116,107 +118,4 @@ public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
}.getType());
}

public Integer getRefHour() {
return this.refHour;
}

public void setRefHour(Integer refHour) {
this.refHour = refHour;
}

public String getMsgId() {
return this.msgId;
}

public void setMsgId(String msgId) {
this.msgId = msgId;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public Integer getIntPageReadUser() {
return this.intPageReadUser;
}

public void setIntPageReadUser(Integer intPageReadUser) {
this.intPageReadUser = intPageReadUser;
}

public Integer getIntPageReadCount() {
return this.intPageReadCount;
}

public void setIntPageReadCount(Integer intPageReadCount) {
this.intPageReadCount = intPageReadCount;
}

public Integer getOriPageReadUser() {
return this.oriPageReadUser;
}

public void setOriPageReadUser(Integer oriPageReadUser) {
this.oriPageReadUser = oriPageReadUser;
}

public Integer getOriPageReadCount() {
return this.oriPageReadCount;
}

public void setOriPageReadCount(Integer oriPageReadCount) {
this.oriPageReadCount = oriPageReadCount;
}

public Integer getShareScene() {
return this.shareScene;
}

public void setShareScene(Integer shareScene) {
this.shareScene = shareScene;
}

public Integer getShareUser() {
return this.shareUser;
}

public void setShareUser(Integer shareUser) {
this.shareUser = shareUser;
}

public Integer getShareCount() {
return this.shareCount;
}

public void setShareCount(Integer shareCount) {
this.shareCount = shareCount;
}

public Integer getAddToFavUser() {
return this.addToFavUser;
}

public void setAddToFavUser(Integer addToFavUser) {
this.addToFavUser = addToFavUser;
}

public Integer getAddToFavCount() {
return this.addToFavCount;
}

public void setAddToFavCount(Integer addToFavCount) {
this.addToFavCount = addToFavCount;
}

public Integer getUserSource() {
return this.userSource;
}

public void setUserSource(Integer userSource) {
this.userSource = userSource;
}
}

+ 2
- 23
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxDataCubeArticleTotal extends WxDataCubeBaseResult {
private static final long serialVersionUID = -7634365687303052699L;

@@ -44,27 +46,4 @@ public class WxDataCubeArticleTotal extends WxDataCubeBaseResult {
}.getType());
}

public String getMsgId() {
return this.msgId;
}

public void setMsgId(String msgId) {
this.msgId = msgId;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public List<WxDataCubeArticleTotalDetail> getDetails() {
return this.details;
}

public void setDetails(List<WxDataCubeArticleTotalDetail> details) {
this.details = details;
}
}

+ 2
- 211
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.io.Serializable;

@@ -11,6 +12,7 @@ import java.io.Serializable;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxDataCubeArticleTotalDetail implements Serializable {
private static final long serialVersionUID = -5136169129771430052L;

@@ -196,215 +198,4 @@ public class WxDataCubeArticleTotalDetail implements Serializable {
@SerializedName("feed_share_from_other_cnt")
private Integer feedShareFromOtherCnt;

public String getStatDate() {
return this.statDate;
}

public void setStatDate(String statDate) {
this.statDate = statDate;
}

public Integer getTargetUser() {
return this.targetUser;
}

public void setTargetUser(Integer targetUser) {
this.targetUser = targetUser;
}

public Integer getIntPageReadUser() {
return this.intPageReadUser;
}

public void setIntPageReadUser(Integer intPageReadUser) {
this.intPageReadUser = intPageReadUser;
}

public Integer getIntPageReadCount() {
return this.intPageReadCount;
}

public void setIntPageReadCount(Integer intPageReadCount) {
this.intPageReadCount = intPageReadCount;
}

public Integer getOriPageReadUser() {
return this.oriPageReadUser;
}

public void setOriPageReadUser(Integer oriPageReadUser) {
this.oriPageReadUser = oriPageReadUser;
}

public Integer getOriPageReadCount() {
return this.oriPageReadCount;
}

public void setOriPageReadCount(Integer oriPageReadCount) {
this.oriPageReadCount = oriPageReadCount;
}

public Integer getShareUser() {
return this.shareUser;
}

public void setShareUser(Integer shareUser) {
this.shareUser = shareUser;
}

public Integer getShareCount() {
return this.shareCount;
}

public void setShareCount(Integer shareCount) {
this.shareCount = shareCount;
}

public Integer getAddToFavUser() {
return this.addToFavUser;
}

public void setAddToFavUser(Integer addToFavUser) {
this.addToFavUser = addToFavUser;
}

public Integer getAddToFavCount() {
return this.addToFavCount;
}

public void setAddToFavCount(Integer addToFavCount) {
this.addToFavCount = addToFavCount;
}

public Integer getIntPageFromSessionReadUser() {
return this.intPageFromSessionReadUser;
}

public void setIntPageFromSessionReadUser(Integer intPageFromSessionReadUser) {
this.intPageFromSessionReadUser = intPageFromSessionReadUser;
}

public Integer getIntPageFromSessionReadCount() {
return this.intPageFromSessionReadCount;
}

public void setIntPageFromSessionReadCount(
Integer intPageFromSessionReadCount) {
this.intPageFromSessionReadCount = intPageFromSessionReadCount;
}

public Integer getIntPageFromHistMsgReadUser() {
return this.intPageFromHistMsgReadUser;
}

public void setIntPageFromHistMsgReadUser(Integer intPageFromHistMsgReadUser) {
this.intPageFromHistMsgReadUser = intPageFromHistMsgReadUser;
}

public Integer getIntPageFromHistMsgReadCount() {
return this.intPageFromHistMsgReadCount;
}

public void setIntPageFromHistMsgReadCount(
Integer intPageFromHistMsgReadCount) {
this.intPageFromHistMsgReadCount = intPageFromHistMsgReadCount;
}

public Integer getIntPageFromFeedReadUser() {
return this.intPageFromFeedReadUser;
}

public void setIntPageFromFeedReadUser(Integer intPageFromFeedReadUser) {
this.intPageFromFeedReadUser = intPageFromFeedReadUser;
}

public Integer getIntPageFromFeedReadCount() {
return this.intPageFromFeedReadCount;
}

public void setIntPageFromFeedReadCount(Integer intPageFromFeedReadCount) {
this.intPageFromFeedReadCount = intPageFromFeedReadCount;
}

public Integer getIntPageFromFriendsReadUser() {
return this.intPageFromFriendsReadUser;
}

public void setIntPageFromFriendsReadUser(Integer intPageFromFriendsReadUser) {
this.intPageFromFriendsReadUser = intPageFromFriendsReadUser;
}

public Integer getIntPageFromFriendsReadCount() {
return this.intPageFromFriendsReadCount;
}

public void setIntPageFromFriendsReadCount(
Integer intPageFromFriendsReadCount) {
this.intPageFromFriendsReadCount = intPageFromFriendsReadCount;
}

public Integer getIntPageFromOtherReadUser() {
return this.intPageFromOtherReadUser;
}

public void setIntPageFromOtherReadUser(Integer intPageFromOtherReadUser) {
this.intPageFromOtherReadUser = intPageFromOtherReadUser;
}

public Integer getIntPageFromOtherReadCount() {
return this.intPageFromOtherReadCount;
}

public void setIntPageFromOtherReadCount(Integer intPageFromOtherReadCount) {
this.intPageFromOtherReadCount = intPageFromOtherReadCount;
}

public Integer getFeedShareFromSessionUser() {
return this.feedShareFromSessionUser;
}

public void setFeedShareFromSessionUser(Integer feedShareFromSessionUser) {
this.feedShareFromSessionUser = feedShareFromSessionUser;
}

public Integer getFeedShareFromSessionCnt() {
return this.feedShareFromSessionCnt;
}

public void setFeedShareFromSessionCnt(Integer feedShareFromSessionCnt) {
this.feedShareFromSessionCnt = feedShareFromSessionCnt;
}

public Integer getFeedShareFromFeedUser() {
return this.feedShareFromFeedUser;
}

public void setFeedShareFromFeedUser(Integer feedShareFromFeedUser) {
this.feedShareFromFeedUser = feedShareFromFeedUser;
}

public Integer getFeedShareFromFeedCnt() {
return this.feedShareFromFeedCnt;
}

public void setFeedShareFromFeedCnt(Integer feedShareFromFeedCnt) {
this.feedShareFromFeedCnt = feedShareFromFeedCnt;
}

public Integer getFeedShareFromOtherUser() {
return this.feedShareFromOtherUser;
}

public void setFeedShareFromOtherUser(Integer feedShareFromOtherUser) {
this.feedShareFromOtherUser = feedShareFromOtherUser;
}

public Integer getFeedShareFromOtherCnt() {
return this.feedShareFromOtherCnt;
}

public void setFeedShareFromOtherCnt(Integer feedShareFromOtherCnt) {
this.feedShareFromOtherCnt = feedShareFromOtherCnt;
}

}

+ 2
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.JsonParser;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.io.Serializable;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public abstract class WxDataCubeBaseResult implements Serializable {
private static final long serialVersionUID = 8780389911053297600L;
protected static final JsonParser JSON_PARSER = new JsonParser();
@@ -30,12 +32,4 @@ public abstract class WxDataCubeBaseResult implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getRefDate() {
return this.refDate;
}

public void setRefDate(String refDate) {
this.refDate = refDate;
}

}

+ 2
- 40
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxDataCubeInterfaceResult extends WxDataCubeBaseResult {
private static final long serialVersionUID = 597734329161281398L;

@@ -58,44 +60,4 @@ public class WxDataCubeInterfaceResult extends WxDataCubeBaseResult {
}.getType());
}

public Integer getRefHour() {
return this.refHour;
}

public void setRefHour(Integer refHour) {
this.refHour = refHour;
}

public Integer getCallbackCount() {
return this.callbackCount;
}

public void setCallbackCount(Integer callbackCount) {
this.callbackCount = callbackCount;
}

public Integer getFailCount() {
return this.failCount;
}

public void setFailCount(Integer failCount) {
this.failCount = failCount;
}

public Integer getTotalTimeCost() {
return this.totalTimeCost;
}

public void setTotalTimeCost(Integer totalTimeCost) {
this.totalTimeCost = totalTimeCost;
}

public Integer getMaxTimeCost() {
return this.maxTimeCost;
}

public void setMaxTimeCost(Integer maxTimeCost) {
this.maxTimeCost = maxTimeCost;
}

}

+ 2
- 56
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxDataCubeMsgResult extends WxDataCubeBaseResult {
private static final long serialVersionUID = 6932121822150573659L;

@@ -72,60 +74,4 @@ public class WxDataCubeMsgResult extends WxDataCubeBaseResult {
}.getType());
}

public Integer getRefHour() {
return this.refHour;
}

public void setRefHour(Integer refHour) {
this.refHour = refHour;
}

public Integer getMsgType() {
return this.msgType;
}

public void setMsgType(Integer msgType) {
this.msgType = msgType;
}

public Integer getMsgUser() {
return this.msgUser;
}

public void setMsgUser(Integer msgUser) {
this.msgUser = msgUser;
}

public Integer getMsgCount() {
return this.msgCount;
}

public void setMsgCount(Integer msgCount) {
this.msgCount = msgCount;
}

public Integer getCountInterval() {
return this.countInterval;
}

public void setCountInterval(Integer countInterval) {
this.countInterval = countInterval;
}

public Integer getIntPageReadCount() {
return this.intPageReadCount;
}

public void setIntPageReadCount(Integer intPageReadCount) {
this.intPageReadCount = intPageReadCount;
}

public Integer getOriPageReadUser() {
return this.oriPageReadUser;
}

public void setOriPageReadUser(Integer oriPageReadUser) {
this.oriPageReadUser = oriPageReadUser;
}

}

+ 2
- 16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.util.List;
* 详情查看文档:<a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141082&token=&lang=zh_CN">用户分析数据接口</a>
* </pre>
*/
@Data
public class WxDataCubeUserCumulate implements Serializable {
private static final JsonParser JSON_PARSER = new JsonParser();

@@ -31,22 +33,6 @@ public class WxDataCubeUserCumulate implements Serializable {
}.getType());
}

public Date getRefDate() {
return this.refDate;
}

public void setRefDate(Date refDate) {
this.refDate = refDate;
}

public Integer getCumulateUser() {
return this.cumulateUser;
}

public void setCumulateUser(Integer cumulateUser) {
this.cumulateUser = cumulateUser;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserSummary.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.datacube;

import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.util.List;
* 详情查看文档:<a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141082&token=&lang=zh_CN">用户分析数据接口</a>
* </pre>
*/
@Data
public class WxDataCubeUserSummary implements Serializable {
private static final long serialVersionUID = -2336654489906694173L;

@@ -35,38 +37,6 @@ public class WxDataCubeUserSummary implements Serializable {
}.getType());
}

public Date getRefDate() {
return this.refDate;
}

public void setRefDate(Date refDate) {
this.refDate = refDate;
}

public Integer getUserSource() {
return this.userSource;
}

public void setUserSource(Integer userSource) {
this.userSource = userSource;
}

public Integer getNewUser() {
return this.newUser;
}

public void setNewUser(Integer newUser) {
this.newUser = newUser;
}

public Integer getCancelUser() {
return this.cancelUser;
}

public void setCancelUser(Integer cancelUser) {
this.cancelUser = cancelUser;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 3
- 2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java 查看文件

@@ -5,9 +5,10 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import java.io.Serializable;

/**
* Created by keungtung on 14/12/2016.
* @author keungtung
* @date 14/12/2016
*/
public abstract class AbstractDeviceBean implements Serializable{
public abstract class AbstractDeviceBean implements Serializable {
private static final long serialVersionUID = 4359729626772515385L;

public String toJson() {


+ 6
- 41
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java 查看文件

@@ -1,10 +1,13 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class BaseResp extends AbstractDeviceBean {
private static final long serialVersionUID = 4252655933699659073L;

@@ -15,50 +18,12 @@ public class BaseResp extends AbstractDeviceBean {
@SerializedName("errmsg")
private String errMsg;

public Integer getErrCode() {
return errCode;
}

public void setErrCode(Integer errCode) {
this.errCode = errCode;
}

public BaseInfo getBaseInfo() {
return baseInfo;
}

public void setBaseInfo(BaseInfo baseInfo) {
this.baseInfo = baseInfo;
}

public String getErrMsg() {
return errMsg;
}

public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}

@Data
private class BaseInfo {
@SerializedName("device_type")
private String deviceType;

@SerializedName("device_id")
private String deviceId;

public String getDeviceType() {
return deviceType;
}

public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
}
}

+ 5
- 18
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java 查看文件

@@ -1,11 +1,14 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

/**
* Created by keungtung on 10/12/2016.
*
* @author keungtung
* @date 10/12/2016
*/

@Data
public class RespMsg extends AbstractDeviceBean {
private static final long serialVersionUID = -4241272701707684136L;

@@ -13,20 +16,4 @@ public class RespMsg extends AbstractDeviceBean {
private Integer retCode;
@SerializedName("error_info")
private String errorInfo;

public Integer getRetCode() {
return retCode;
}

public void setRetCode(Integer retCode) {
this.retCode = retCode;
}

public String getErrorInfo() {
return errorInfo;
}

public void setErrorInfo(String errorInfo) {
this.errorInfo = errorInfo;
}
}

+ 5
- 33
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java 查看文件

@@ -1,11 +1,15 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;

/**
* Created by keungtung on 14/12/2016.
*
* @author keungtung
* @date 14/12/2016
*/
@Data
public class TransMsgResp extends AbstractDeviceBean {
private static final long serialVersionUID = 5386954916622816491L;

@@ -20,36 +24,4 @@ public class TransMsgResp extends AbstractDeviceBean {
public static TransMsgResp fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, TransMsgResp.class);
}

public Integer getRet() {
return ret;
}

public void setRet(Integer ret) {
this.ret = ret;
}

public String getRetInfo() {
return retInfo;
}

public void setRetInfo(String retInfo) {
this.retInfo = retInfo;
}

public Integer getErrCode() {
return errCode;
}

public void setErrCode(Integer errCode) {
this.errCode = errCode;
}

public String getErrMsg() {
return errMsg;
}

public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
}

+ 4
- 89
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java 查看文件

@@ -1,12 +1,15 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.io.Serializable;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDevice implements Serializable {
private static final long serialVersionUID = -3284819760735456195L;

@@ -30,92 +33,4 @@ public class WxDevice implements Serializable {
private String serMacPos;
@SerializedName("ble_simple_protocol")
private String bleSimpleProtocol;

public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getMac() {
return mac;
}

public void setMac(String mac) {
this.mac = mac;
}

public String getConnectProtocol() {
return connectProtocol;
}

public void setConnectProtocol(String connectProtocol) {
this.connectProtocol = connectProtocol;
}

public String getAuthKey() {
return authKey;
}

public void setAuthKey(String authKey) {
this.authKey = authKey;
}

public String getCloseStrategy() {
return closeStrategy;
}

public void setCloseStrategy(String closeStrategy) {
this.closeStrategy = closeStrategy;
}

public String getConnStrategy() {
return connStrategy;
}

public void setConnStrategy(String connStrategy) {
this.connStrategy = connStrategy;
}

public String getCryptMethod() {
return cryptMethod;
}

public void setCryptMethod(String cryptMethod) {
this.cryptMethod = cryptMethod;
}

public String getAuthVer() {
return authVer;
}

public void setAuthVer(String authVer) {
this.authVer = authVer;
}

public String getManuMacPos() {
return manuMacPos;
}

public void setManuMacPos(String manuMacPos) {
this.manuMacPos = manuMacPos;
}

public String getSerMacPos() {
return serMacPos;
}

public void setSerMacPos(String serMacPos) {
this.serMacPos = serMacPos;
}

public String getBleSimpleProtocol() {
return bleSimpleProtocol;
}

public void setBleSimpleProtocol(String bleSimpleProtocol) {
this.bleSimpleProtocol = bleSimpleProtocol;
}
}

+ 4
- 33
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java 查看文件

@@ -1,14 +1,17 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceAuthorize extends AbstractDeviceBean {
private static final long serialVersionUID = 8786321356569903887L;

@@ -21,38 +24,6 @@ public class WxDeviceAuthorize extends AbstractDeviceBean {
@SerializedName("device_list")
private List<WxDevice> deviceList = new LinkedList<>();

public String getDeviceNum() {
return deviceNum;
}

public void setDeviceNum(String deviceNum) {
this.deviceNum = deviceNum;
}

public String getOpType() {
return opType;
}

public void setOpType(String opType) {
this.opType = opType;
}

public String getProductId() {
return productId;
}

public void setProductId(String productId) {
this.productId = productId;
}

public List<WxDevice> getDeviceList() {
return deviceList;
}

public void setDeviceList(List<WxDevice> deviceList) {
this.deviceList = deviceList;
}

public void addDevice(WxDevice... devices) {
this.deviceList.addAll(Arrays.asList(devices));
}


+ 4
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java 查看文件

@@ -1,12 +1,15 @@
package me.chanjar.weixin.mp.bean.device;

import lombok.Data;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;

import java.util.List;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceAuthorizeResult extends AbstractDeviceBean {
private static final long serialVersionUID = 9105294570912249811L;

@@ -16,11 +19,4 @@ public class WxDeviceAuthorizeResult extends AbstractDeviceBean {
return WxGsonBuilder.create().fromJson(response, WxDeviceAuthorizeResult.class);
}

public List<BaseResp> getResp() {
return resp;
}

public void setResp(List<BaseResp> resp) {
this.resp = resp;
}
}

+ 4
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java 查看文件

@@ -1,10 +1,13 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceBind extends AbstractDeviceBean {
private static final long serialVersionUID = 467559769037590880L;

@@ -14,27 +17,4 @@ public class WxDeviceBind extends AbstractDeviceBean {
@SerializedName("openid")
private String openId;

public String getTicket() {
return ticket;
}

public void setTicket(String ticket) {
this.ticket = ticket;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

public String getOpenId() {
return openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}
}

+ 5
- 16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java 查看文件

@@ -1,13 +1,16 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;

/**
* Created by keungtung on 16/12/2016.
* @author keungtung
* @date 16/12/2016
*/
@Data
public class WxDeviceBindDeviceResult extends AbstractDeviceBean {
private static final long serialVersionUID = 725870295905935355L;

@@ -22,27 +25,13 @@ public class WxDeviceBindDeviceResult extends AbstractDeviceBean {
return WxMpGsonBuilder.create().fromJson(json, WxDeviceBindDeviceResult.class);
}

@Data
private class Device {
@SerializedName("device_type")
private String deviceType;
@SerializedName("device_id")
private String deviceId;

public String getDeviceType() {
return deviceType;
}

public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
}

}

+ 4
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java 查看文件

@@ -1,11 +1,14 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceBindResult extends AbstractDeviceBean {
private static final long serialVersionUID = 4687725146279339359L;

@@ -16,11 +19,4 @@ public class WxDeviceBindResult extends AbstractDeviceBean {
return WxMpGsonBuilder.create().fromJson(json, WxDeviceBindResult.class);
}

public BaseResp getBaseResp() {
return baseResp;
}

public void setBaseResp(BaseResp baseResp) {
this.baseResp = baseResp;
}
}

+ 4
- 33
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java 查看文件

@@ -1,11 +1,14 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceMsg extends AbstractDeviceBean {
private static final long serialVersionUID = -5567110858455277963L;

@@ -21,36 +24,4 @@ public class WxDeviceMsg extends AbstractDeviceBean {
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String getDeviceType() {
return deviceType;
}

public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

public String getOpenId() {
return openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public String getContent() {
return content;
}

public void setContent(String content) {
this.content = content;
}
}

+ 4
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java 查看文件

@@ -1,13 +1,16 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.util.List;

/**
* Created by keungtung on 16/12/2016.
* @author keungtung
* @date 16/12/2016
*/
@Data
public class WxDeviceOpenIdResult extends AbstractDeviceBean {
private static final long serialVersionUID = 4980885167833836220L;

@@ -24,35 +27,4 @@ public class WxDeviceOpenIdResult extends AbstractDeviceBean {
return WxMpGsonBuilder.create().fromJson(json, WxDeviceOpenIdResult.class);
}

public Integer getErrCode() {
return errCode;
}

public void setErrCode(Integer errCode) {
this.errCode = errCode;
}

public String getErrMsg() {
return errMsg;
}

public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}

public List<String> getOpenIds() {
return openIds;
}

public void setOpenIds(List<String> openIds) {
this.openIds = openIds;
}

public RespMsg getRespMsg() {
return respMsg;
}

public void setRespMsg(RespMsg respMsg) {
this.respMsg = respMsg;
}
}

+ 4
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java 查看文件

@@ -1,11 +1,14 @@
package me.chanjar.weixin.mp.bean.device;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

/**
* Created by keungtung on 10/12/2016.
* @author keungtung
* @date 10/12/2016
*/
@Data
public class WxDeviceQrCodeResult extends AbstractDeviceBean {
private static final long serialVersionUID = -4312858303060918266L;

@@ -22,35 +25,4 @@ public class WxDeviceQrCodeResult extends AbstractDeviceBean {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxDeviceQrCodeResult.class);
}

public String getDeviceLicence() {
return deviceLicence;
}

public void setDeviceLicence(String deviceLicence) {
this.deviceLicence = deviceLicence;
}

public BaseResp getBaseResp() {
return baseResp;
}

public void setBaseResp(BaseResp baseResp) {
this.baseResp = baseResp;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

public String getQrTicket() {
return qrTicket;
}

public void setQrTicket(String qrTicket) {
this.qrTicket = qrTicket;
}
}

+ 3
- 134
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.kefu;

import lombok.Data;
import me.chanjar.weixin.mp.builder.kefu.*;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -12,6 +13,7 @@ import java.util.List;
*
* @author chanjarster
*/
@Data
public class WxMpKefuMessage implements Serializable {
private static final long serialVersionUID = -9196732086954365246L;

@@ -85,18 +87,6 @@ public class WxMpKefuMessage implements Serializable {
return new WxCardBuilder();
}

public String getToUser() {
return this.toUser;
}

public void setToUser(String toUser) {
this.toUser = toUser;
}

public String getMsgType() {
return this.msgType;
}

/**
* <pre>
* 请使用
@@ -110,141 +100,20 @@ public class WxMpKefuMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#CUSTOM_MSG_WXCARD}
* </pre>
*
* @param msgType
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}

public String getMpNewsMediaId() {
return this.mpNewsMediaId;
}

public void setMpNewsMediaId(String mpNewsMediaId) {
this.mpNewsMediaId = mpNewsMediaId;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String getThumbMediaId() {
return this.thumbMediaId;
}

public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getMusicUrl() {
return this.musicUrl;
}

public void setMusicUrl(String musicUrl) {
this.musicUrl = musicUrl;
}

public String getHqMusicUrl() {
return this.hqMusicUrl;
}

public void setHqMusicUrl(String hqMusicUrl) {
this.hqMusicUrl = hqMusicUrl;
}

public String getCardId() {
return this.cardId;
}

public void setCardId(String cardId) {
this.cardId = cardId;
}

public List<WxArticle> getArticles() {
return this.articles;
}

public void setArticles(List<WxArticle> articles) {
this.articles = articles;
}

public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

@Data
public static class WxArticle {
private String title;
private String description;
private String url;
private String picUrl;

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

public String getPicUrl() {
return this.picUrl;
}

public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}

}
}

+ 2
- 64
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfAccountRequest.java 查看文件

@@ -1,11 +1,13 @@
package me.chanjar.weixin.mp.bean.kefu.request;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import java.io.Serializable;

@Data
public class WxMpKfAccountRequest implements Serializable {
private static final long serialVersionUID = -5451863610674856927L;

@@ -27,10 +29,6 @@ public class WxMpKfAccountRequest implements Serializable {
@SerializedName("invite_wx")
private String inviteWx;

public static Builder builder() {
return new Builder();
}

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
@@ -40,64 +38,4 @@ public class WxMpKfAccountRequest implements Serializable {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

public String getNickName() {
return this.nickName;
}

public void setNickName(String nickName) {
this.nickName = nickName;
}

public String getInviteWx() {
return this.inviteWx;
}

public void setInviteWx(String inviteWx) {
this.inviteWx = inviteWx;
}

public static class Builder {
private String kfAccount;
private String nickName;
private String inviteWx;

public Builder kfAccount(String kfAccount) {
this.kfAccount = kfAccount;
return this;
}

public Builder nickName(String nickName) {
this.nickName = nickName;
return this;
}

public Builder inviteWx(String inviteWx) {
this.inviteWx = inviteWx;
return this;
}

public Builder from(WxMpKfAccountRequest origin) {
this.kfAccount(origin.kfAccount);
this.nickName(origin.nickName);
this.inviteWx(origin.inviteWx);
return this;
}

public WxMpKfAccountRequest build() {
WxMpKfAccountRequest m = new WxMpKfAccountRequest();
m.kfAccount = this.kfAccount;
m.nickName = this.nickName;
m.inviteWx = this.inviteWx;
return m;
}
}

}

+ 2
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfSessionRequest.java 查看文件

@@ -1,11 +1,13 @@
package me.chanjar.weixin.mp.bean.kefu.request;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;

@Data
public class WxMpKfSessionRequest implements Serializable {
private static final long serialVersionUID = -5451863610674856927L;

@@ -35,12 +37,4 @@ public class WxMpKfSessionRequest implements Serializable {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

}

+ 2
- 79
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfInfo.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.io.Serializable;
*
* @author Binary Wang
*/
@Data
public class WxMpKfInfo implements Serializable {
private static final long serialVersionUID = -5877300750666022290L;

@@ -75,88 +77,9 @@ public class WxMpKfInfo implements Serializable {
@SerializedName("accepted_case")
private Integer acceptedCase;

public Integer getStatus() {
return this.status;
}

public void setStatus(Integer status) {
this.status = status;
}

public Integer getAcceptedCase() {
return this.acceptedCase;
}

public void setAcceptedCase(Integer acceptedCase) {
this.acceptedCase = acceptedCase;
}

public String getAccount() {
return this.account;
}

public void setAccount(String account) {
this.account = account;
}

public String getHeadImgUrl() {
return this.headImgUrl;
}

public void setHeadImgUrl(String headImgUrl) {
this.headImgUrl = headImgUrl;
}

public String getId() {
return this.id;
}

public void setId(String id) {
this.id = id;
}

public String getNick() {
return this.nick;
}

public void setNick(String nick) {
this.nick = nick;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String getWxAccount() {
return this.wxAccount;
}

public void setWxAccount(String wxAccount) {
this.wxAccount = wxAccount;
}

public String getInviteWx() {
return this.inviteWx;
}

public void setInviteWx(String inviteWx) {
this.inviteWx = inviteWx;
}

public Long getInviteExpireTime() {
return this.inviteExpireTime;
}

public void setInviteExpireTime(Long inviteExpireTime) {
this.inviteExpireTime = inviteExpireTime;
}

public String getInviteStatus() {
return this.inviteStatus;
}

public void setInviteStatus(String inviteStatus) {
this.inviteStatus = inviteStatus;
}
}

+ 2
- 7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -10,6 +11,7 @@ import java.util.List;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfList implements Serializable {
private static final long serialVersionUID = -8194193505173564894L;

@@ -25,11 +27,4 @@ public class WxMpKfList implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpKfInfo> getKfList() {
return this.kfList;
}

public void setKfList(List<WxMpKfInfo> kfList) {
this.kfList = kfList;
}
}

+ 5
- 25
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -8,8 +9,11 @@ import java.io.Serializable;
import java.util.List;

/**
* Created by Binary Wang on 2016/7/15.
*
* @author Binary Wang
* @date 2016/7/15
*/
@Data
public class WxMpKfMsgList implements Serializable {
private static final long serialVersionUID = 4524296707435188202L;

@@ -26,30 +30,6 @@ public class WxMpKfMsgList implements Serializable {
return WxMpGsonBuilder.INSTANCE.create().fromJson(responseContent, WxMpKfMsgList.class);
}

public List<WxMpKfMsgRecord> getRecords() {
return this.records;
}

public void setRecords(List<WxMpKfMsgRecord> records) {
this.records = records;
}

public Integer getNumber() {
return this.number;
}

public void setNumber(Integer number) {
this.number = number;
}

public Long getMsgId() {
return this.msgId;
}

public void setMsgId(Long msgId) {
this.msgId = msgId;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 5
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java 查看文件

@@ -1,13 +1,17 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;

/**
* Created by Binary Wang on 2016/7/18.
*
* @author Binary Wang
* @date 2016/7/18
*/
@Data
public class WxMpKfMsgRecord implements Serializable {
private static final long serialVersionUID = -280692188908528688L;



+ 2
- 7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -10,6 +11,7 @@ import java.util.List;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfOnlineList implements Serializable {
private static final long serialVersionUID = -6154705288500854617L;

@@ -25,11 +27,4 @@ public class WxMpKfOnlineList implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpKfInfo> getKfOnlineList() {
return this.kfOnlineList;
}

public void setKfOnlineList(List<WxMpKfInfo> kfOnlineList) {
this.kfOnlineList = kfOnlineList;
}
}

+ 2
- 31
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
@@ -8,6 +9,7 @@ import java.io.Serializable;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfSession implements Serializable {
private static final long serialVersionUID = 7804332813164994062L;

@@ -42,35 +44,4 @@ public class WxMpKfSession implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

public long getCreateTime() {
return this.createTime;
}

public void setCreateTime(long createTime) {
this.createTime = createTime;
}

public String getOpenid() {
return this.openid;
}

public void setOpenid(String openid) {
this.openid = openid;
}

public long getLatestTime() {
return this.latestTime;
}

public void setLatestTime(long latestTime) {
this.latestTime = latestTime;
}
}

+ 2
- 16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -9,6 +10,7 @@ import java.io.Serializable;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfSessionGetResult implements Serializable {
private static final long serialVersionUID = 8474846575200033152L;

@@ -33,20 +35,4 @@ public class WxMpKfSessionGetResult implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

public long getCreateTime() {
return this.createTime;
}

public void setCreateTime(long createTime) {
this.createTime = createTime;
}

}

+ 2
- 7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -10,6 +11,7 @@ import java.util.List;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfSessionList implements Serializable {
private static final long serialVersionUID = -7680371346226640206L;

@@ -29,11 +31,4 @@ public class WxMpKfSessionList implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpKfSession> getKfSessionList() {
return this.kfSessionList;
}

public void setKfSessionList(List<WxMpKfSession> kfSessionList) {
this.kfSessionList = kfSessionList;
}
}

+ 2
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.kefu.result;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -10,6 +11,7 @@ import java.util.List;
/**
* @author Binary Wang
*/
@Data
public class WxMpKfSessionWaitCaseList implements Serializable {
private static final long serialVersionUID = 2432132626631361922L;

@@ -35,12 +37,4 @@ public class WxMpKfSessionWaitCaseList implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpKfSession> getKfSessionWaitCaseList() {
return this.kfSessionWaitCaseList;
}

public void setKfSessionWaitCaseList(List<WxMpKfSession> kfSessionWaitCaseList) {
this.kfSessionWaitCaseList = kfSessionWaitCaseList;
}

}

+ 2
- 7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -7,6 +8,7 @@ import java.io.Serializable;
/**
* @author miller
*/
@Data
public class WxMediaImgUploadResult implements Serializable {
private static final long serialVersionUID = 1996392453428768829L;
private String url;
@@ -15,11 +17,4 @@ public class WxMediaImgUploadResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMediaImgUploadResult.class);
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}
}

+ 3
- 37
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java 查看文件

@@ -1,10 +1,13 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;

import java.io.File;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;

@Data
public class WxMpMaterial implements Serializable {
private static final long serialVersionUID = -1651816949780969485L;

@@ -29,41 +32,4 @@ public class WxMpMaterial implements Serializable {
form.put("introduction", this.videoIntroduction);
return form;
}

public String getVideoTitle() {
return this.videoTitle;
}

public void setVideoTitle(String videoTitle) {
this.videoTitle = videoTitle;
}

public String getVideoIntroduction() {
return this.videoIntroduction;
}

public void setVideoIntroduction(String videoIntroduction) {
this.videoIntroduction = videoIntroduction;
}

public String getName() {
return this.name;
}

public void setName(String name) {
this.name = name;
}

public File getFile() {
return this.file;
}

public void setFile(File file) {
this.file = file;
}

@Override
public String toString() {
return "WxMpMaterial [" + "name=" + this.name + ", file=" + this.file + ", videoTitle=" + this.videoTitle + ", videoIntroduction=" + this.videoIntroduction + "]";
}
}

+ 2
- 29
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java 查看文件

@@ -1,9 +1,11 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;

@Data
public class WxMpMaterialArticleUpdate implements Serializable {
private static final long serialVersionUID = -7611963949517780270L;

@@ -11,36 +13,7 @@ public class WxMpMaterialArticleUpdate implements Serializable {
private int index;
private WxMpMaterialNews.WxMpMaterialNewsArticle articles;

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public int getIndex() {
return this.index;
}

public void setIndex(int index) {
this.index = index;
}

public WxMpMaterialNews.WxMpMaterialNewsArticle getArticles() {
return this.articles;
}

public void setArticles(WxMpMaterialNews.WxMpMaterialNewsArticle articles) {
this.articles = articles;
}

public String toJson() {
return WxMpGsonBuilder.create().toJson(this);
}

@Override
public String toString() {
return "WxMpMaterialArticleUpdate [" + "mediaId=" + this.mediaId + ", index=" + this.index + ", articles=" + this.articles + "]";
}
}

+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java 查看文件

@@ -1,9 +1,11 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;

@Data
public class WxMpMaterialCountResult implements Serializable {
private static final long serialVersionUID = -5568772662085874138L;

@@ -12,38 +14,6 @@ public class WxMpMaterialCountResult implements Serializable {
private int imageCount;
private int newsCount;

public int getVoiceCount() {
return this.voiceCount;
}

public void setVoiceCount(int voiceCount) {
this.voiceCount = voiceCount;
}

public int getVideoCount() {
return this.videoCount;
}

public void setVideoCount(int videoCount) {
this.videoCount = videoCount;
}

public int getImageCount() {
return this.imageCount;
}

public void setImageCount(int imageCount) {
this.imageCount = imageCount;
}

public int getNewsCount() {
return this.newsCount;
}

public void setNewsCount(int newsCount) {
this.newsCount = newsCount;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 3
- 56
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java 查看文件

@@ -1,11 +1,13 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
public class WxMpMaterialFileBatchGetResult implements Serializable {
private static final long serialVersionUID = -560388368297267884L;

@@ -13,73 +15,18 @@ public class WxMpMaterialFileBatchGetResult implements Serializable {
private int itemCount;
private List<WxMaterialFileBatchGetNewsItem> items;

public int getTotalCount() {
return this.totalCount;
}

public void setTotalCount(int totalCount) {
this.totalCount = totalCount;
}

public int getItemCount() {
return this.itemCount;
}

public void setItemCount(int itemCount) {
this.itemCount = itemCount;
}

public List<WxMaterialFileBatchGetNewsItem> getItems() {
return this.items;
}

public void setItems(List<WxMaterialFileBatchGetNewsItem> items) {
this.items = items;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

@Data
public static class WxMaterialFileBatchGetNewsItem {
private String mediaId;
private Date updateTime;
private String name;
private String url;

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public Date getUpdateTime() {
return this.updateTime;
}

public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}

public String getName() {
return this.name;
}

public void setName(String name) {
this.name = name;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 3
- 104
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -8,6 +9,7 @@ import java.util.Date;
import java.util.ArrayList;
import java.util.List;

@Data
public class WxMpMaterialNews implements Serializable {
private static final long serialVersionUID = -3283203652013494976L;

@@ -32,22 +34,6 @@ public class WxMpMaterialNews implements Serializable {
return this.articles == null || this.articles.isEmpty();
}

public Date getCreatedTime() {
return this.createdTime;
}

public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}

public Date getUpdatedTime() {
return this.updatedTime;
}

public void setUpdatedTime(Date updatedTime) {
this.updatedTime = updatedTime;
}

@Override
public String toString() {
return this.toJson();
@@ -70,6 +56,7 @@ public class WxMpMaterialNews implements Serializable {
*
* @author chanjarster
*/
@Data
public static class WxMpMaterialNewsArticle {
/**
* (必填) 图文消息缩略图的media_id,可以在基础支持-上传多媒体文件接口中获得
@@ -121,94 +108,6 @@ public class WxMpMaterialNews implements Serializable {
*/
private Boolean onlyFansCanComment;

public String getThumbMediaId() {
return this.thumbMediaId;
}

public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}

public String getAuthor() {
return this.author;
}

public void setAuthor(String author) {
this.author = author;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getContentSourceUrl() {
return this.contentSourceUrl;
}

public void setContentSourceUrl(String contentSourceUrl) {
this.contentSourceUrl = contentSourceUrl;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getDigest() {
return this.digest;
}

public void setDigest(String digest) {
this.digest = digest;
}

public boolean isShowCoverPic() {
return this.showCoverPic;
}

public void setShowCoverPic(boolean showCoverPic) {
this.showCoverPic = showCoverPic;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

public String getThumbUrl() {
return this.thumbUrl;
}

public void setThumbUrl(String thumbUrl) {
this.thumbUrl = thumbUrl;
}

public Boolean getNeedOpenComment() {
return this.needOpenComment;
}

public void setNeedOpenComment(Boolean needOpenComment) {
this.needOpenComment = needOpenComment;
}

public Boolean getOnlyFansCanComment() {
return this.onlyFansCanComment;
}

public void setOnlyFansCanComment(Boolean onlyFansCanComment) {
this.onlyFansCanComment = onlyFansCanComment;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 3
- 48
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNewsBatchGetResult.java 查看文件

@@ -1,11 +1,13 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
public class WxMpMaterialNewsBatchGetResult implements Serializable {
private static final long serialVersionUID = -1617952797921001666L;

@@ -13,64 +15,17 @@ public class WxMpMaterialNewsBatchGetResult implements Serializable {
private int itemCount;
private List<WxMaterialNewsBatchGetNewsItem> items;

public int getTotalCount() {
return this.totalCount;
}

public void setTotalCount(int totalCount) {
this.totalCount = totalCount;
}

public int getItemCount() {
return this.itemCount;
}

public void setItemCount(int itemCount) {
this.itemCount = itemCount;
}

public List<WxMaterialNewsBatchGetNewsItem> getItems() {
return this.items;
}

public void setItems(List<WxMaterialNewsBatchGetNewsItem> items) {
this.items = items;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

@Data
public static class WxMaterialNewsBatchGetNewsItem {
private String mediaId;
private Date updateTime;
private WxMpMaterialNews content;

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public Date getUpdateTime() {
return this.updateTime;
}

public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}

public WxMpMaterialNews getContent() {
return this.content;
}

public void setContent(WxMpMaterialNews content) {
this.content = content;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java 查看文件

@@ -1,10 +1,12 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;

@Data
public class WxMpMaterialUploadResult implements Serializable {
private static final long serialVersionUID = -128818731449449537L;
private String mediaId;
@@ -16,38 +18,6 @@ public class WxMpMaterialUploadResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpMaterialUploadResult.class);
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

public Integer getErrCode() {
return this.errCode;
}

public void setErrCode(Integer errCode) {
this.errCode = errCode;
}

public String getErrMsg() {
return this.errMsg;
}

public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 29
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java 查看文件

@@ -1,9 +1,11 @@
package me.chanjar.weixin.mp.bean.material;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;

@Data
public class WxMpMaterialVideoInfoResult implements Serializable {
private static final long serialVersionUID = 1269131745333792202L;

@@ -15,33 +17,4 @@ public class WxMpMaterialVideoInfoResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpMaterialVideoInfoResult.class);
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getDownUrl() {
return this.downUrl;
}

public void setDownUrl(String downUrl) {
this.downUrl = downUrl;
}

@Override
public String toString() {
return "WxMpMaterialVideoInfoResult [title=" + this.title + ", description=" + this.description + ", downUrl=" + this.downUrl + "]";
}

}

+ 5
- 16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java 查看文件

@@ -1,10 +1,14 @@
package me.chanjar.weixin.mp.bean.membercard;

import lombok.Data;

import java.io.Serializable;

/**
* Created by YuJian on 2017/7/11.
* @author YuJian
* @date 2017/7/11
*/
@Data
public class MemberCardUserInfo implements Serializable {
private static final long serialVersionUID = -4259196162619282129L;

@@ -12,19 +16,4 @@ public class MemberCardUserInfo implements Serializable {

private NameValues[] customFieldList;

public NameValues[] getCommonFieldList() {
return commonFieldList;
}

public void setCommonFieldList(NameValues[] commonFieldList) {
this.commonFieldList = commonFieldList;
}

public NameValues[] getCustomFieldList() {
return customFieldList;
}

public void setCustomFieldList(NameValues[] customFieldList) {
this.customFieldList = customFieldList;
}
}

+ 6
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java 查看文件

@@ -1,10 +1,15 @@
package me.chanjar.weixin.mp.bean.membercard;

import lombok.Data;

import java.io.Serializable;

/**
* Created by YuJian on 2017/7/11.
*
* @author YuJian
* @date 2017/7/11
*/
@Data
public class NameValues implements Serializable{
private static final long serialVersionUID = -8529369702944594330L;

@@ -14,27 +19,4 @@ public class NameValues implements Serializable{

private String[] valueList;

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}

public String[] getValueList() {
return valueList;
}

public void setValueList(String[] valueList) {
this.valueList = valueList;
}
}

+ 2
- 40
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.membercard;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.io.Serializable;

@@ -15,6 +16,7 @@ import java.io.Serializable;
* @author YuJian(mgcnrx11@gmail.com)
* @version 2017/7/15
*/
@Data
public class NotifyOptional implements Serializable {
private static final long serialVersionUID = 4488842021504939176L;

@@ -41,44 +43,4 @@ public class NotifyOptional implements Serializable {

@SerializedName("is_notify_custom_field3")
private Boolean isNotifyCustomField3;

public Boolean getNotifyBonus() {
return isNotifyBonus;
}

public void setNotifyBonus(Boolean notifyBonus) {
isNotifyBonus = notifyBonus;
}

public Boolean getNotifyBalance() {
return isNotifyBalance;
}

public void setNotifyBalance(Boolean notifyBalance) {
isNotifyBalance = notifyBalance;
}

public Boolean getNotifyCustomField1() {
return isNotifyCustomField1;
}

public void setNotifyCustomField1(Boolean notifyCustomField1) {
isNotifyCustomField1 = notifyCustomField1;
}

public Boolean getNotifyCustomField2() {
return isNotifyCustomField2;
}

public void setNotifyCustomField2(Boolean notifyCustomField2) {
isNotifyCustomField2 = notifyCustomField2;
}

public Boolean getNotifyCustomField3() {
return isNotifyCustomField3;
}

public void setNotifyCustomField3(Boolean notifyCustomField3) {
isNotifyCustomField3 = notifyCustomField3;
}
}

+ 2
- 95
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.membercard;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.io.Serializable;

@@ -10,6 +11,7 @@ import java.io.Serializable;
* @author YuJian(mgcnrx11@hotmail.com)
* @version 2017/7/8
*/
@Data
public class WxMpMemberCardActivatedMessage implements Serializable {
private static final long serialVersionUID = -5972713484594266480L;

@@ -73,99 +75,4 @@ public class WxMpMemberCardActivatedMessage implements Serializable {
@SerializedName("init_custom_field_value3")
private String initCustomFieldValue3;

public String getMembershipNumber() {
return membershipNumber;
}

public void setMembershipNumber(String membershipNumber) {
this.membershipNumber = membershipNumber;
}

public String getCode() {
return code;
}

public void setCode(String code) {
this.code = code;
}

public String getCardId() {
return cardId;
}

public void setCardId(String cardId) {
this.cardId = cardId;
}

public String getBackgroundPicUrl() {
return backgroundPicUrl;
}

public void setBackgroundPicUrl(String backgroundPicUrl) {
this.backgroundPicUrl = backgroundPicUrl;
}

public Integer getActivateBeginTime() {
return activateBeginTime;
}

public void setActivateBeginTime(Integer activateBeginTime) {
this.activateBeginTime = activateBeginTime;
}

public Integer getActivateEndTime() {
return activateEndTime;
}

public void setActivateEndTime(Integer activateEndTime) {
this.activateEndTime = activateEndTime;
}

public Integer getInitBonus() {
return initBonus;
}

public void setInitBonus(Integer initBonus) {
this.initBonus = initBonus;
}

public String getInitBonusRecord() {
return initBonusRecord;
}

public void setInitBonusRecord(String initBonusRecord) {
this.initBonusRecord = initBonusRecord;
}

public Integer getInitBalance() {
return initBalance;
}

public void setInitBalance(Integer initBalance) {
this.initBalance = initBalance;
}

public String getInitCustomFieldValue1() {
return initCustomFieldValue1;
}

public void setInitCustomFieldValue1(String initCustomFieldValue1) {
this.initCustomFieldValue1 = initCustomFieldValue1;
}

public String getInitCustomFieldValue2() {
return initCustomFieldValue2;
}

public void setInitCustomFieldValue2(String initCustomFieldValue2) {
this.initCustomFieldValue2 = initCustomFieldValue2;
}

public String getInitCustomFieldValue3() {
return initCustomFieldValue3;
}

public void setInitCustomFieldValue3(String initCustomFieldValue3) {
this.initCustomFieldValue3 = initCustomFieldValue3;
}
}

+ 2
- 103
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.membercard;

import com.google.gson.annotations.SerializedName;
import lombok.Data;

import java.io.Serializable;

@@ -16,6 +17,7 @@ import java.io.Serializable;
* @author YuJian(mgcnrx11@gmail.com)
* @version 2017/7/15
*/
@Data
public class WxMpMemberCardUpdateMessage implements Serializable {
private static final long serialVersionUID = 4953923160718911058L;

@@ -75,107 +77,4 @@ public class WxMpMemberCardUpdateMessage implements Serializable {
@SerializedName("notify_optional")
private NotifyOptional notifyOptional;

public String getCode() {
return code;
}

public void setCode(String code) {
this.code = code;
}

public String getCardId() {
return cardId;
}

public void setCardId(String cardId) {
this.cardId = cardId;
}

public String getBackgroundPicUrl() {
return backgroundPicUrl;
}

public void setBackgroundPicUrl(String backgroundPicUrl) {
this.backgroundPicUrl = backgroundPicUrl;
}

public Integer getBonus() {
return bonus;
}

public void setBonus(Integer bonus) {
this.bonus = bonus;
}

public Integer getAddBounus() {
return addBounus;
}

public void setAddBounus(Integer addBounus) {
this.addBounus = addBounus;
}

public String getRecordBonus() {
return recordBonus;
}

public void setRecordBonus(String recordBonus) {
this.recordBonus = recordBonus;
}

public Integer getBalance() {
return balance;
}

public void setBalance(Integer balance) {
this.balance = balance;
}

public Integer getAddBalance() {
return addBalance;
}

public void setAddBalance(Integer addBalance) {
this.addBalance = addBalance;
}

public String getRecordBalance() {
return recordBalance;
}

public void setRecordBalance(String recordBalance) {
this.recordBalance = recordBalance;
}

public String getCustomFieldValue1() {
return customFieldValue1;
}

public void setCustomFieldValue1(String customFieldValue1) {
this.customFieldValue1 = customFieldValue1;
}

public String getCustomFieldValue2() {
return customFieldValue2;
}

public void setCustomFieldValue2(String customFieldValue2) {
this.customFieldValue2 = customFieldValue2;
}

public String getCustomFieldValue3() {
return customFieldValue3;
}

public void setCustomFieldValue3(String customFieldValue3) {
this.customFieldValue3 = customFieldValue3;
}

public NotifyOptional getNotifyOptional() {
return notifyOptional;
}

public void setNotifyOptional(NotifyOptional notifyOptional) {
this.notifyOptional = notifyOptional;
}
}

+ 2
- 40
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.membercard;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -14,6 +15,7 @@ import java.io.Serializable;
* @author YuJian(mgcnrx11@gmail.com)
* @version 2017/7/15
*/
@Data
public class WxMpMemberCardUpdateResult implements Serializable {

private static final long serialVersionUID = 9084886191442098311L;
@@ -28,46 +30,6 @@ public class WxMpMemberCardUpdateResult implements Serializable {

private Integer resultBalance;

public String getErrorCode() {
return errorCode;
}

public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}

public String getErrorMsg() {
return errorMsg;
}

public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}

public String getOpenId() {
return openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public Integer getResultBonus() {
return resultBonus;
}

public void setResultBonus(Integer resultBonus) {
this.resultBonus = resultBonus;
}

public Integer getResultBalance() {
return resultBalance;
}

public void setResultBalance(Integer resultBalance) {
this.resultBalance = resultBalance;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 84
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.membercard;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.io.Serializable;
* @author YuJian
* @version 2017/7/9
*/
@Data
public class WxMpMemberCardUserInfoResult implements Serializable {

private static final long serialVersionUID = 9084777967442098311L;
@@ -39,90 +41,6 @@ public class WxMpMemberCardUserInfoResult implements Serializable {

private Boolean hasActive;

public static long getSerialVersionUID() {
return serialVersionUID;
}

public String getErrorCode() {
return errorCode;
}

public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}

public String getErrorMsg() {
return errorMsg;
}

public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}

public String getOpenId() {
return openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public String getNickname() {
return nickname;
}

public void setNickname(String nickname) {
this.nickname = nickname;
}

public String getMembershipNumber() {
return membershipNumber;
}

public void setMembershipNumber(String membershipNumber) {
this.membershipNumber = membershipNumber;
}

public Integer getBonus() {
return bonus;
}

public void setBonus(Integer bonus) {
this.bonus = bonus;
}

public String getSex() {
return sex;
}

public void setSex(String sex) {
this.sex = sex;
}

public MemberCardUserInfo getUserInfo() {
return userInfo;
}

public void setUserInfo(MemberCardUserInfo userInfo) {
this.userInfo = userInfo;
}

public String getUserCardStatus() {
return userCardStatus;
}

public void setUserCardStatus(String userCardStatus) {
this.userCardStatus = userCardStatus;
}

public Boolean getHasActive() {
return hasActive;
}

public void setHasActive(Boolean hasActive) {
this.hasActive = hasActive;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 15
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.menu;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;

@@ -13,6 +14,7 @@ import java.io.Serializable;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpGetSelfMenuInfoResult implements Serializable {
private static final long serialVersionUID = -5612495636936835166L;

@@ -31,19 +33,4 @@ public class WxMpGetSelfMenuInfoResult implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public WxMpSelfMenuInfo getSelfMenuInfo() {
return selfMenuInfo;
}

public void setSelfMenuInfo(WxMpSelfMenuInfo selfMenuInfo) {
this.selfMenuInfo = selfMenuInfo;
}

public Integer getIsMenuOpen() {
return isMenuOpen;
}

public void setIsMenuOpen(Integer isMenuOpen) {
this.isMenuOpen = isMenuOpen;
}
}

+ 3
- 39
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.menu;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.bean.menu.WxMenuButton;
import me.chanjar.weixin.common.bean.menu.WxMenuRule;
import me.chanjar.weixin.common.util.ToStringUtils;
@@ -17,6 +18,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpMenu implements Serializable {
private static final long serialVersionUID = -5794350513426702252L;

@@ -30,22 +32,6 @@ public class WxMpMenu implements Serializable {
return WxGsonBuilder.create().fromJson(json, WxMpMenu.class);
}

public WxMpConditionalMenu getMenu() {
return menu;
}

public void setMenu(WxMpConditionalMenu menu) {
this.menu = menu;
}

public List<WxMpConditionalMenu> getConditionalMenu() {
return conditionalMenu;
}

public void setConditionalMenu(List<WxMpConditionalMenu> conditionalMenu) {
this.conditionalMenu = conditionalMenu;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
@@ -55,6 +41,7 @@ public class WxMpMenu implements Serializable {
return WxGsonBuilder.create().toJson(this);
}

@Data
public static class WxMpConditionalMenu implements Serializable {
private static final long serialVersionUID = -2279946921755382289L;

@@ -70,29 +57,6 @@ public class WxMpMenu implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMenuButton> getButtons() {
return buttons;
}

public void setButtons(List<WxMenuButton> buttons) {
this.buttons = buttons;
}

public WxMenuRule getRule() {
return rule;
}

public void setRule(WxMenuRule rule) {
this.rule = rule;
}

public String getMenuId() {
return menuId;
}

public void setMenuId(String menuId) {
this.menuId = menuId;
}
}

}

+ 6
- 135
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.menu;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpSelfMenuInfo implements Serializable {
private static final long serialVersionUID = -81203094124202901L;

@@ -28,14 +30,7 @@ public class WxMpSelfMenuInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpSelfMenuButton> getButtons() {
return this.buttons;
}

public void setButtons(List<WxMpSelfMenuButton> buttons) {
this.buttons = buttons;
}

@Data
public static class WxMpSelfMenuButton implements Serializable {
private static final long serialVersionUID = -4426602953309048341L;

@@ -95,62 +90,7 @@ public class WxMpSelfMenuInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public SubButtons getSubButtons() {
return subButtons;
}

public void setSubButtons(SubButtons subButtons) {
this.subButtons = subButtons;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getKey() {
return key;
}

public void setKey(String key) {
this.key = key;
}

public String getUrl() {
return url;
}

public void setUrl(String url) {
this.url = url;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}

public NewsInfo getNewsInfo() {
return newsInfo;
}

public void setNewsInfo(NewsInfo newsInfo) {
this.newsInfo = newsInfo;
}

@Data
public static class SubButtons implements Serializable {
private static final long serialVersionUID = 1763350658575521079L;

@@ -161,16 +101,9 @@ public class WxMpSelfMenuInfo implements Serializable {
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public List<WxMpSelfMenuButton> getSubButtons() {
return subButtons;
}

public void setSubButtons(List<WxMpSelfMenuButton> subButtons) {
this.subButtons = subButtons;
}
}

@Data
public static class NewsInfo implements Serializable {
private static final long serialVersionUID = 3449813746347818457L;

@@ -182,14 +115,7 @@ public class WxMpSelfMenuInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public List<NewsInButton> getNews() {
return news;
}

public void setNews(List<NewsInButton> news) {
this.news = news;
}

@Data
public static class NewsInButton implements Serializable {
private static final long serialVersionUID = 8701455967664912972L;

@@ -235,61 +161,6 @@ public class WxMpSelfMenuInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDigest() {
return digest;
}

public void setDigest(String digest) {
this.digest = digest;
}

public String getAuthor() {
return author;
}

public void setAuthor(String author) {
this.author = author;
}

public Integer getShowCover() {
return showCover;
}

public void setShowCover(Integer showCover) {
this.showCover = showCover;
}

public String getCoverUrl() {
return coverUrl;
}

public void setCoverUrl(String coverUrl) {
this.coverUrl = coverUrl;
}

public String getContentUrl() {
return contentUrl;
}

public void setContentUrl(String contentUrl) {
this.contentUrl = contentUrl;
}

public String getSourceUrl() {
return sourceUrl;
}

public void setSourceUrl(String sourceUrl) {
this.sourceUrl = sourceUrl;
}
}
}
}


+ 2
- 16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@@ -15,6 +16,7 @@ import java.io.Serializable;
* @author Binary Wang
*/
@XStreamAlias("HardWare")
@Data
public class HardWare implements Serializable{
private static final long serialVersionUID = -1295785297354896461L;

@@ -35,20 +37,4 @@ public class HardWare implements Serializable{
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String getMessageView() {
return messageView;
}

public void setMessageView(String messageView) {
this.messageView = messageView;
}

public String getMessageAction() {
return messageAction;
}

public void setMessageAction(String messageAction) {
this.messageAction = messageAction;
}
}

+ 2
- 7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@@ -15,6 +16,7 @@ import java.io.Serializable;
* @author Binary Wang
*/
@XStreamAlias("ScanCodeInfo")
@Data
public class ScanCodeInfo implements Serializable {
private static final long serialVersionUID = 4745181270645050122L;

@@ -37,10 +39,6 @@ public class ScanCodeInfo implements Serializable {
return this.scanType;
}

public void setScanType(String scanType) {
this.scanType = scanType;
}

/**
* 扫描结果,即二维码对应的字符串信息
*/
@@ -48,8 +46,5 @@ public class ScanCodeInfo implements Serializable {
return this.scanResult;
}

public void setScanResult(String scanResult) {
this.scanResult = scanResult;
}

}

+ 3
- 41
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@@ -15,6 +16,7 @@ import java.io.Serializable;
* @author Binary Wang
*/
@XStreamAlias("SendLocationInfo")
@Data
public class SendLocationInfo implements Serializable {
private static final long serialVersionUID = 6633214140499161130L;

@@ -36,50 +38,10 @@ public class SendLocationInfo implements Serializable {

@XStreamAlias("Poiname")
@XStreamConverter(value = XStreamCDataConverter.class)
private String poiname;
private String poiName;

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String getLocationX() {
return this.locationX;
}

public void setLocationX(String locationX) {
this.locationX = locationX;
}

public String getLocationY() {
return this.locationY;
}

public void setLocationY(String locationY) {
this.locationY = locationY;
}

public String getScale() {
return this.scale;
}

public void setScale(String scale) {
this.scale = scale;
}

public String getLabel() {
return this.label;
}

public void setLabel(String label) {
this.label = label;
}

public String getPoiname() {
return this.poiname;
}

public void setPoiname(String poiname) {
this.poiname = poiname;
}
}

+ 3
- 19
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@@ -17,6 +18,7 @@ import java.util.List;
* @author Binary Wang
*/
@XStreamAlias("SendPicsInfo")
@Data
public class SendPicsInfo implements Serializable {
private static final long serialVersionUID = -4572837013294199227L;

@@ -31,19 +33,8 @@ public class SendPicsInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public Long getCount() {
return this.count;
}

public void setCount(Long count) {
this.count = count;
}

public List<Item> getPicList() {
return this.picList;
}

@XStreamAlias("item")
@Data
public static class Item implements Serializable {
private static final long serialVersionUID = 7706235740094081194L;

@@ -56,12 +47,5 @@ public class SendPicsInfo implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getPicMd5Sum() {
return this.picMd5Sum;
}

public void setPicMd5Sum(String picMd5Sum) {
this.picMd5Sum = picMd5Sum;
}
}
}

+ 2
- 563
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
@@ -24,6 +25,7 @@ import java.io.Serializable;
* @author chanjarster
*/
@XStreamAlias("xml")
@Data
public class WxMpXmlMessage implements Serializable {
private static final long serialVersionUID = -3586245291677274914L;

@@ -462,183 +464,6 @@ public class WxMpXmlMessage implements Serializable {
}
}

public Integer getOpType() {
return opType;
}

public void setOpType(Integer opType) {
this.opType = opType;
}

public Integer getDeviceStatus() {

return deviceStatus;
}

public void setDeviceStatus(Integer deviceStatus) {
this.deviceStatus = deviceStatus;
}

public HardWare getHardWare() {
return hardWare;
}

public void setHardWare(HardWare hardWare) {
this.hardWare = hardWare;
}

public String getDeviceType() {
return deviceType;
}

public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}

public String getDeviceId() {
return deviceId;
}

public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

public String getOpenId() {
return openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public Long getExpiredTime() {
return this.expiredTime;
}

public void setExpiredTime(Long expiredTime) {
this.expiredTime = expiredTime;
}

public Long getFailTime() {
return this.failTime;
}

public void setFailTime(Long failTime) {
this.failTime = failTime;
}

public String getFailReason() {
return this.failReason;
}

public void setFailReason(String failReason) {
this.failReason = failReason;
}

public String getDetail() {
return detail;
}

public void setDetail(String detail) {
this.detail = detail;
}

public String getModifyBonus() {
return modifyBonus;
}

public void setModifyBonus(String modifyBonus) {
this.modifyBonus = modifyBonus;
}

public String getModifyBalance() {
return modifyBalance;
}

public void setModifyBalance(String modifyBalance) {
this.modifyBalance = modifyBalance;
}

public String getTransId() {
return transId;
}

public void setTransId(String transId) {
this.transId = transId;
}

public String getLocationId() {
return locationId;
}

public void setLocationId(String locationId) {
this.locationId = locationId;
}

public String getFee() {
return fee;
}

public void setFee(String fee) {
this.fee = fee;
}

public String getOriginalFee() {
return originalFee;
}

public void setOriginalFee(String originalFee) {
this.originalFee = originalFee;
}

public String getStoreUniqId() {
return this.storeUniqId;
}

public void setStoreUniqId(String storeUniqId) {
this.storeUniqId = storeUniqId;
}

public String getPoiId() {
return this.poiId;
}

public void setPoiId(String poiId) {
this.poiId = poiId;
}

public String getResult() {
return this.result;
}

public void setResult(String result) {
this.result = result;
}

public String getMsg() {
return this.msg;
}

public void setMsg(String msg) {
this.msg = msg;
}

public String getToUser() {
return this.toUser;
}

public void setToUser(String toUser) {
this.toUser = toUser;
}

public Long getCreateTime() {
return this.createTime;
}

public void setCreateTime(Long createTime) {
this.createTime = createTime;
}

/**
* <pre>
* 当接受用户消息时,可能会获得以下值:
@@ -666,397 +491,11 @@ public class WxMpXmlMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#XML_MSG_MUSIC}
* </pre>
*
* @param msgType
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public Long getMsgId() {
return this.msgId;
}

public void setMsgId(Long msgId) {
this.msgId = msgId;
}

public String getPicUrl() {
return this.picUrl;
}

public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String getFormat() {
return this.format;
}

public void setFormat(String format) {
this.format = format;
}

public String getThumbMediaId() {
return this.thumbMediaId;
}

public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}

public Double getLocationX() {
return this.locationX;
}

public void setLocationX(Double locationX) {
this.locationX = locationX;
}

public Double getLocationY() {
return this.locationY;
}

public void setLocationY(Double locationY) {
this.locationY = locationY;
}

public Double getScale() {
return this.scale;
}

public void setScale(Double scale) {
this.scale = scale;
}

public String getLabel() {
return this.label;
}

public void setLabel(String label) {
this.label = label;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

public String getEvent() {
return this.event;
}

public void setEvent(String event) {
this.event = event;
}

public String getEventKey() {
return this.eventKey;
}

public void setEventKey(String eventKey) {
this.eventKey = eventKey;
}

public String getTicket() {
return this.ticket;
}

public void setTicket(String ticket) {
this.ticket = ticket;
}

public Double getLatitude() {
return this.latitude;
}

public void setLatitude(Double latitude) {
this.latitude = latitude;
}

public Double getLongitude() {
return this.longitude;
}

public void setLongitude(Double longitude) {
this.longitude = longitude;
}

public Double getPrecision() {
return this.precision;
}

public void setPrecision(Double precision) {
this.precision = precision;
}

public String getRecognition() {
return this.recognition;
}

public void setRecognition(String recognition) {
this.recognition = recognition;
}

public String getFromUser() {
return this.fromUser;
}

public void setFromUser(String fromUser) {
this.fromUser = fromUser;
}

public String getStatus() {
return this.status;
}

public void setStatus(String status) {
this.status = status;
}

public Integer getTotalCount() {
return this.totalCount;
}

public void setTotalCount(Integer totalCount) {
this.totalCount = totalCount;
}

public Integer getFilterCount() {
return this.filterCount;
}

public void setFilterCount(Integer filterCount) {
this.filterCount = filterCount;
}

public Integer getSentCount() {
return this.sentCount;
}

public void setSentCount(Integer sentCount) {
this.sentCount = sentCount;
}

public Integer getErrorCount() {
return this.errorCount;
}

public void setErrorCount(Integer errorCount) {
this.errorCount = errorCount;
}

public String getCardId() {
return this.cardId;
}

public void setCardId(String cardId) {
this.cardId = cardId;
}

public String getFriendUserName() {
return this.friendUserName;
}

public void setFriendUserName(String friendUserName) {
this.friendUserName = friendUserName;
}

public Integer getIsGiveByFriend() {
return this.isGiveByFriend;
}

public void setIsGiveByFriend(Integer isGiveByFriend) {
this.isGiveByFriend = isGiveByFriend;
}

public String getUserCardCode() {
return this.userCardCode;
}

public void setUserCardCode(String userCardCode) {
this.userCardCode = userCardCode;
}

public String getOldUserCardCode() {
return this.oldUserCardCode;
}

public void setOldUserCardCode(String oldUserCardCode) {
this.oldUserCardCode = oldUserCardCode;
}

public Integer getOuterId() {
return this.outerId;
}

public void setOuterId(Integer outerId) {
this.outerId = outerId;
}

public ScanCodeInfo getScanCodeInfo() {
return this.scanCodeInfo;
}

public void setScanCodeInfo(ScanCodeInfo scanCodeInfo) {
this.scanCodeInfo = scanCodeInfo;
}

public SendPicsInfo getSendPicsInfo() {
return this.sendPicsInfo;
}

public void setSendPicsInfo(SendPicsInfo sendPicsInfo) {
this.sendPicsInfo = sendPicsInfo;
}

public SendLocationInfo getSendLocationInfo() {
return this.sendLocationInfo;
}

public void setSendLocationInfo(
SendLocationInfo sendLocationInfo) {
this.sendLocationInfo = sendLocationInfo;
}

public Long getMenuId() {
return this.menuId;
}

public void setMenuId(Long menuId) {
this.menuId = menuId;
}

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}

public String getToKfAccount() {
return this.toKfAccount;
}

public void setToKfAccount(String toKfAccount) {
this.toKfAccount = toKfAccount;
}

public String getFromKfAccount() {
return this.fromKfAccount;
}

public void setFromKfAccount(String fromKfAccount) {
this.fromKfAccount = fromKfAccount;
}

public String getIsRestoreMemberCard() {
return isRestoreMemberCard;
}

public void setIsRestoreMemberCard(String isRestoreMemberCard) {
this.isRestoreMemberCard = isRestoreMemberCard;
}

public String getOuterStr() {
return outerStr;
}

public void setOuterStr(String outerStr) {
this.outerStr = outerStr;
}

public String getIsReturnBack() {
return isReturnBack;
}

public void setIsReturnBack(String isReturnBack) {
this.isReturnBack = isReturnBack;
}

public String getIsChatRoom() {
return isChatRoom;
}

public void setIsChatRoom(String isChatRoom) {
this.isChatRoom = isChatRoom;
}

public String getConsumeSource() {
return this.consumeSource;
}

public void setConsumeSource(String consumeSource) {
this.consumeSource = consumeSource;
}

public String getLocationName() {
return this.locationName;
}

public void setLocationName(String locationName) {
this.locationName = locationName;
}

public String getStaffOpenId() {
return this.staffOpenId;
}

public void setStaffOpenId(String staffOpenId) {
this.staffOpenId = staffOpenId;
}

public String getVerifyCode() {
return this.verifyCode;
}

public void setVerifyCode(String verifyCode) {
this.verifyCode = verifyCode;
}

public String getRemarkAmount() {
return this.remarkAmount;
}

public void setRemarkAmount(String remarkAmount) {
this.remarkAmount = remarkAmount;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java 查看文件

@@ -2,10 +2,12 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = -2684778597067990723L;

@@ -17,12 +19,4 @@ public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_IMAGE;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

}

+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
import me.chanjar.weixin.mp.builder.outxml.*;
@@ -11,6 +12,7 @@ import me.chanjar.weixin.mp.util.xml.XStreamTransformer;
import java.io.Serializable;

@XStreamAlias("xml")
@Data
public abstract class WxMpXmlOutMessage implements Serializable {
private static final long serialVersionUID = -381382011286216263L;

@@ -78,38 +80,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {
return new TransferCustomerServiceBuilder();
}

public String getToUserName() {
return this.toUserName;
}

public void setToUserName(String toUserName) {
this.toUserName = toUserName;
}

public String getFromUserName() {
return this.fromUserName;
}

public void setFromUserName(String fromUserName) {
this.fromUserName = fromUserName;
}

public Long getCreateTime() {
return this.createTime;
}

public void setCreateTime(Long createTime) {
this.createTime = createTime;
}

public String getMsgType() {
return this.msgType;
}

public void setMsgType(String msgType) {
this.msgType = msgType;
}

@SuppressWarnings("unchecked")
public String toXml() {
return XStreamTransformer.toXml((Class<WxMpXmlOutMessage>) this.getClass(), this);


+ 3
- 80
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java 查看文件

@@ -2,10 +2,12 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = -4159937804975448945L;

@@ -16,47 +18,8 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_MUSIC;
}

public String getTitle() {
return this.music.getTitle();
}

public void setTitle(String title) {
this.music.setTitle(title);
}

public String getDescription() {
return this.music.getDescription();
}

public void setDescription(String description) {
this.music.setDescription(description);
}

public String getThumbMediaId() {
return this.music.getThumbMediaId();
}

public void setThumbMediaId(String thumbMediaId) {
this.music.setThumbMediaId(thumbMediaId);
}

public String getMusicUrl() {
return this.music.getMusicUrl();
}

public void setMusicUrl(String musicUrl) {
this.music.setMusicUrl(musicUrl);
}

public String getHqMusicUrl() {
return this.music.getHqMusicUrl();
}

public void setHqMusicUrl(String hqMusicUrl) {
this.music.setHqMusicUrl(hqMusicUrl);
}

@XStreamAlias("Music")
@Data
public static class Music {

@XStreamAlias("Title")
@@ -79,46 +42,6 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
@XStreamConverter(value = XStreamCDataConverter.class)
private String hqMusicUrl;

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

public String getThumbMediaId() {
return this.thumbMediaId;
}

public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}

public String getMusicUrl() {
return this.musicUrl;
}

public void setMusicUrl(String musicUrl) {
this.musicUrl = musicUrl;
}

public String getHqMusicUrl() {
return this.hqMusicUrl;
}

public void setHqMusicUrl(String hqMusicUrl) {
this.hqMusicUrl = hqMusicUrl;
}

}

}

+ 7
- 46
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@@ -10,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = -4604402850905714772L;

@@ -22,72 +24,31 @@ public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_NEWS;
}

public int getArticleCount() {
return this.articleCount;
}

public void addArticle(Item item) {
this.articles.add(item);
this.articleCount = this.articles.size();
}

public List<Item> getArticles() {
return this.articles;
}


@XStreamAlias("item")
@Data
public static class Item implements Serializable {

private static final long serialVersionUID = -4971456355028904754L;

@XStreamAlias("Title")
@XStreamConverter(value = XStreamCDataConverter.class)
private String Title;
private String title;

@XStreamAlias("Description")
@XStreamConverter(value = XStreamCDataConverter.class)
private String Description;
private String description;

@XStreamAlias("PicUrl")
@XStreamConverter(value = XStreamCDataConverter.class)
private String PicUrl;
private String picUrl;

@XStreamAlias("Url")
@XStreamConverter(value = XStreamCDataConverter.class)
private String Url;

public String getTitle() {
return this.Title;
}

public void setTitle(String title) {
this.Title = title;
}

public String getDescription() {
return this.Description;
}

public void setDescription(String description) {
this.Description = description;
}

public String getPicUrl() {
return this.PicUrl;
}

public void setPicUrl(String picUrl) {
this.PicUrl = picUrl;
}

public String getUrl() {
return this.Url;
}

public void setUrl(String url) {
this.Url = url;
}
private String url;

}



+ 2
- 9
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java 查看文件

@@ -2,10 +2,12 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = -3972786455288763361L;

@@ -17,13 +19,4 @@ public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_TEXT;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}


}

+ 3
- 15
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java 查看文件

@@ -2,12 +2,14 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

import java.io.Serializable;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = 1850903037285841322L;

@@ -18,15 +20,8 @@ public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE;
}

public TransInfo getTransInfo() {
return this.transInfo;
}

public void setTransInfo(TransInfo transInfo) {
this.transInfo = transInfo;
}

@XStreamAlias("TransInfo")
@Data
public static class TransInfo implements Serializable {
private static final long serialVersionUID = -6317885617135706056L;

@@ -34,12 +29,5 @@ public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage {
@XStreamConverter(value = XStreamCDataConverter.class)
private String kfAccount;

public String getKfAccount() {
return this.kfAccount;
}

public void setKfAccount(String kfAccount) {
this.kfAccount = kfAccount;
}
}
}

+ 3
- 49
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java 查看文件

@@ -2,12 +2,14 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;

import java.io.Serializable;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = 1745902309380113978L;

@@ -18,32 +20,8 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_VIDEO;
}

public String getMediaId() {
return this.video.getMediaId();
}

public void setMediaId(String mediaId) {
this.video.setMediaId(mediaId);
}

public String getTitle() {
return this.video.getTitle();
}

public void setTitle(String title) {
this.video.setTitle(title);
}

public String getDescription() {
return this.video.getDescription();
}

public void setDescription(String description) {
this.video.setDescription(description);
}


@XStreamAlias("Video")
@Data
public static class Video implements Serializable {
private static final long serialVersionUID = -6445448977569651183L;

@@ -59,30 +37,6 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
@XStreamConverter(value = XStreamCDataConverter.class)
private String description;

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getDescription() {
return this.description;
}

public void setDescription(String description) {
this.description = description;
}

}

}

+ 2
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java 查看文件

@@ -2,10 +2,12 @@ package me.chanjar.weixin.mp.bean.message;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.Data;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;

@XStreamAlias("xml")
@Data
public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
private static final long serialVersionUID = 240367390249860551L;

@@ -17,12 +19,4 @@ public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
this.msgType = WxConsts.XML_MSG_VOICE;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

}

+ 2
- 48
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.bean.WxMpCard;

@@ -11,6 +12,7 @@ import java.io.Serializable;
* @author YuJian
* @version 15/11/11
*/
@Data
public class WxMpCardResult implements Serializable {
private static final long serialVersionUID = -7950878428289035637L;

@@ -26,57 +28,9 @@ public class WxMpCardResult implements Serializable {

private Boolean canConsume;

public String getErrorCode() {
return this.errorCode;
}

public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}

public String getErrorMsg() {
return this.errorMsg;
}

public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}

public String getOpenId() {
return this.openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public WxMpCard getCard() {
return this.card;
}

public void setCard(WxMpCard card) {
this.card = card;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String getUserCardStatus() {
return this.userCardStatus;
}

public void setUserCardStatus(String userCardStatus) {
this.userCardStatus = userCardStatus;
}

public Boolean getCanConsume() {
return this.canConsume;
}

public void setCanConsume(Boolean canConsume) {
this.canConsume = canConsume;
}

}

+ 9
- 211
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.result;

import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.common.util.json.WxBooleanTypeAdapter;
import me.chanjar.weixin.common.util.json.WxDateTypeAdapter;
@@ -18,6 +19,7 @@ import java.util.List;
* @author <a href="https://github.com/binarywang">Binary Wang</a>
* </pre>
*/
@Data
public class WxMpCurrentAutoReplyInfo implements Serializable {
private static final long serialVersionUID = 8294705001262751638L;

@@ -47,46 +49,7 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
@SerializedName("keyword_autoreply_info")
private KeywordAutoReplyInfo keywordAutoReplyInfo;

public Boolean getAddFriendReplyOpen() {
return this.isAddFriendReplyOpen;
}

public void setAddFriendReplyOpen(Boolean addFriendReplyOpen) {
isAddFriendReplyOpen = addFriendReplyOpen;
}

public Boolean getAutoReplyOpen() {
return this.isAutoReplyOpen;
}

public void setAutoReplyOpen(Boolean autoReplyOpen) {
isAutoReplyOpen = autoReplyOpen;
}

public AutoReplyInfo getAddFriendAutoReplyInfo() {
return this.addFriendAutoReplyInfo;
}

public void setAddFriendAutoReplyInfo(AutoReplyInfo addFriendAutoReplyInfo) {
this.addFriendAutoReplyInfo = addFriendAutoReplyInfo;
}

public AutoReplyInfo getMessageDefaultAutoReplyInfo() {
return this.messageDefaultAutoReplyInfo;
}

public void setMessageDefaultAutoReplyInfo(AutoReplyInfo messageDefaultAutoReplyInfo) {
this.messageDefaultAutoReplyInfo = messageDefaultAutoReplyInfo;
}

public KeywordAutoReplyInfo getKeywordAutoReplyInfo() {
return this.keywordAutoReplyInfo;
}

public void setKeywordAutoReplyInfo(KeywordAutoReplyInfo keywordAutoReplyInfo) {
this.keywordAutoReplyInfo = keywordAutoReplyInfo;
}

@Data
public static class AutoReplyRule implements Serializable {
private static final long serialVersionUID = -6415971838145909046L;

@@ -111,47 +74,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
@SerializedName("reply_list_info")
private List<ReplyInfo> replyListInfo;

public String getRuleName() {
return this.ruleName;
}

public void setRuleName(String ruleName) {
this.ruleName = ruleName;
}

public Date getCreateTime() {
return this.createTime;
}

public void setCreateTime(Date createTime) {
this.createTime = createTime;
}

public String getReplyMode() {
return this.replyMode;
}

public void setReplyMode(String replyMode) {
this.replyMode = replyMode;
}

public List<KeywordInfo> getKeywordListInfo() {
return this.keywordListInfo;
}

public void setKeywordListInfo(List<KeywordInfo> keywordListInfo) {
this.keywordListInfo = keywordListInfo;
}

public List<ReplyInfo> getReplyListInfo() {
return this.replyListInfo;
}

public void setReplyListInfo(List<ReplyInfo> replyListInfo) {
this.replyListInfo = replyListInfo;
}
}

@Data
public static class ReplyInfo implements Serializable {
private static final long serialVersionUID = -3429575601599101690L;

@@ -166,31 +91,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
@SerializedName("news_info")
private NewsInfo newsInfo;

public String getType() {
return this.type;
}

public void setType(String type) {
this.type = type;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public NewsInfo getNewsInfo() {
return this.newsInfo;
}

public void setNewsInfo(NewsInfo newsInfo) {
this.newsInfo = newsInfo;
}
}

@Data
public static class NewsInfo implements Serializable {
private static final long serialVersionUID = 2958827725972593328L;

@@ -201,15 +104,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {

private List<NewsItem> list;

public List<NewsItem> getList() {
return this.list;
}

public void setList(List<NewsItem> list) {
this.list = list;
}
}

@Data
public static class NewsItem implements Serializable {
private static final long serialVersionUID = -680356309029767176L;

@@ -231,63 +128,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
private String sourceUrl;
private String title;

public String getCoverUrl() {
return this.coverUrl;
}

public void setCoverUrl(String coverUrl) {
this.coverUrl = coverUrl;
}

public String getAuthor() {
return this.author;
}

public void setAuthor(String author) {
this.author = author;
}

public String getContentUrl() {
return this.contentUrl;
}

public void setContentUrl(String contentUrl) {
this.contentUrl = contentUrl;
}

public String getDigest() {
return this.digest;
}

public void setDigest(String digest) {
this.digest = digest;
}

public Boolean getShowCover() {
return this.showCover;
}

public void setShowCover(Boolean showCover) {
this.showCover = showCover;
}

public String getSourceUrl() {
return this.sourceUrl;
}

public void setSourceUrl(String sourceUrl) {
this.sourceUrl = sourceUrl;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}
}

@Data
public static class KeywordInfo implements Serializable {
private static final long serialVersionUID = 7720246983986706379L;

@@ -301,31 +144,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
private String matchMode;
private String content;

public String getType() {
return this.type;
}

public void setType(String type) {
this.type = type;
}

public String getMatchMode() {
return this.matchMode;
}

public void setMatchMode(String matchMode) {
this.matchMode = matchMode;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}
}

@Data
public static class KeywordAutoReplyInfo implements Serializable {
private static final long serialVersionUID = -8789197949404753083L;

@@ -335,16 +156,9 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {
}

private List<AutoReplyRule> list;

public List<AutoReplyRule> getList() {
return this.list;
}

public void setList(List<AutoReplyRule> list) {
this.list = list;
}
}

@Data
public static class AutoReplyInfo implements Serializable {
private static final long serialVersionUID = 4993719555937843712L;

@@ -355,22 +169,6 @@ public class WxMpCurrentAutoReplyInfo implements Serializable {

private String type;
private String content;

public String getType() {
return this.type;
}

public void setType(String type) {
this.type = type;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}
}

}

+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -16,6 +17,7 @@ import java.io.Serializable;
*
* @author chanjarster
*/
@Data
public class WxMpMassSendResult implements Serializable {
private static final long serialVersionUID = -4816336807575562818L;

@@ -28,38 +30,6 @@ public class WxMpMassSendResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpMassSendResult.class);
}

public String getErrorCode() {
return this.errorCode;
}

public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}

public String getErrorMsg() {
return this.errorMsg;
}

public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}

public String getMsgId() {
return this.msgId;
}

public void setMsgId(String msgId) {
this.msgId = msgId;
}

public String getMsgDataId() {
return this.msgDataId;
}

public void setMsgDataId(String msgDataId) {
this.msgDataId = msgDataId;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -13,6 +14,7 @@ import java.io.Serializable;
*
* @author chanjarster
*/
@Data
public class WxMpMassUploadResult implements Serializable {
private static final long serialVersionUID = 6568157943644994029L;

@@ -24,30 +26,6 @@ public class WxMpMassUploadResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpMassUploadResult.class);
}

public String getType() {
return this.type;
}

public void setType(String type) {
this.type = type;
}

public String getMediaId() {
return this.mediaId;
}

public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}

public long getCreatedAt() {
return this.createdAt;
}

public void setCreatedAt(long createdAt) {
this.createdAt = createdAt;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 48
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java 查看文件

@@ -1,10 +1,12 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;

@Data
public class WxMpOAuth2AccessToken implements Serializable {
private static final long serialVersionUID = -1345910558078620805L;

@@ -24,54 +26,6 @@ public class WxMpOAuth2AccessToken implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class);
}

public String getRefreshToken() {
return this.refreshToken;
}

public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}

public String getOpenId() {
return this.openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public String getScope() {
return this.scope;
}

public void setScope(String scope) {
this.scope = scope;
}

public String getAccessToken() {
return this.accessToken;
}

public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}

public int getExpiresIn() {
return this.expiresIn;
}

public void setExpiresIn(int expiresIn) {
this.expiresIn = expiresIn;
}

public String getUnionId() {
return this.unionId;
}

public void setUnionId(String unionId) {
this.unionId = unionId;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 6
- 28
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -9,44 +10,21 @@ import java.io.Serializable;
*
* @author chanjarster
*/
@Data
public class WxMpQrCodeTicket implements Serializable {
private static final long serialVersionUID = 5777119669111011584L;

protected String ticket;
protected int expire_seconds = -1;
/**
* 如果为-1,说明是永久
*/
protected int expireSeconds = -1;
protected String url;

public static WxMpQrCodeTicket fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpQrCodeTicket.class);
}

public String getTicket() {
return this.ticket;
}

public void setTicket(String ticket) {
this.ticket = ticket;
}

/**
* 如果返回-1说明是永久
*/
public int getExpire_seconds() {
return this.expire_seconds;
}

public void setExpire_seconds(int expire_seconds) {
this.expire_seconds = expire_seconds;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

@Override
public String toString() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);


+ 2
- 48
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.io.Serializable;
*
* @author Daniel Qian
*/
@Data
public class WxMpSemanticQueryResult implements Serializable {
private static final long serialVersionUID = 4811088544804441365L;

@@ -25,52 +27,4 @@ public class WxMpSemanticQueryResult implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpSemanticQueryResult.class);
}

public String getQuery() {
return this.query;
}

public void setQuery(String query) {
this.query = query;
}

public String getType() {
return this.type;
}

public void setType(String type) {
this.type = type;
}

public String getSemantic() {
return this.semantic;
}

public void setSemantic(String semantic) {
this.semantic = semantic;
}

public String getResult() {
return this.result;
}

public void setResult(String result) {
this.result = result;
}

public String getAnswer() {
return this.answer;
}

public void setAnswer(String answer) {
this.answer = answer;
}

public String getText() {
return this.text;
}

public void setText(String text) {
this.text = text;
}

}

+ 5
- 124
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java 查看文件

@@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.result;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.util.List;
*
* @author chanjarster
*/
@Data
public class WxMpUser implements Serializable {
private static final long serialVersionUID = 5788154322646488738L;

@@ -28,6 +30,9 @@ public class WxMpUser implements Serializable {
private String country;
private String headImgUrl;
private Long subscribeTime;
/**
* 只有在将公众号绑定到微信开放平台帐号后,才会出现该字段。
*/
private String unionId;
private Integer sexId;
private String remark;
@@ -46,130 +51,6 @@ public class WxMpUser implements Serializable {
return gson.fromJson(jsonObject.get("user_info_list"), collectionType);
}

public Boolean getSubscribe() {
return this.subscribe;
}

public void setSubscribe(Boolean subscribe) {
this.subscribe = subscribe;
}

public String getOpenId() {
return this.openId;
}

public void setOpenId(String openId) {
this.openId = openId;
}

public String getNickname() {
return this.nickname;
}

public void setNickname(String nickname) {
this.nickname = nickname;
}

public String getSex() {
return this.sex;
}

public void setSex(String sex) {
this.sex = sex;
}

public String getLanguage() {
return this.language;
}

public void setLanguage(String language) {
this.language = language;
}

public String getCity() {
return this.city;
}

public void setCity(String city) {
this.city = city;
}

public String getProvince() {
return this.province;
}

public void setProvince(String province) {
this.province = province;
}

public String getCountry() {
return this.country;
}

public void setCountry(String country) {
this.country = country;
}

public String getHeadImgUrl() {
return this.headImgUrl;
}

public void setHeadImgUrl(String headImgUrl) {
this.headImgUrl = headImgUrl;
}

public Long getSubscribeTime() {
return this.subscribeTime;
}

public void setSubscribeTime(Long subscribeTime) {
this.subscribeTime = subscribeTime;
}

/**
* 只有在将公众号绑定到微信开放平台帐号后,才会出现该字段。
*/
public String getUnionId() {
return this.unionId;
}

public void setUnionId(String unionId) {
this.unionId = unionId;
}

public Integer getSexId() {

return this.sexId;
}

public void setSexId(Integer sexId) {
this.sexId = sexId;
}

public String getRemark() {
return this.remark;
}

public void setRemark(String remark) {
this.remark = remark;
}

public Integer getGroupId() {
return this.groupId;
}

public void setGroupId(Integer groupId) {
this.groupId = groupId;
}

public Long[] getTagIds() {
return this.tagIds;
}

public void setTagIds(Long[] tagIds) {
this.tagIds = tagIds;
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);


+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.util.List;
/**
* @author miller
*/
@Data
public class WxMpUserBlacklistGetResult implements Serializable {
private static final long serialVersionUID = -8780216463588687626L;

@@ -21,38 +23,6 @@ public class WxMpUserBlacklistGetResult implements Serializable {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserBlacklistGetResult.class);
}

public int getTotal() {
return this.total;
}

public void setTotal(int total) {
this.total = total;
}

public int getCount() {
return this.count;
}

public void setCount(int count) {
this.count = count;
}

public List<String> getOpenidList() {
return this.openidList;
}

public void setOpenidList(List<String> openidList) {
this.openidList = openidList;
}

public String getNextOpenid() {
return this.nextOpenid;
}

public void setNextOpenid(String nextOpenid) {
this.nextOpenid = nextOpenid;
}

@Override
public String toString() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);


+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.result;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.util.List;
*
* @author chanjarster
*/
@Data
public class WxMpUserList implements Serializable {
private static final long serialVersionUID = 1389073042674901032L;

@@ -23,38 +25,6 @@ public class WxMpUserList implements Serializable {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserList.class);
}

public long getTotal() {
return this.total;
}

public void setTotal(long total) {
this.total = total;
}

public int getCount() {
return this.count;
}

public void setCount(int count) {
this.count = count;
}

public List<String> getOpenids() {
return this.openids;
}

public void setOpenids(List<String> openids) {
this.openids = openids;
}

public String getNextOpenid() {
return this.nextOpenid;
}

public void setNextOpenid(String nextOpenid) {
this.nextOpenid = nextOpenid;
}

@Override
public String toString() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);


+ 5
- 361
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java 查看文件

@@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.store;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.annotation.Required;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
@@ -19,6 +20,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpStoreBaseInfo implements Serializable {
private static final long serialVersionUID = 829577606838118218L;

@@ -170,192 +172,21 @@ public class WxMpStoreBaseInfo implements Serializable {
return WxMpGsonBuilder.create().fromJson(json, WxMpStoreBaseInfo.class);
}

public static WxMpStoreBaseInfoBuilder builder() {
return new WxMpStoreBaseInfoBuilder();
}

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public String toJson() {
JsonElement base_info = WxMpGsonBuilder.create().toJsonTree(this);
JsonElement baseInfo = WxMpGsonBuilder.create().toJsonTree(this);
JsonObject jsonObject = new JsonObject();
jsonObject.add("base_info", base_info);
jsonObject.add("base_info", baseInfo);
JsonObject business = new JsonObject();
business.add("business", jsonObject);
return business.toString();
}

public String getSid() {
return this.sid;
}

public void setSid(String sid) {
this.sid = sid;
}

public String getBusinessName() {
return this.businessName;
}

public void setBusinessName(String businessName) {
this.businessName = businessName;
}

public String getBranchName() {
return this.branchName;
}

public void setBranchName(String branchName) {
this.branchName = branchName;
}

public String getProvince() {
return this.province;
}

public void setProvince(String province) {
this.province = province;
}

public String getCity() {
return this.city;
}

public void setCity(String city) {
this.city = city;
}

public String getDistrict() {
return this.district;
}

public void setDistrict(String district) {
this.district = district;
}

public String getAddress() {
return this.address;
}

public void setAddress(String address) {
this.address = address;
}

public String getTelephone() {
return this.telephone;
}

public void setTelephone(String telephone) {
this.telephone = telephone;
}

public String[] getCategories() {
return this.categories;
}

public void setCategories(String[] categories) {
this.categories = categories;
}

public Integer getOffsetType() {
return this.offsetType;
}

public void setOffsetType(Integer offsetType) {
this.offsetType = offsetType;
}

public BigDecimal getLongitude() {
return this.longitude;
}

public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}

public BigDecimal getLatitude() {
return this.latitude;
}

public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}

public List<WxMpStorePhoto> getPhotos() {
return this.photos;
}

public void setPhotos(List<WxMpStorePhoto> photos) {
this.photos = photos;
}

public String getRecommend() {
return this.recommend;
}

public void setRecommend(String recommend) {
this.recommend = recommend;
}

public String getSpecial() {
return this.special;
}

public void setSpecial(String special) {
this.special = special;
}

public String getIntroduction() {
return this.introduction;
}

public void setIntroduction(String introduction) {
this.introduction = introduction;
}

public String getOpenTime() {
return this.openTime;
}

public void setOpenTime(String openTime) {
this.openTime = openTime;
}

public Integer getAvgPrice() {
return this.avgPrice;
}

public void setAvgPrice(Integer avgPrice) {
this.avgPrice = avgPrice;
}

public Integer getAvailableState() {
return this.availableState;
}

public void setAvailableState(Integer availableState) {
this.availableState = availableState;
}

public Integer getUpdateStatus() {
return this.updateStatus;
}

public void setUpdateStatus(Integer updateStatus) {
this.updateStatus = updateStatus;
}

public String getPoiId() {
return this.poiId;
}

public void setPoiId(String poiId) {
this.poiId = poiId;
}

@Data
public static class WxMpStorePhoto implements Serializable {
private static final long serialVersionUID = -2942447907614186861L;
/**
@@ -364,193 +195,6 @@ public class WxMpStoreBaseInfo implements Serializable {
@SerializedName("photo_url")
private String photoUrl;

public String getPhotoUrl() {
return photoUrl;
}

public void setPhotoUrl(String photoUrl) {
this.photoUrl = photoUrl;
}
}

public static class WxMpStoreBaseInfoBuilder {
private String sid;
private String businessName;
private String branchName;
private String province;
private String city;
private String district;
private String address;
private String telephone;
private String[] categories;
private Integer offsetType;
private BigDecimal longitude;
private BigDecimal latitude;
private List<WxMpStorePhoto> photos;
private String recommend;
private String special;
private String introduction;
private String openTime;
private Integer avgPrice;
private Integer availableState;
private Integer updateStatus;
private String poiId;

public WxMpStoreBaseInfoBuilder sid(String sid) {
this.sid = sid;
return this;
}

public WxMpStoreBaseInfoBuilder businessName(String businessName) {
this.businessName = businessName;
return this;
}

public WxMpStoreBaseInfoBuilder branchName(String branchName) {
this.branchName = branchName;
return this;
}

public WxMpStoreBaseInfoBuilder province(String province) {
this.province = province;
return this;
}

public WxMpStoreBaseInfoBuilder city(String city) {
this.city = city;
return this;
}

public WxMpStoreBaseInfoBuilder district(String district) {
this.district = district;
return this;
}

public WxMpStoreBaseInfoBuilder address(String address) {
this.address = address;
return this;
}

public WxMpStoreBaseInfoBuilder telephone(String telephone) {
this.telephone = telephone;
return this;
}

public WxMpStoreBaseInfoBuilder categories(String[] categories) {
this.categories = categories;
return this;
}

public WxMpStoreBaseInfoBuilder offsetType(Integer offsetType) {
this.offsetType = offsetType;
return this;
}

public WxMpStoreBaseInfoBuilder longitude(BigDecimal longitude) {
this.longitude = longitude;
return this;
}

public WxMpStoreBaseInfoBuilder latitude(BigDecimal latitude) {
this.latitude = latitude;
return this;
}

public WxMpStoreBaseInfoBuilder photos(List<WxMpStorePhoto> photos) {
this.photos = photos;
return this;
}

public WxMpStoreBaseInfoBuilder recommend(String recommend) {
this.recommend = recommend;
return this;
}

public WxMpStoreBaseInfoBuilder special(String special) {
this.special = special;
return this;
}

public WxMpStoreBaseInfoBuilder introduction(String introduction) {
this.introduction = introduction;
return this;
}

public WxMpStoreBaseInfoBuilder openTime(String openTime) {
this.openTime = openTime;
return this;
}

public WxMpStoreBaseInfoBuilder avgPrice(Integer avgPrice) {
this.avgPrice = avgPrice;
return this;
}

public WxMpStoreBaseInfoBuilder availableState(Integer availableState) {
this.availableState = availableState;
return this;
}

public WxMpStoreBaseInfoBuilder updateStatus(Integer updateStatus) {
this.updateStatus = updateStatus;
return this;
}

public WxMpStoreBaseInfoBuilder poiId(String poiId) {
this.poiId = poiId;
return this;
}

public WxMpStoreBaseInfoBuilder from(WxMpStoreBaseInfo origin) {
this.sid(origin.sid);
this.businessName(origin.businessName);
this.branchName(origin.branchName);
this.province(origin.province);
this.city(origin.city);
this.district(origin.district);
this.address(origin.address);
this.telephone(origin.telephone);
this.categories(origin.categories);
this.offsetType(origin.offsetType);
this.longitude(origin.longitude);
this.latitude(origin.latitude);
this.photos(origin.photos);
this.recommend(origin.recommend);
this.special(origin.special);
this.introduction(origin.introduction);
this.openTime(origin.openTime);
this.avgPrice(origin.avgPrice);
this.availableState(origin.availableState);
this.updateStatus(origin.updateStatus);
this.poiId(origin.poiId);
return this;
}

public WxMpStoreBaseInfo build() {
WxMpStoreBaseInfo m = new WxMpStoreBaseInfo();
m.sid = this.sid;
m.businessName = this.businessName;
m.branchName = this.branchName;
m.province = this.province;
m.city = this.city;
m.district = this.district;
m.address = this.address;
m.telephone = this.telephone;
m.categories = this.categories;
m.offsetType = this.offsetType;
m.longitude = this.longitude;
m.latitude = this.latitude;
m.photos = this.photos;
m.recommend = this.recommend;
m.special = this.special;
m.introduction = this.introduction;
m.openTime = this.openTime;
m.avgPrice = this.avgPrice;
m.availableState = this.availableState;
m.updateStatus = this.updateStatus;
m.poiId = this.poiId;
return m;
}
}

}

+ 2
- 9
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java 查看文件

@@ -1,10 +1,12 @@
package me.chanjar.weixin.mp.bean.store;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;

import java.io.Serializable;

@Data
public class WxMpStoreInfo implements Serializable{
private static final long serialVersionUID = 7300598931768355461L;

@@ -15,13 +17,4 @@ public class WxMpStoreInfo implements Serializable{
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public WxMpStoreBaseInfo getBaseInfo() {
return this.baseInfo;
}

public void setBaseInfo(WxMpStoreBaseInfo baseInfo) {
this.baseInfo = baseInfo;
}

}

+ 2
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.store;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpStoreListResult implements Serializable {
private static final long serialVersionUID = 5388907559949538663L;

@@ -48,36 +50,4 @@ public class WxMpStoreListResult implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public Integer getTotalCount() {
return this.totalCount;
}

public void setTotalCount(Integer totalCount) {
this.totalCount = totalCount;
}

public Integer getErrCode() {
return this.errCode;
}

public void setErrCode(Integer errCode) {
this.errCode = errCode;
}

public String getErrMsg() {
return this.errMsg;
}

public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}

public List<WxMpStoreInfo> getBusinessList() {
return this.businessList;
}

public void setBusinessList(List<WxMpStoreInfo> businessList) {
this.businessList = businessList;
}

}

+ 3
- 32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.tag;

import com.google.gson.annotations.SerializedName;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -15,6 +16,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxTagListUser implements Serializable {
private static final long serialVersionUID = -4551768374200676112L;

@@ -47,30 +49,7 @@ public class WxTagListUser implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public Integer getCount() {
return this.count;
}

public void setCount(Integer count) {
this.count = count;
}

public WxTagListUserData getData() {
return this.data;
}

public void setData(WxTagListUserData data) {
this.data = data;
}

public String getNextOpenid() {
return this.nextOpenid;
}

public void setNextOpenid(String nextOpenid) {
this.nextOpenid = nextOpenid;
}

@Data
public static class WxTagListUserData implements Serializable {
private static final long serialVersionUID = -8584537400336245701L;

@@ -84,13 +63,5 @@ public class WxTagListUser implements Serializable {
public String toString() {
return ToStringUtils.toSimpleString(this);
}

public List<String> getOpenidList() {
return this.openidList;
}

public void setOpenidList(List<String> openidList) {
this.openidList = openidList;
}
}
}

+ 2
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java 查看文件

@@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.tag;

import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -16,6 +17,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxUserTag implements Serializable {
private static final long serialVersionUID = -7722428695667031252L;

@@ -47,30 +49,6 @@ public class WxUserTag implements Serializable {
}.getType());
}

public String getName() {
return this.name;
}

public void setName(String name) {
this.name = name;
}

public Integer getCount() {
return this.count;
}

public void setCount(Integer count) {
this.count = count;
}

public Long getId() {
return this.id;
}

public void setId(Long id) {
this.id = id;
}

public String toJson() {
return WxMpGsonBuilder.create().toJson(this);
}


+ 2
- 48
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java 查看文件

@@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.bean.template;
import com.google.gson.JsonParser;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -17,6 +18,7 @@ import java.util.List;
*
* @author <a href="https://github.com/binarywang">Binary Wang</a>
*/
@Data
public class WxMpTemplate implements Serializable {
private static final JsonParser JSON_PARSER = new JsonParser();
private static final long serialVersionUID = -7366474522571199372L;
@@ -69,52 +71,4 @@ public class WxMpTemplate implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getTemplateId() {
return this.templateId;
}

public void setTemplateId(String templateId) {
this.templateId = templateId;
}

public String getTitle() {
return this.title;
}

public void setTitle(String title) {
this.title = title;
}

public String getPrimaryIndustry() {
return this.primaryIndustry;
}

public void setPrimaryIndustry(String primaryIndustry) {
this.primaryIndustry = primaryIndustry;
}

public String getDeputyIndustry() {
return this.deputyIndustry;
}

public void setDeputyIndustry(String deputyIndustry) {
this.deputyIndustry = deputyIndustry;
}

public String getContent() {
return this.content;
}

public void setContent(String content) {
this.content = content;
}

public String getExample() {
return this.example;
}

public void setExample(String example) {
this.example = example;
}

}

+ 3
- 24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java 查看文件

@@ -1,10 +1,13 @@
package me.chanjar.weixin.mp.bean.template;

import lombok.Data;

import java.io.Serializable;

/**
* @author Daniel Qian
*/
@Data
public class WxMpTemplateData implements Serializable {
private static final long serialVersionUID = 6301835292940277870L;

@@ -26,28 +29,4 @@ public class WxMpTemplateData implements Serializable {
this.color = color;
}

public String getName() {
return this.name;
}

public void setName(String name) {
this.name = name;
}

public String getValue() {
return this.value;
}

public void setValue(String value) {
this.value = value;
}

public String getColor() {
return this.color;
}

public void setColor(String color) {
this.color = color;
}

}

+ 3
- 39
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java 查看文件

@@ -1,6 +1,7 @@
package me.chanjar.weixin.mp.bean.template;


import lombok.Data;
import me.chanjar.weixin.common.util.ToStringUtils;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

@@ -9,6 +10,7 @@ import java.io.Serializable;
/**
* @author miller
*/
@Data
public class WxMpTemplateIndustry implements Serializable {
private static final long serialVersionUID = -7700398224795914722L;

@@ -36,26 +38,11 @@ public class WxMpTemplateIndustry implements Serializable {
return WxMpGsonBuilder.create().toJson(this);
}

public Industry getPrimaryIndustry() {
return this.primaryIndustry;
}

public void setPrimaryIndustry(Industry primaryIndustry) {
this.primaryIndustry = primaryIndustry;
}

public Industry getSecondIndustry() {
return this.secondIndustry;
}

public void setSecondIndustry(Industry secondIndustry) {
this.secondIndustry = secondIndustry;
}

/**
* @author miller
* 官方文档中,创建和获取的数据结构不一样。所以采用冗余字段的方式,实现相应的接口
*/
@Data
public static class Industry implements Serializable {
private static final long serialVersionUID = -1707184885588012142L;
private String id;
@@ -80,28 +67,5 @@ public class WxMpTemplateIndustry implements Serializable {
return ToStringUtils.toSimpleString(this);
}

public String getId() {
return this.id;
}

public void setId(String id) {
this.id = id;
}

public String getFirstClass() {
return this.firstClass;
}

public void setFirstClass(String firstClass) {
this.firstClass = firstClass;
}

public String getSecondClass() {
return this.secondClass;
}

public void setSecondClass(String secondClass) {
this.secondClass = secondClass;
}
}
}

+ 3
- 117
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java 查看文件

@@ -1,5 +1,6 @@
package me.chanjar.weixin.mp.bean.template;

import lombok.Data;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.util.List;
/**
* 参考 http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN 发送模板消息接口部分
*/
@Data
public class WxMpTemplateMessage implements Serializable {
private static final long serialVersionUID = 5063374783759519418L;

@@ -45,138 +47,22 @@ public class WxMpTemplateMessage implements Serializable {
public WxMpTemplateMessage() {
}

public static WxMpTemplateMessageBuilder builder() {
return new WxMpTemplateMessageBuilder();
}

public String getToUser() {
return this.toUser;
}

public void setToUser(String toUser) {
this.toUser = toUser;
}

public String getTemplateId() {
return this.templateId;
}

public void setTemplateId(String templateId) {
this.templateId = templateId;
}

public String getUrl() {
return this.url;
}

public void setUrl(String url) {
this.url = url;
}

public List<WxMpTemplateData> getData() {
return this.data;
}

public void setData(List<WxMpTemplateData> data) {
this.data = data;
}

public void addWxMpTemplateData(WxMpTemplateData datum) {
this.data.add(datum);
}

public MiniProgram getMiniProgram() {
return this.miniProgram;
}

public void setMiniProgram(MiniProgram miniProgram) {
this.miniProgram = miniProgram;
}

public String toJson() {
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}

@Data
public static class MiniProgram implements Serializable {
private static final long serialVersionUID = -7945254706501974849L;

private String appid;
private String pagePath;

public MiniProgram() {
}

public MiniProgram(String appid, String pagePath) {
this.appid = appid;
this.pagePath = pagePath;
}

public String getAppid() {
return this.appid;
}

public void setAppid(String appid) {
this.appid = appid;
}

public String getPagePath() {
return this.pagePath;
}

public void setPagePath(String pagePath) {
this.pagePath = pagePath;
}
}

public static class WxMpTemplateMessageBuilder {
private String toUser;
private String templateId;
private String url;
private List<WxMpTemplateData> data = new ArrayList<>();
private MiniProgram miniProgram;

public WxMpTemplateMessageBuilder toUser(String toUser) {
this.toUser = toUser;
return this;
}

public WxMpTemplateMessageBuilder templateId(String templateId) {
this.templateId = templateId;
return this;
}

public WxMpTemplateMessageBuilder url(String url) {
this.url = url;
return this;
}

public WxMpTemplateMessageBuilder data(List<WxMpTemplateData> data) {
this.data = data;
return this;
}

public WxMpTemplateMessageBuilder from(WxMpTemplateMessage origin) {
this.toUser(origin.toUser);
this.templateId(origin.templateId);
this.url(origin.url);
this.data(origin.data);
return this;
}

public WxMpTemplateMessageBuilder miniProgram(MiniProgram miniProgram) {
this.miniProgram = miniProgram;
return this;
}

public WxMpTemplateMessage build() {
WxMpTemplateMessage m = new WxMpTemplateMessage();
m.toUser = this.toUser;
m.templateId = this.templateId;
m.url = this.url;
m.data = this.data;
m.miniProgram = this.miniProgram;
return m;
}
}

}

+ 1
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxQrCodeTicketAdapter.java 查看文件

@@ -28,7 +28,7 @@ public class WxQrCodeTicketAdapter implements JsonDeserializer<WxMpQrCodeTicket>
ticket.setTicket(GsonHelper.getAsString(ticketJsonObject.get("ticket")));
}
if (ticketJsonObject.get("expire_seconds") != null && !ticketJsonObject.get("expire_seconds").isJsonNull()) {
ticket.setExpire_seconds(GsonHelper.getAsPrimitiveInt(ticketJsonObject.get("expire_seconds")));
ticket.setExpireSeconds(GsonHelper.getAsPrimitiveInt(ticketJsonObject.get("expire_seconds")));
}
if (ticketJsonObject.get("url") != null && !ticketJsonObject.get("url").isJsonNull()) {
ticket.setUrl(GsonHelper.getAsString(ticketJsonObject.get("url")));


+ 3
- 3
weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java 查看文件

@@ -37,7 +37,7 @@ public class WxMpQrcodeServiceImplTest {
WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateTmpTicket(sceneId, null);
Assert.assertNotNull(ticket.getUrl());
Assert.assertNotNull(ticket.getTicket());
Assert.assertTrue(ticket.getExpire_seconds() != -1);
Assert.assertTrue(ticket.getExpireSeconds() != -1);
System.out.println(ticket);
}

@@ -47,7 +47,7 @@ public class WxMpQrcodeServiceImplTest {
WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateTmpTicket(sceneStr, null);
Assert.assertNotNull(ticket.getUrl());
Assert.assertNotNull(ticket.getTicket());
Assert.assertTrue(ticket.getExpire_seconds() != -1);
Assert.assertTrue(ticket.getExpireSeconds() != -1);
System.out.println(ticket);
}

@@ -56,7 +56,7 @@ public class WxMpQrcodeServiceImplTest {
WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateLastTicket(sceneId);
Assert.assertNotNull(ticket.getUrl());
Assert.assertNotNull(ticket.getTicket());
Assert.assertTrue(ticket.getExpire_seconds() == -1);
Assert.assertTrue(ticket.getExpireSeconds() == -1);
System.out.println(ticket);
}



Loading…
取消
儲存