| @@ -144,7 +144,7 @@ public class WxCpMessageRouter { | |||||
| final List<WxCpMessageRouterRule> matchRules = new ArrayList<WxCpMessageRouterRule>(); | final List<WxCpMessageRouterRule> matchRules = new ArrayList<WxCpMessageRouterRule>(); | ||||
| // 收集匹配的规则 | // 收集匹配的规则 | ||||
| for (final WxCpMessageRouterRule rule : rules) { | |||||
| for (final WxCpMessageRouterRule rule : this.rules) { | |||||
| if (rule.test(wxMessage)) { | if (rule.test(wxMessage)) { | ||||
| matchRules.add(rule); | matchRules.add(rule); | ||||
| if (!rule.isReEnter()) { | if (!rule.isReEnter()) { | ||||
| @@ -163,34 +163,34 @@ public class WxCpMessageRouter { | |||||
| // 返回最后一个非异步的rule的执行结果 | // 返回最后一个非异步的rule的执行结果 | ||||
| if (rule.isAsync()) { | if (rule.isAsync()) { | ||||
| futures.add( | futures.add( | ||||
| executorService.submit(new Runnable() { | |||||
| this.executorService.submit(new Runnable() { | |||||
| public void run() { | public void run() { | ||||
| rule.service(wxMessage, wxCpService, sessionManager, exceptionHandler); | |||||
| rule.service(wxMessage, WxCpMessageRouter.this.wxCpService, WxCpMessageRouter.this.sessionManager, WxCpMessageRouter.this.exceptionHandler); | |||||
| } | } | ||||
| }) | }) | ||||
| ); | ); | ||||
| } else { | } else { | ||||
| res = rule.service(wxMessage, wxCpService, sessionManager, exceptionHandler); | |||||
| res = rule.service(wxMessage, this.wxCpService, this.sessionManager, this.exceptionHandler); | |||||
| // 在同步操作结束,session访问结束 | // 在同步操作结束,session访问结束 | ||||
| log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName()); | |||||
| this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName()); | |||||
| sessionEndAccess(wxMessage); | sessionEndAccess(wxMessage); | ||||
| } | } | ||||
| } | } | ||||
| if (futures.size() > 0) { | if (futures.size() > 0) { | ||||
| executorService.submit(new Runnable() { | |||||
| this.executorService.submit(new Runnable() { | |||||
| @Override | @Override | ||||
| public void run() { | public void run() { | ||||
| for (Future future : futures) { | for (Future future : futures) { | ||||
| try { | try { | ||||
| future.get(); | future.get(); | ||||
| log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName()); | |||||
| WxCpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName()); | |||||
| // 异步操作结束,session访问结束 | // 异步操作结束,session访问结束 | ||||
| sessionEndAccess(wxMessage); | sessionEndAccess(wxMessage); | ||||
| } catch (InterruptedException e) { | } catch (InterruptedException e) { | ||||
| log.error("Error happened when wait task finish", e); | |||||
| WxCpMessageRouter.this.log.error("Error happened when wait task finish", e); | |||||
| } catch (ExecutionException e) { | } catch (ExecutionException e) { | ||||
| log.error("Error happened when wait task finish", e); | |||||
| WxCpMessageRouter.this.log.error("Error happened when wait task finish", e); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -213,7 +213,7 @@ public class WxCpMessageRouter { | |||||
| messageId = String.valueOf(wxMessage.getMsgId()); | messageId = String.valueOf(wxMessage.getMsgId()); | ||||
| } | } | ||||
| return messageDuplicateChecker.isDuplicate(messageId); | |||||
| return this.messageDuplicateChecker.isDuplicate(messageId); | |||||
| } | } | ||||
| @@ -224,7 +224,7 @@ public class WxCpMessageRouter { | |||||
| */ | */ | ||||
| protected void sessionEndAccess(WxCpXmlMessage wxMessage) { | protected void sessionEndAccess(WxCpXmlMessage wxMessage) { | ||||
| InternalSession session = ((InternalSessionManager) sessionManager).findSession(wxMessage.getFromUserName()); | |||||
| InternalSession session = ((InternalSessionManager) this.sessionManager).findSession(wxMessage.getFromUserName()); | |||||
| if (session != null) { | if (session != null) { | ||||
| session.endAccess(); | session.endAccess(); | ||||
| } | } | ||||
| @@ -300,7 +300,7 @@ public class WxCpMessageRouterRule { | |||||
| } | } | ||||
| public boolean isAsync() { | public boolean isAsync() { | ||||
| return async; | |||||
| return this.async; | |||||
| } | } | ||||
| public void setAsync(boolean async) { | public void setAsync(boolean async) { | ||||
| @@ -308,7 +308,7 @@ public class WxCpMessageRouterRule { | |||||
| } | } | ||||
| public boolean isReEnter() { | public boolean isReEnter() { | ||||
| return reEnter; | |||||
| return this.reEnter; | |||||
| } | } | ||||
| public void setReEnter(boolean reEnter) { | public void setReEnter(boolean reEnter) { | ||||
| @@ -21,7 +21,7 @@ public class WxCpDepart implements Serializable { | |||||
| } | } | ||||
| public Integer getId() { | public Integer getId() { | ||||
| return id; | |||||
| return this.id; | |||||
| } | } | ||||
| public void setId(Integer id) { | public void setId(Integer id) { | ||||
| @@ -29,7 +29,7 @@ public class WxCpDepart implements Serializable { | |||||
| } | } | ||||
| public String getName() { | public String getName() { | ||||
| return name; | |||||
| return this.name; | |||||
| } | } | ||||
| public void setName(String name) { | public void setName(String name) { | ||||
| @@ -37,7 +37,7 @@ public class WxCpDepart implements Serializable { | |||||
| } | } | ||||
| public Integer getParentId() { | public Integer getParentId() { | ||||
| return parentId; | |||||
| return this.parentId; | |||||
| } | } | ||||
| public void setParentId(Integer parentId) { | public void setParentId(Integer parentId) { | ||||
| @@ -45,7 +45,7 @@ public class WxCpDepart implements Serializable { | |||||
| } | } | ||||
| public Integer getOrder() { | public Integer getOrder() { | ||||
| return order; | |||||
| return this.order; | |||||
| } | } | ||||
| public void setOrder(Integer order) { | public void setOrder(Integer order) { | ||||
| @@ -59,10 +59,10 @@ public class WxCpDepart implements Serializable { | |||||
| @Override | @Override | ||||
| public String toString() { | public String toString() { | ||||
| return "WxCpDepart{" + | return "WxCpDepart{" + | ||||
| "id=" + id + | |||||
| ", name='" + name + '\'' + | |||||
| ", parentId=" + parentId + | |||||
| ", order=" + order + | |||||
| "id=" + this.id + | |||||
| ", name='" + this.name + '\'' + | |||||
| ", parentId=" + this.parentId + | |||||
| ", order=" + this.order + | |||||
| '}'; | '}'; | ||||
| } | } | ||||
| } | } | ||||
| @@ -72,7 +72,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getToUser() { | public String getToUser() { | ||||
| return toUser; | |||||
| return this.toUser; | |||||
| } | } | ||||
| public void setToUser(String toUser) { | public void setToUser(String toUser) { | ||||
| @@ -80,7 +80,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getToParty() { | public String getToParty() { | ||||
| return toParty; | |||||
| return this.toParty; | |||||
| } | } | ||||
| public void setToParty(String toParty) { | public void setToParty(String toParty) { | ||||
| @@ -88,7 +88,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getToTag() { | public String getToTag() { | ||||
| return toTag; | |||||
| return this.toTag; | |||||
| } | } | ||||
| public void setToTag(String toTag) { | public void setToTag(String toTag) { | ||||
| @@ -96,7 +96,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getAgentId() { | public String getAgentId() { | ||||
| return agentId; | |||||
| return this.agentId; | |||||
| } | } | ||||
| public void setAgentId(String agentId) { | public void setAgentId(String agentId) { | ||||
| @@ -104,7 +104,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getMsgType() { | public String getMsgType() { | ||||
| return msgType; | |||||
| return this.msgType; | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -125,7 +125,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getSafe() { | public String getSafe() { | ||||
| return safe; | |||||
| return this.safe; | |||||
| } | } | ||||
| public void setSafe(String safe) { | public void setSafe(String safe) { | ||||
| @@ -133,7 +133,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getContent() { | public String getContent() { | ||||
| return content; | |||||
| return this.content; | |||||
| } | } | ||||
| public void setContent(String content) { | public void setContent(String content) { | ||||
| @@ -141,7 +141,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return mediaId; | |||||
| return this.mediaId; | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| @@ -149,7 +149,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getThumbMediaId() { | public String getThumbMediaId() { | ||||
| return thumbMediaId; | |||||
| return this.thumbMediaId; | |||||
| } | } | ||||
| public void setThumbMediaId(String thumbMediaId) { | public void setThumbMediaId(String thumbMediaId) { | ||||
| @@ -157,7 +157,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return title; | |||||
| return this.title; | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| @@ -165,7 +165,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return description; | |||||
| return this.description; | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| @@ -173,7 +173,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getMusicUrl() { | public String getMusicUrl() { | ||||
| return musicUrl; | |||||
| return this.musicUrl; | |||||
| } | } | ||||
| public void setMusicUrl(String musicUrl) { | public void setMusicUrl(String musicUrl) { | ||||
| @@ -181,7 +181,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getHqMusicUrl() { | public String getHqMusicUrl() { | ||||
| return hqMusicUrl; | |||||
| return this.hqMusicUrl; | |||||
| } | } | ||||
| public void setHqMusicUrl(String hqMusicUrl) { | public void setHqMusicUrl(String hqMusicUrl) { | ||||
| @@ -189,7 +189,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public List<WxArticle> getArticles() { | public List<WxArticle> getArticles() { | ||||
| return articles; | |||||
| return this.articles; | |||||
| } | } | ||||
| public void setArticles(List<WxArticle> articles) { | public void setArticles(List<WxArticle> articles) { | ||||
| @@ -208,7 +208,7 @@ public class WxCpMessage implements Serializable { | |||||
| private String picUrl; | private String picUrl; | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return title; | |||||
| return this.title; | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| @@ -216,7 +216,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return description; | |||||
| return this.description; | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| @@ -224,7 +224,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getUrl() { | public String getUrl() { | ||||
| return url; | |||||
| return this.url; | |||||
| } | } | ||||
| public void setUrl(String url) { | public void setUrl(String url) { | ||||
| @@ -232,7 +232,7 @@ public class WxCpMessage implements Serializable { | |||||
| } | } | ||||
| public String getPicUrl() { | public String getPicUrl() { | ||||
| return picUrl; | |||||
| return this.picUrl; | |||||
| } | } | ||||
| public void setPicUrl(String picUrl) { | public void setPicUrl(String picUrl) { | ||||
| @@ -28,7 +28,7 @@ public class WxCpTag implements Serializable { | |||||
| } | } | ||||
| public String getName() { | public String getName() { | ||||
| return name; | |||||
| return this.name; | |||||
| } | } | ||||
| public void setName(String name) { | public void setName(String name) { | ||||
| @@ -36,7 +36,7 @@ public class WxCpTag implements Serializable { | |||||
| } | } | ||||
| public String getId() { | public String getId() { | ||||
| return id; | |||||
| return this.id; | |||||
| } | } | ||||
| public void setId(String id) { | public void setId(String id) { | ||||
| @@ -32,7 +32,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getUserId() { | public String getUserId() { | ||||
| return userId; | |||||
| return this.userId; | |||||
| } | } | ||||
| public void setUserId(String userId) { | public void setUserId(String userId) { | ||||
| @@ -40,7 +40,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getName() { | public String getName() { | ||||
| return name; | |||||
| return this.name; | |||||
| } | } | ||||
| public void setName(String name) { | public void setName(String name) { | ||||
| @@ -48,7 +48,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public Integer[] getDepartIds() { | public Integer[] getDepartIds() { | ||||
| return departIds; | |||||
| return this.departIds; | |||||
| } | } | ||||
| public void setDepartIds(Integer[] departIds) { | public void setDepartIds(Integer[] departIds) { | ||||
| @@ -56,7 +56,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getGender() { | public String getGender() { | ||||
| return gender; | |||||
| return this.gender; | |||||
| } | } | ||||
| public void setGender(String gender) { | public void setGender(String gender) { | ||||
| @@ -64,7 +64,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getPosition() { | public String getPosition() { | ||||
| return position; | |||||
| return this.position; | |||||
| } | } | ||||
| public void setPosition(String position) { | public void setPosition(String position) { | ||||
| @@ -72,7 +72,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getMobile() { | public String getMobile() { | ||||
| return mobile; | |||||
| return this.mobile; | |||||
| } | } | ||||
| public void setMobile(String mobile) { | public void setMobile(String mobile) { | ||||
| @@ -80,7 +80,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getTel() { | public String getTel() { | ||||
| return tel; | |||||
| return this.tel; | |||||
| } | } | ||||
| public void setTel(String tel) { | public void setTel(String tel) { | ||||
| @@ -88,7 +88,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getEmail() { | public String getEmail() { | ||||
| return email; | |||||
| return this.email; | |||||
| } | } | ||||
| public void setEmail(String email) { | public void setEmail(String email) { | ||||
| @@ -96,7 +96,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getWeiXinId() { | public String getWeiXinId() { | ||||
| return weiXinId; | |||||
| return this.weiXinId; | |||||
| } | } | ||||
| public void setWeiXinId(String weiXinId) { | public void setWeiXinId(String weiXinId) { | ||||
| @@ -104,7 +104,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getAvatar() { | public String getAvatar() { | ||||
| return avatar; | |||||
| return this.avatar; | |||||
| } | } | ||||
| public void setAvatar(String avatar) { | public void setAvatar(String avatar) { | ||||
| @@ -112,7 +112,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| return status; | |||||
| return this.status; | |||||
| } | } | ||||
| public void setStatus(Integer status) { | public void setStatus(Integer status) { | ||||
| @@ -120,7 +120,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public Integer getEnable() { | public Integer getEnable() { | ||||
| return enable; | |||||
| return this.enable; | |||||
| } | } | ||||
| public void setEnable(Integer enable) { | public void setEnable(Integer enable) { | ||||
| @@ -132,7 +132,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public List<Attr> getExtAttrs() { | public List<Attr> getExtAttrs() { | ||||
| return extAttrs; | |||||
| return this.extAttrs; | |||||
| } | } | ||||
| public String toJson() { | public String toJson() { | ||||
| @@ -150,7 +150,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getName() { | public String getName() { | ||||
| return name; | |||||
| return this.name; | |||||
| } | } | ||||
| public void setName(String name) { | public void setName(String name) { | ||||
| @@ -158,7 +158,7 @@ public class WxCpUser implements Serializable { | |||||
| } | } | ||||
| public String getValue() { | public String getValue() { | ||||
| return value; | |||||
| return this.value; | |||||
| } | } | ||||
| public void setValue(String value) { | public void setValue(String value) { | ||||
| @@ -200,7 +200,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Integer getAgentId() { | public Integer getAgentId() { | ||||
| return agentId; | |||||
| return this.agentId; | |||||
| } | } | ||||
| public void setAgentId(Integer agentId) { | public void setAgentId(Integer agentId) { | ||||
| @@ -208,7 +208,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getToUserName() { | public String getToUserName() { | ||||
| return toUserName; | |||||
| return this.toUserName; | |||||
| } | } | ||||
| public void setToUserName(String toUserName) { | public void setToUserName(String toUserName) { | ||||
| @@ -216,7 +216,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Long getCreateTime() { | public Long getCreateTime() { | ||||
| return createTime; | |||||
| return this.createTime; | |||||
| } | } | ||||
| public void setCreateTime(Long createTime) { | public void setCreateTime(Long createTime) { | ||||
| @@ -236,7 +236,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| * </pre> | * </pre> | ||||
| */ | */ | ||||
| public String getMsgType() { | public String getMsgType() { | ||||
| return msgType; | |||||
| return this.msgType; | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -256,7 +256,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getContent() { | public String getContent() { | ||||
| return content; | |||||
| return this.content; | |||||
| } | } | ||||
| public void setContent(String content) { | public void setContent(String content) { | ||||
| @@ -264,7 +264,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Long getMsgId() { | public Long getMsgId() { | ||||
| return msgId; | |||||
| return this.msgId; | |||||
| } | } | ||||
| public void setMsgId(Long msgId) { | public void setMsgId(Long msgId) { | ||||
| @@ -272,7 +272,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getPicUrl() { | public String getPicUrl() { | ||||
| return picUrl; | |||||
| return this.picUrl; | |||||
| } | } | ||||
| public void setPicUrl(String picUrl) { | public void setPicUrl(String picUrl) { | ||||
| @@ -280,7 +280,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return mediaId; | |||||
| return this.mediaId; | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| @@ -288,7 +288,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getFormat() { | public String getFormat() { | ||||
| return format; | |||||
| return this.format; | |||||
| } | } | ||||
| public void setFormat(String format) { | public void setFormat(String format) { | ||||
| @@ -296,7 +296,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getThumbMediaId() { | public String getThumbMediaId() { | ||||
| return thumbMediaId; | |||||
| return this.thumbMediaId; | |||||
| } | } | ||||
| public void setThumbMediaId(String thumbMediaId) { | public void setThumbMediaId(String thumbMediaId) { | ||||
| @@ -304,7 +304,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getLocationX() { | public Double getLocationX() { | ||||
| return locationX; | |||||
| return this.locationX; | |||||
| } | } | ||||
| public void setLocationX(Double locationX) { | public void setLocationX(Double locationX) { | ||||
| @@ -312,7 +312,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getLocationY() { | public Double getLocationY() { | ||||
| return locationY; | |||||
| return this.locationY; | |||||
| } | } | ||||
| public void setLocationY(Double locationY) { | public void setLocationY(Double locationY) { | ||||
| @@ -320,7 +320,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getScale() { | public Double getScale() { | ||||
| return scale; | |||||
| return this.scale; | |||||
| } | } | ||||
| public void setScale(Double scale) { | public void setScale(Double scale) { | ||||
| @@ -328,7 +328,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getLabel() { | public String getLabel() { | ||||
| return label; | |||||
| return this.label; | |||||
| } | } | ||||
| public void setLabel(String label) { | public void setLabel(String label) { | ||||
| @@ -336,7 +336,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return title; | |||||
| return this.title; | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| @@ -344,7 +344,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return description; | |||||
| return this.description; | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| @@ -352,7 +352,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getUrl() { | public String getUrl() { | ||||
| return url; | |||||
| return this.url; | |||||
| } | } | ||||
| public void setUrl(String url) { | public void setUrl(String url) { | ||||
| @@ -360,7 +360,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getEvent() { | public String getEvent() { | ||||
| return event; | |||||
| return this.event; | |||||
| } | } | ||||
| public void setEvent(String event) { | public void setEvent(String event) { | ||||
| @@ -368,7 +368,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getEventKey() { | public String getEventKey() { | ||||
| return eventKey; | |||||
| return this.eventKey; | |||||
| } | } | ||||
| public void setEventKey(String eventKey) { | public void setEventKey(String eventKey) { | ||||
| @@ -376,7 +376,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getTicket() { | public String getTicket() { | ||||
| return ticket; | |||||
| return this.ticket; | |||||
| } | } | ||||
| public void setTicket(String ticket) { | public void setTicket(String ticket) { | ||||
| @@ -384,7 +384,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getLatitude() { | public Double getLatitude() { | ||||
| return latitude; | |||||
| return this.latitude; | |||||
| } | } | ||||
| public void setLatitude(Double latitude) { | public void setLatitude(Double latitude) { | ||||
| @@ -392,7 +392,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getLongitude() { | public Double getLongitude() { | ||||
| return longitude; | |||||
| return this.longitude; | |||||
| } | } | ||||
| public void setLongitude(Double longitude) { | public void setLongitude(Double longitude) { | ||||
| @@ -400,7 +400,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Double getPrecision() { | public Double getPrecision() { | ||||
| return precision; | |||||
| return this.precision; | |||||
| } | } | ||||
| public void setPrecision(Double precision) { | public void setPrecision(Double precision) { | ||||
| @@ -408,7 +408,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getRecognition() { | public String getRecognition() { | ||||
| return recognition; | |||||
| return this.recognition; | |||||
| } | } | ||||
| public void setRecognition(String recognition) { | public void setRecognition(String recognition) { | ||||
| @@ -416,7 +416,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getFromUserName() { | public String getFromUserName() { | ||||
| return fromUserName; | |||||
| return this.fromUserName; | |||||
| } | } | ||||
| public void setFromUserName(String fromUserName) { | public void setFromUserName(String fromUserName) { | ||||
| @@ -424,7 +424,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getStatus() { | public String getStatus() { | ||||
| return status; | |||||
| return this.status; | |||||
| } | } | ||||
| public void setStatus(String status) { | public void setStatus(String status) { | ||||
| @@ -432,7 +432,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Integer getTotalCount() { | public Integer getTotalCount() { | ||||
| return totalCount; | |||||
| return this.totalCount; | |||||
| } | } | ||||
| public void setTotalCount(Integer totalCount) { | public void setTotalCount(Integer totalCount) { | ||||
| @@ -440,7 +440,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Integer getFilterCount() { | public Integer getFilterCount() { | ||||
| return filterCount; | |||||
| return this.filterCount; | |||||
| } | } | ||||
| public void setFilterCount(Integer filterCount) { | public void setFilterCount(Integer filterCount) { | ||||
| @@ -448,7 +448,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Integer getSentCount() { | public Integer getSentCount() { | ||||
| return sentCount; | |||||
| return this.sentCount; | |||||
| } | } | ||||
| public void setSentCount(Integer sentCount) { | public void setSentCount(Integer sentCount) { | ||||
| @@ -456,7 +456,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public Integer getErrorCount() { | public Integer getErrorCount() { | ||||
| return errorCount; | |||||
| return this.errorCount; | |||||
| } | } | ||||
| public void setErrorCount(Integer errorCount) { | public void setErrorCount(Integer errorCount) { | ||||
| @@ -464,7 +464,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public WxCpXmlMessage.ScanCodeInfo getScanCodeInfo() { | public WxCpXmlMessage.ScanCodeInfo getScanCodeInfo() { | ||||
| return scanCodeInfo; | |||||
| return this.scanCodeInfo; | |||||
| } | } | ||||
| public void setScanCodeInfo(WxCpXmlMessage.ScanCodeInfo scanCodeInfo) { | public void setScanCodeInfo(WxCpXmlMessage.ScanCodeInfo scanCodeInfo) { | ||||
| @@ -472,7 +472,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public WxCpXmlMessage.SendPicsInfo getSendPicsInfo() { | public WxCpXmlMessage.SendPicsInfo getSendPicsInfo() { | ||||
| return sendPicsInfo; | |||||
| return this.sendPicsInfo; | |||||
| } | } | ||||
| public void setSendPicsInfo(WxCpXmlMessage.SendPicsInfo sendPicsInfo) { | public void setSendPicsInfo(WxCpXmlMessage.SendPicsInfo sendPicsInfo) { | ||||
| @@ -480,7 +480,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public WxCpXmlMessage.SendLocationInfo getSendLocationInfo() { | public WxCpXmlMessage.SendLocationInfo getSendLocationInfo() { | ||||
| return sendLocationInfo; | |||||
| return this.sendLocationInfo; | |||||
| } | } | ||||
| public void setSendLocationInfo(WxCpXmlMessage.SendLocationInfo sendLocationInfo) { | public void setSendLocationInfo(WxCpXmlMessage.SendLocationInfo sendLocationInfo) { | ||||
| @@ -490,39 +490,39 @@ public class WxCpXmlMessage implements Serializable { | |||||
| @Override | @Override | ||||
| public String toString() { | public String toString() { | ||||
| return "WxCpXmlMessage{" + | return "WxCpXmlMessage{" + | ||||
| "agentId=" + agentId + | |||||
| ", toUserName='" + toUserName + '\'' + | |||||
| ", fromUserName='" + fromUserName + '\'' + | |||||
| ", createTime=" + createTime + | |||||
| ", msgType='" + msgType + '\'' + | |||||
| ", content='" + content + '\'' + | |||||
| ", msgId=" + msgId + | |||||
| ", picUrl='" + picUrl + '\'' + | |||||
| ", mediaId='" + mediaId + '\'' + | |||||
| ", format='" + format + '\'' + | |||||
| ", thumbMediaId='" + thumbMediaId + '\'' + | |||||
| ", locationX=" + locationX + | |||||
| ", locationY=" + locationY + | |||||
| ", scale=" + scale + | |||||
| ", label='" + label + '\'' + | |||||
| ", title='" + title + '\'' + | |||||
| ", description='" + description + '\'' + | |||||
| ", url='" + url + '\'' + | |||||
| ", event='" + event + '\'' + | |||||
| ", eventKey='" + eventKey + '\'' + | |||||
| ", ticket='" + ticket + '\'' + | |||||
| ", latitude=" + latitude + | |||||
| ", longitude=" + longitude + | |||||
| ", precision=" + precision + | |||||
| ", recognition='" + recognition + '\'' + | |||||
| ", status='" + status + '\'' + | |||||
| ", totalCount=" + totalCount + | |||||
| ", filterCount=" + filterCount + | |||||
| ", sentCount=" + sentCount + | |||||
| ", errorCount=" + errorCount + | |||||
| ", scanCodeInfo=" + scanCodeInfo + | |||||
| ", sendPicsInfo=" + sendPicsInfo + | |||||
| ", sendLocationInfo=" + sendLocationInfo + | |||||
| "agentId=" + this.agentId + | |||||
| ", toUserName='" + this.toUserName + '\'' + | |||||
| ", fromUserName='" + this.fromUserName + '\'' + | |||||
| ", createTime=" + this.createTime + | |||||
| ", msgType='" + this.msgType + '\'' + | |||||
| ", content='" + this.content + '\'' + | |||||
| ", msgId=" + this.msgId + | |||||
| ", picUrl='" + this.picUrl + '\'' + | |||||
| ", mediaId='" + this.mediaId + '\'' + | |||||
| ", format='" + this.format + '\'' + | |||||
| ", thumbMediaId='" + this.thumbMediaId + '\'' + | |||||
| ", locationX=" + this.locationX + | |||||
| ", locationY=" + this.locationY + | |||||
| ", scale=" + this.scale + | |||||
| ", label='" + this.label + '\'' + | |||||
| ", title='" + this.title + '\'' + | |||||
| ", description='" + this.description + '\'' + | |||||
| ", url='" + this.url + '\'' + | |||||
| ", event='" + this.event + '\'' + | |||||
| ", eventKey='" + this.eventKey + '\'' + | |||||
| ", ticket='" + this.ticket + '\'' + | |||||
| ", latitude=" + this.latitude + | |||||
| ", longitude=" + this.longitude + | |||||
| ", precision=" + this.precision + | |||||
| ", recognition='" + this.recognition + '\'' + | |||||
| ", status='" + this.status + '\'' + | |||||
| ", totalCount=" + this.totalCount + | |||||
| ", filterCount=" + this.filterCount + | |||||
| ", sentCount=" + this.sentCount + | |||||
| ", errorCount=" + this.errorCount + | |||||
| ", scanCodeInfo=" + this.scanCodeInfo + | |||||
| ", sendPicsInfo=" + this.sendPicsInfo + | |||||
| ", sendLocationInfo=" + this.sendLocationInfo + | |||||
| '}'; | '}'; | ||||
| } | } | ||||
| @@ -542,7 +542,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| */ | */ | ||||
| public String getScanType() { | public String getScanType() { | ||||
| return scanType; | |||||
| return this.scanType; | |||||
| } | } | ||||
| public void setScanType(String scanType) { | public void setScanType(String scanType) { | ||||
| @@ -553,7 +553,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| * 扫描结果,即二维码对应的字符串信息 | * 扫描结果,即二维码对应的字符串信息 | ||||
| */ | */ | ||||
| public String getScanResult() { | public String getScanResult() { | ||||
| return scanResult; | |||||
| return this.scanResult; | |||||
| } | } | ||||
| public void setScanResult(String scanResult) { | public void setScanResult(String scanResult) { | ||||
| @@ -571,7 +571,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| private Long count; | private Long count; | ||||
| public Long getCount() { | public Long getCount() { | ||||
| return count; | |||||
| return this.count; | |||||
| } | } | ||||
| public void setCount(Long count) { | public void setCount(Long count) { | ||||
| @@ -579,7 +579,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public List<Item> getPicList() { | public List<Item> getPicList() { | ||||
| return picList; | |||||
| return this.picList; | |||||
| } | } | ||||
| @XStreamAlias("item") | @XStreamAlias("item") | ||||
| @@ -590,11 +590,11 @@ public class WxCpXmlMessage implements Serializable { | |||||
| private String PicMd5Sum; | private String PicMd5Sum; | ||||
| public String getPicMd5Sum() { | public String getPicMd5Sum() { | ||||
| return PicMd5Sum; | |||||
| return this.PicMd5Sum; | |||||
| } | } | ||||
| public void setPicMd5Sum(String picMd5Sum) { | public void setPicMd5Sum(String picMd5Sum) { | ||||
| PicMd5Sum = picMd5Sum; | |||||
| this.PicMd5Sum = picMd5Sum; | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -623,7 +623,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| private String poiname; | private String poiname; | ||||
| public String getLocationX() { | public String getLocationX() { | ||||
| return locationX; | |||||
| return this.locationX; | |||||
| } | } | ||||
| public void setLocationX(String locationX) { | public void setLocationX(String locationX) { | ||||
| @@ -631,7 +631,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getLocationY() { | public String getLocationY() { | ||||
| return locationY; | |||||
| return this.locationY; | |||||
| } | } | ||||
| public void setLocationY(String locationY) { | public void setLocationY(String locationY) { | ||||
| @@ -639,7 +639,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getScale() { | public String getScale() { | ||||
| return scale; | |||||
| return this.scale; | |||||
| } | } | ||||
| public void setScale(String scale) { | public void setScale(String scale) { | ||||
| @@ -647,7 +647,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getLabel() { | public String getLabel() { | ||||
| return label; | |||||
| return this.label; | |||||
| } | } | ||||
| public void setLabel(String label) { | public void setLabel(String label) { | ||||
| @@ -655,7 +655,7 @@ public class WxCpXmlMessage implements Serializable { | |||||
| } | } | ||||
| public String getPoiname() { | public String getPoiname() { | ||||
| return poiname; | |||||
| return this.poiname; | |||||
| } | } | ||||
| public void setPoiname(String poiname) { | public void setPoiname(String poiname) { | ||||
| @@ -17,7 +17,7 @@ public class WxCpXmlOutImageMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return mediaId; | |||||
| return this.mediaId; | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| @@ -62,7 +62,7 @@ public abstract class WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getToUserName() { | public String getToUserName() { | ||||
| return toUserName; | |||||
| return this.toUserName; | |||||
| } | } | ||||
| public void setToUserName(String toUserName) { | public void setToUserName(String toUserName) { | ||||
| @@ -70,7 +70,7 @@ public abstract class WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getFromUserName() { | public String getFromUserName() { | ||||
| return fromUserName; | |||||
| return this.fromUserName; | |||||
| } | } | ||||
| public void setFromUserName(String fromUserName) { | public void setFromUserName(String fromUserName) { | ||||
| @@ -78,7 +78,7 @@ public abstract class WxCpXmlOutMessage { | |||||
| } | } | ||||
| public Long getCreateTime() { | public Long getCreateTime() { | ||||
| return createTime; | |||||
| return this.createTime; | |||||
| } | } | ||||
| public void setCreateTime(Long createTime) { | public void setCreateTime(Long createTime) { | ||||
| @@ -86,7 +86,7 @@ public abstract class WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getMsgType() { | public String getMsgType() { | ||||
| return msgType; | |||||
| return this.msgType; | |||||
| } | } | ||||
| public void setMsgType(String msgType) { | public void setMsgType(String msgType) { | ||||
| @@ -21,7 +21,7 @@ public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public int getArticleCount() { | public int getArticleCount() { | ||||
| return articleCount; | |||||
| return this.articleCount; | |||||
| } | } | ||||
| public void addArticle(Item item) { | public void addArticle(Item item) { | ||||
| @@ -30,7 +30,7 @@ public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public List<Item> getArticles() { | public List<Item> getArticles() { | ||||
| return articles; | |||||
| return this.articles; | |||||
| } | } | ||||
| @@ -54,35 +54,35 @@ public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { | |||||
| private String Url; | private String Url; | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return Title; | |||||
| return this.Title; | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| Title = title; | |||||
| this.Title = title; | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return Description; | |||||
| return this.Description; | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| Description = description; | |||||
| this.Description = description; | |||||
| } | } | ||||
| public String getPicUrl() { | public String getPicUrl() { | ||||
| return PicUrl; | |||||
| return this.PicUrl; | |||||
| } | } | ||||
| public void setPicUrl(String picUrl) { | public void setPicUrl(String picUrl) { | ||||
| PicUrl = picUrl; | |||||
| this.PicUrl = picUrl; | |||||
| } | } | ||||
| public String getUrl() { | public String getUrl() { | ||||
| return Url; | |||||
| return this.Url; | |||||
| } | } | ||||
| public void setUrl(String url) { | public void setUrl(String url) { | ||||
| Url = url; | |||||
| this.Url = url; | |||||
| } | } | ||||
| } | } | ||||
| @@ -17,7 +17,7 @@ public class WxCpXmlOutTextMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getContent() { | public String getContent() { | ||||
| return content; | |||||
| return this.content; | |||||
| } | } | ||||
| public void setContent(String content) { | public void setContent(String content) { | ||||
| @@ -16,27 +16,27 @@ public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return video.getMediaId(); | |||||
| return this.video.getMediaId(); | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| video.setMediaId(mediaId); | |||||
| this.video.setMediaId(mediaId); | |||||
| } | } | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return video.getTitle(); | |||||
| return this.video.getTitle(); | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| video.setTitle(title); | |||||
| this.video.setTitle(title); | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return video.getDescription(); | |||||
| return this.video.getDescription(); | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| video.setDescription(description); | |||||
| this.video.setDescription(description); | |||||
| } | } | ||||
| @@ -56,7 +56,7 @@ public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage { | |||||
| private String description; | private String description; | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return mediaId; | |||||
| return this.mediaId; | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| @@ -64,7 +64,7 @@ public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getTitle() { | public String getTitle() { | ||||
| return title; | |||||
| return this.title; | |||||
| } | } | ||||
| public void setTitle(String title) { | public void setTitle(String title) { | ||||
| @@ -72,7 +72,7 @@ public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getDescription() { | public String getDescription() { | ||||
| return description; | |||||
| return this.description; | |||||
| } | } | ||||
| public void setDescription(String description) { | public void setDescription(String description) { | ||||
| @@ -17,7 +17,7 @@ public class WxCpXmlOutVoiceMessage extends WxCpXmlOutMessage { | |||||
| } | } | ||||
| public String getMediaId() { | public String getMediaId() { | ||||
| return mediaId; | |||||
| return this.mediaId; | |||||
| } | } | ||||
| public void setMediaId(String mediaId) { | public void setMediaId(String mediaId) { | ||||
| @@ -50,9 +50,9 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> { | |||||
| public WxCpMessage build() { | public WxCpMessage build() { | ||||
| WxCpMessage m = super.build(); | WxCpMessage m = super.build(); | ||||
| m.setMediaId(this.mediaId); | m.setMediaId(this.mediaId); | ||||
| m.setTitle(title); | |||||
| m.setDescription(description); | |||||
| m.setThumbMediaId(thumbMediaId); | |||||
| m.setTitle(this.title); | |||||
| m.setDescription(this.description); | |||||
| m.setThumbMediaId(this.thumbMediaId); | |||||
| return m; | return m; | ||||
| } | } | ||||
| } | } | ||||
| @@ -22,7 +22,7 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutNewsMe | |||||
| public WxCpXmlOutNewsMessage build() { | public WxCpXmlOutNewsMessage build() { | ||||
| WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage(); | WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage(); | ||||
| for (Item item : articles) { | |||||
| for (Item item : this.articles) { | |||||
| m.addArticle(item); | m.addArticle(item); | ||||
| } | } | ||||
| setCommon(m); | setCommon(m); | ||||
| @@ -31,9 +31,9 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxCpXmlOutVide | |||||
| public WxCpXmlOutVideoMessage build() { | public WxCpXmlOutVideoMessage build() { | ||||
| WxCpXmlOutVideoMessage m = new WxCpXmlOutVideoMessage(); | WxCpXmlOutVideoMessage m = new WxCpXmlOutVideoMessage(); | ||||
| setCommon(m); | setCommon(m); | ||||
| m.setTitle(title); | |||||
| m.setDescription(description); | |||||
| m.setMediaId(mediaId); | |||||
| m.setTitle(this.title); | |||||
| m.setDescription(this.description); | |||||
| m.setMediaId(this.mediaId); | |||||
| return m; | return m; | ||||
| } | } | ||||
| @@ -19,7 +19,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxCpXmlOutVoic | |||||
| public WxCpXmlOutVoiceMessage build() { | public WxCpXmlOutVoiceMessage build() { | ||||
| WxCpXmlOutVoiceMessage m = new WxCpXmlOutVoiceMessage(); | WxCpXmlOutVoiceMessage m = new WxCpXmlOutVoiceMessage(); | ||||
| setCommon(m); | setCommon(m); | ||||
| m.setMediaId(mediaId); | |||||
| m.setMediaId(this.mediaId); | |||||
| return m; | return m; | ||||
| } | } | ||||