Skip to content

Commit 01a5da7

Browse files
comeonccomeonc
committed
Merge branch 'develop' of github.com:Wechat-Group/weixin-java-tools into develop
* 'develop' of github.com:Wechat-Group/weixin-java-tools: binarywang#376 增加摇一摇周边的部分相关接口 发布临时测试版本2.8.8.BETA fix error code 使用lombok的@DaTa注解简化cp模块的所有bean类 格式化开放平台模块代码 使用lombok的@DaTa注解简化common模块的所有bean类 使用lombok的@DaTa注解简化miniapp模块的所有bean类 发布临时测试版本2.8.7.BETA binarywang#370 WxMpServiceOkHttpImpl改用httpProxy binarywang#370 WxMpServiceOkHttpImpl改用httpProxy # 368 增加 微信第三方平台 模块 统一使用WxErrorException
2 parents b371839 + d32cf99 commit 01a5da7

128 files changed

Lines changed: 2594 additions & 2151 deletions

File tree

Some content is hidden

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

‎pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>weixin-java-parent</artifactId>
9-
<version>2.8.6.BETA</version>
9+
<version>2.8.8.BETA</version>
1010
<packaging>pom</packaging>
1111
<name>WeiXin Java Tools - Parent</name>
1212
<description>微信公众号、企业号上级POM</description>
@@ -80,6 +80,11 @@
8080
<email>crskyp@gmail.com</email>
8181
<url>https://github.com/crskyp</url>
8282
</developer>
83+
<developer>
84+
<name>007</name>
85+
<email>007gzs@gmail.com</email>
86+
<url>https://github.com/007gzs</url>
87+
</developer>
8388
</developers>
8489

8590
<scm>
@@ -94,6 +99,7 @@
9499
<module>weixin-java-mp</module>
95100
<module>weixin-java-pay</module>
96101
<module>weixin-java-miniapp</module>
102+
<module>weixin-java-open</module>
97103
<!--module>weixin-java-osgi</module-->
98104
</modules>
99105

‎weixin-java-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>weixin-java-parent</artifactId>
10-
<version>2.8.6.BETA</version>
10+
<version>2.8.8.BETA</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-common</artifactId>

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package me.chanjar.weixin.common.bean;
22

3+
import lombok.Data;
34
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
45

56
import java.io.Serializable;
67

8+
@Data
79
public class WxAccessToken implements Serializable {
810
private static final long serialVersionUID = 8709719312922168909L;
911

@@ -15,20 +17,4 @@ public static WxAccessToken fromJson(String json) {
1517
return WxGsonBuilder.create().fromJson(json, WxAccessToken.class);
1618
}
1719

18-
public String getAccessToken() {
19-
return this.accessToken;
20-
}
21-
22-
public void setAccessToken(String accessToken) {
23-
this.accessToken = accessToken;
24-
}
25-
26-
public int getExpiresIn() {
27-
return this.expiresIn;
28-
}
29-
30-
public void setExpiresIn(int expiresIn) {
31-
this.expiresIn = expiresIn;
32-
}
33-
3420
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java‎

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package me.chanjar.weixin.common.bean;
22

3+
import lombok.Data;
34
import me.chanjar.weixin.common.util.ToStringUtils;
45

56
import java.io.Serializable;
67

78
/**
8-
* 卡券Api签名
9+
* 卡券Api签名.
910
*
1011
* @author YuJian
1112
* @version 15/11/8
1213
*/
14+
@Data
1315
public class WxCardApiSignature implements Serializable {
14-
1516
private static final long serialVersionUID = 158176707226975979L;
1617

1718
private String appId;
@@ -37,75 +38,4 @@ public String toString() {
3738
return ToStringUtils.toSimpleString(this);
3839
}
3940

40-
public String getAppId() {
41-
return this.appId;
42-
}
43-
44-
public void setAppId(String appId) {
45-
this.appId = appId;
46-
}
47-
48-
public String getCardId() {
49-
return this.cardId;
50-
}
51-
52-
public void setCardId(String cardId) {
53-
this.cardId = cardId;
54-
}
55-
56-
public String getCardType() {
57-
return this.cardType;
58-
}
59-
60-
public void setCardType(String cardType) {
61-
this.cardType = cardType;
62-
}
63-
64-
public String getLocationId() {
65-
return this.locationId;
66-
}
67-
68-
public void setLocationId(String locationId) {
69-
this.locationId = locationId;
70-
}
71-
72-
public String getCode() {
73-
return this.code;
74-
}
75-
76-
public void setCode(String code) {
77-
this.code = code;
78-
}
79-
80-
public String getOpenId() {
81-
return this.openId;
82-
}
83-
84-
public void setOpenId(String openId) {
85-
this.openId = openId;
86-
}
87-
88-
public Long getTimestamp() {
89-
return this.timestamp;
90-
}
91-
92-
public void setTimestamp(Long timestamp) {
93-
this.timestamp = timestamp;
94-
}
95-
96-
public String getNonceStr() {
97-
return this.nonceStr;
98-
}
99-
100-
public void setNonceStr(String nonceStr) {
101-
this.nonceStr = nonceStr;
102-
}
103-
104-
public String getSignature() {
105-
return this.signature;
106-
}
107-
108-
public void setSignature(String signature) {
109-
this.signature = signature;
110-
}
11141
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package me.chanjar.weixin.common.bean;
22

3+
import lombok.Data;
4+
35
import java.io.Serializable;
46

57
/**
6-
* jspai signature
8+
* jspai signature.
79
*/
10+
@Data
811
public class WxJsapiSignature implements Serializable {
912
private static final long serialVersionUID = -1116808193154384804L;
1013

@@ -18,43 +21,4 @@ public class WxJsapiSignature implements Serializable {
1821

1922
private String signature;
2023

21-
public String getSignature() {
22-
return this.signature;
23-
}
24-
25-
public void setSignature(String signature) {
26-
this.signature = signature;
27-
}
28-
29-
public String getNonceStr() {
30-
return nonceStr;
31-
}
32-
33-
public void setNonceStr(String nonceStr) {
34-
this.nonceStr = nonceStr;
35-
}
36-
37-
public long getTimestamp() {
38-
return this.timestamp;
39-
}
40-
41-
public void setTimestamp(long timestamp) {
42-
this.timestamp = timestamp;
43-
}
44-
45-
public String getUrl() {
46-
return this.url;
47-
}
48-
49-
public void setUrl(String url) {
50-
this.url = url;
51-
}
52-
53-
public String getAppId() {
54-
return appId;
55-
}
56-
57-
public void setAppId(String appId) {
58-
this.appId = appId;
59-
}
6024
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.chanjar.weixin.common.bean.menu;
22

3+
import lombok.Data;
34
import me.chanjar.weixin.common.util.ToStringUtils;
45
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
56

@@ -15,8 +16,8 @@
1516
*
1617
* @author Daniel Qian
1718
*/
19+
@Data
1820
public class WxMenu implements Serializable {
19-
2021
private static final long serialVersionUID = -7083914585539687746L;
2122

2223
private List<WxMenuButton> buttons = new ArrayList<>();
@@ -40,22 +41,6 @@ public static WxMenu fromJson(InputStream is) {
4041
.fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), WxMenu.class);
4142
}
4243

43-
public List<WxMenuButton> getButtons() {
44-
return this.buttons;
45-
}
46-
47-
public void setButtons(List<WxMenuButton> buttons) {
48-
this.buttons = buttons;
49-
}
50-
51-
public WxMenuRule getMatchRule() {
52-
return this.matchRule;
53-
}
54-
55-
public void setMatchRule(WxMenuRule matchRule) {
56-
this.matchRule = matchRule;
57-
}
58-
5944
public String toJson() {
6045
return WxGsonBuilder.create().toJson(this);
6146
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java‎

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package me.chanjar.weixin.common.bean.menu;
22

33
import com.google.gson.annotations.SerializedName;
4+
import lombok.Data;
45
import me.chanjar.weixin.common.util.ToStringUtils;
56

67
import java.io.Serializable;
78
import java.util.ArrayList;
89
import java.util.List;
910

11+
@Data
1012
public class WxMenuButton implements Serializable {
1113
private static final long serialVersionUID = -1070939403109776555L;
1214

@@ -77,67 +79,4 @@ public String toString() {
7779
return ToStringUtils.toSimpleString(this);
7880
}
7981

80-
public String getType() {
81-
return this.type;
82-
}
83-
84-
public void setType(String type) {
85-
this.type = type;
86-
}
87-
88-
public String getName() {
89-
return this.name;
90-
}
91-
92-
public void setName(String name) {
93-
this.name = name;
94-
}
95-
96-
public String getKey() {
97-
return this.key;
98-
}
99-
100-
public void setKey(String key) {
101-
this.key = key;
102-
}
103-
104-
public String getUrl() {
105-
return this.url;
106-
}
107-
108-
public void setUrl(String url) {
109-
this.url = url;
110-
}
111-
112-
public List<WxMenuButton> getSubButtons() {
113-
return this.subButtons;
114-
}
115-
116-
public void setSubButtons(List<WxMenuButton> subButtons) {
117-
this.subButtons = subButtons;
118-
}
119-
120-
public String getMediaId() {
121-
return this.mediaId;
122-
}
123-
124-
public void setMediaId(String mediaId) {
125-
this.mediaId = mediaId;
126-
}
127-
128-
public String getAppId() {
129-
return appId;
130-
}
131-
132-
public void setAppId(String appId) {
133-
this.appId = appId;
134-
}
135-
136-
public String getPagePath() {
137-
return pagePath;
138-
}
139-
140-
public void setPagePath(String pagePath) {
141-
this.pagePath = pagePath;
142-
}
14382
}

0 commit comments

Comments
 (0)