Skip to content

Commit b991929

Browse files
binarywangbinarywang
committed
fix unqualified access
1 parent 76e1da5 commit b991929

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+421
-421
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
141141

142142
final List<WxMpMessageRouterRule> matchRules = new ArrayList<WxMpMessageRouterRule>();
143143
// 收集匹配的规则
144-
for (final WxMpMessageRouterRule rule : rules) {
144+
for (final WxMpMessageRouterRule rule : this.rules) {
145145
if (rule.test(wxMessage)) {
146146
matchRules.add(rule);
147147
if(!rule.isReEnter()) {
@@ -160,35 +160,35 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
160160
// 返回最后一个非异步的rule的执行结果
161161
if(rule.isAsync()) {
162162
futures.add(
163-
executorService.submit(new Runnable() {
163+
this.executorService.submit(new Runnable() {
164164
@Override
165165
public void run() {
166-
rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
166+
rule.service(wxMessage, WxMpMessageRouter.this.wxMpService, WxMpMessageRouter.this.sessionManager, WxMpMessageRouter.this.exceptionHandler);
167167
}
168168
})
169169
);
170170
} else {
171-
res = rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
171+
res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler);
172172
// 在同步操作结束，session访问结束
173-
log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
173+
this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
174174
sessionEndAccess(wxMessage);
175175
}
176176
}
177177

178178
if (futures.size() > 0) {
179-
executorService.submit(new Runnable() {
179+
this.executorService.submit(new Runnable() {
180180
@Override
181181
public void run() {
182182
for (Future future : futures) {
183183
try {
184184
future.get();
185-
log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
185+
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
186186
// 异步操作结束，session访问结束
187187
sessionEndAccess(wxMessage);
188188
} catch (InterruptedException e) {
189-
log.error("Error happened when wait task finish", e);
189+
WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
190190
} catch (ExecutionException e) {
191-
log.error("Error happened when wait task finish", e);
191+
WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
192192
}
193193
}
194194
}
@@ -210,7 +210,7 @@ protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
210210
messageId.append(wxMessage.getMsgId());
211211
}
212212

213-
return messageDuplicateChecker.isDuplicate(messageId.toString());
213+
return this.messageDuplicateChecker.isDuplicate(messageId.toString());
214214

215215
}
216216

@@ -220,7 +220,7 @@ protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
220220
*/
221221
protected void sessionEndAccess(WxMpXmlMessage wxMessage) {
222222

223-
InternalSession session = ((InternalSessionManager)sessionManager).findSession(wxMessage.getFromUserName());
223+
InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUserName());
224224
if (session != null) {
225225
session.endAccess();
226226
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ public class Industry implements Serializable {
1313
private String secondClass;
1414

1515
public String getId() {
16-
return id;
16+
return this.id;
1717
}
1818

1919
public void setId(String id) {
2020
this.id = id;
2121
}
2222

2323
public String getFirstClass() {
24-
return firstClass;
24+
return this.firstClass;
2525
}
2626

2727
public void setFirstClass(String firstClass) {
2828
this.firstClass = firstClass;
2929
}
3030

3131
public String getSecondClass() {
32-
return secondClass;
32+
return this.secondClass;
3333
}
3434

3535
public void setSecondClass(String secondClass) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,39 @@ public class WxMpCard {
2020
private Boolean canConsume;
2121

2222
public String getCardId() {
23-
return cardId;
23+
return this.cardId;
2424
}
2525

2626
public void setCardId(String cardId) {
2727
this.cardId = cardId;
2828
}
2929

3030
public Long getBeginTime() {
31-
return beginTime;
31+
return this.beginTime;
3232
}
3333

3434
public void setBeginTime(Long beginTime) {
3535
this.beginTime = beginTime;
3636
}
3737

3838
public Long getEndTime() {
39-
return endTime;
39+
return this.endTime;
4040
}
4141

4242
public void setEndTime(Long endTime) {
4343
this.endTime = endTime;
4444
}
4545

4646
public String getUserCardStatus() {
47-
return userCardStatus;
47+
return this.userCardStatus;
4848
}
4949

5050
public void setUserCardStatus(String userCardStatus) {
5151
this.userCardStatus = userCardStatus;
5252
}
5353

5454
public Boolean getCanConsume() {
55-
return canConsume;
55+
return this.canConsume;
5656
}
5757

5858
public void setCanConsume(Boolean canConsume) {
@@ -62,11 +62,11 @@ public void setCanConsume(Boolean canConsume) {
6262
@Override
6363
public String toString() {
6464
return "WxMpCard{" +
65-
"cardId='" + cardId + '\'' +
66-
", beginTime=" + beginTime +
67-
", endTime=" + endTime +
68-
", userCardStatus='" + userCardStatus + '\'' +
69-
", canConsume=" + canConsume +
65+
"cardId='" + this.cardId + '\'' +
66+
", beginTime=" + this.beginTime +
67+
", endTime=" + this.endTime +
68+
", userCardStatus='" + this.userCardStatus + '\'' +
69+
", canConsume=" + this.canConsume +
7070
'}';
7171
}
7272
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public static NewsBuilder NEWS() {
182182
}
183183

184184
public String getKfAccount() {
185-
return kfAccount;
185+
return this.kfAccount;
186186
}
187187

188188
public void setKfAccount(String kfAccount) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ public class WxMpGroup implements Serializable {
1515
private String name;
1616
private long count;
1717
public long getId() {
18-
return id;
18+
return this.id;
1919
}
2020
public void setId(long id) {
2121
this.id = id;
2222
}
2323
public String getName() {
24-
return name;
24+
return this.name;
2525
}
2626
public void setName(String name) {
2727
this.name = name;
2828
}
2929
public long getCount() {
30-
return count;
30+
return this.count;
3131
}
3232
public void setCount(long count) {
3333
this.count = count;
@@ -42,7 +42,7 @@ public String toJson() {
4242
}
4343
@Override
4444
public String toString() {
45-
return "WxMpGroup [id=" + id + ", name=" + name + ", count=" + count + "]";
45+
return "WxMpGroup [id=" + this.id + ", name=" + this.name + ", count=" + this.count + "]";
4646
}
4747

4848
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public String toJson() {
2222
}
2323

2424
public Industry getPrimaryIndustry() {
25-
return primaryIndustry;
25+
return this.primaryIndustry;
2626
}
2727

2828
public void setPrimaryIndustry(Industry primaryIndustry) {
2929
this.primaryIndustry = primaryIndustry;
3030
}
3131

3232
public Industry getSecondIndustry() {
33-
return secondIndustry;
33+
return this.secondIndustry;
3434
}
3535

3636
public void setSecondIndustry(Industry secondIndustry) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public WxMpMassGroupMessage() {
2121
}
2222

2323
public String getMsgtype() {
24-
return msgtype;
24+
return this.msgtype;
2525
}
2626

2727
/**
@@ -41,15 +41,15 @@ public void setMsgtype(String msgtype) {
4141
}
4242

4343
public String getContent() {
44-
return content;
44+
return this.content;
4545
}
4646

4747
public void setContent(String content) {
4848
this.content = content;
4949
}
5050

5151
public String getMediaId() {
52-
return mediaId;
52+
return this.mediaId;
5353
}
5454

5555
public void setMediaId(String mediaId) {
@@ -61,7 +61,7 @@ public String toJson() {
6161
}
6262

6363
public Long getGroupId() {
64-
return groupId;
64+
return this.groupId;
6565
}
6666

6767
/**

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class WxMpMassNews implements Serializable {
1616
private List<WxMpMassNewsArticle> articles = new ArrayList<WxMpMassNewsArticle>();
1717

1818
public List<WxMpMassNewsArticle> getArticles() {
19-
return articles;
19+
return this.articles;
2020
}
2121

2222
public void addArticle(WxMpMassNewsArticle article) {
@@ -28,7 +28,7 @@ public String toJson() {
2828
}
2929

3030
public boolean isEmpty() {
31-
return articles == null || articles.isEmpty();
31+
return this.articles == null || this.articles.isEmpty();
3232
}
3333

3434
/**
@@ -76,55 +76,55 @@ public static class WxMpMassNewsArticle {
7676
private boolean showCoverPic;
7777

7878
public String getThumbMediaId() {
79-
return thumbMediaId;
79+
return this.thumbMediaId;
8080
}
8181

8282
public void setThumbMediaId(String thumbMediaId) {
8383
this.thumbMediaId = thumbMediaId;
8484
}
8585

8686
public String getAuthor() {
87-
return author;
87+
return this.author;
8888
}
8989

9090
public void setAuthor(String author) {
9191
this.author = author;
9292
}
9393

9494
public String getTitle() {
95-
return title;
95+
return this.title;
9696
}
9797

9898
public void setTitle(String title) {
9999
this.title = title;
100100
}
101101

102102
public String getContentSourceUrl() {
103-
return contentSourceUrl;
103+
return this.contentSourceUrl;
104104
}
105105

106106
public void setContentSourceUrl(String contentSourceUrl) {
107107
this.contentSourceUrl = contentSourceUrl;
108108
}
109109

110110
public String getContent() {
111-
return content;
111+
return this.content;
112112
}
113113

114114
public void setContent(String content) {
115115
this.content = content;
116116
}
117117

118118
public String getDigest() {
119-
return digest;
119+
return this.digest;
120120
}
121121

122122
public void setDigest(String digest) {
123123
this.digest = digest;
124124
}
125125

126126
public boolean isShowCoverPic() {
127-
return showCoverPic;
127+
return this.showCoverPic;
128128
}
129129

130130
public void setShowCoverPic(boolean showCoverPic) {
@@ -133,14 +133,14 @@ public void setShowCoverPic(boolean showCoverPic) {
133133

134134
@Override
135135
public String toString() {
136-
return "WxMpMassNewsArticle [" + "thumbMediaId=" + thumbMediaId + ", author=" + author + ", title=" + title +
137-
", contentSourceUrl=" + contentSourceUrl + ", content=" + content + ", digest=" + digest +
138-
", showCoverPic=" + showCoverPic + "]";
136+
return "WxMpMassNewsArticle [" + "thumbMediaId=" + this.thumbMediaId + ", author=" + this.author + ", title=" + this.title +
137+
", contentSourceUrl=" + this.contentSourceUrl + ", content=" + this.content + ", digest=" + this.digest +
138+
", showCoverPic=" + this.showCoverPic + "]";
139139
}
140140
}
141141

142142
@Override
143143
public String toString() {
144-
return "WxMpMassNews [" + "articles=" + articles + "]";
144+
return "WxMpMassNews [" + "articles=" + this.articles + "]";
145145
}
146146
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public WxMpMassPreviewMessage() {
1818
}
1919

2020
public String getToWxUsername() {
21-
return toWxUsername;
21+
return this.toWxUsername;
2222
}
2323

2424
public void setToWxUsername(String toWxUsername) {
2525
this.toWxUsername = toWxUsername;
2626
}
2727

2828
public String getMsgType() {
29-
return msgType;
29+
return this.msgType;
3030
}
3131

3232
/**
@@ -47,15 +47,15 @@ public void setMsgType(String msgType) {
4747
}
4848

4949
public String getContent() {
50-
return content;
50+
return this.content;
5151
}
5252

5353
public void setContent(String content) {
5454
this.content = content;
5555
}
5656

5757
public String getMediaId() {
58-
return mediaId;
58+
return this.mediaId;
5959
}
6060

6161
public void setMediaId(String mediaId) {

0 commit comments

Comments
 (0)