Skip to content

Commit 448ff87

Browse files
binarywangbinarywang
committed
Merge branch 'develop'
# Conflicts: # pom.xml # weixin-java-common/pom.xml # weixin-java-cp/pom.xml # weixin-java-mp/pom.xml
2 parents 489252d + 3170945 commit 448ff87

Some content is hidden

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

44 files changed

+1272
-595
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@
5757

5858
非常欢迎和感谢对本项目发起Pull Request的同学，不过本项目基于[git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程，因此在发起Pull Request的时候请选择develop分支。
5959

60-
且本项目代码风格是用2个空格代表一个tab，因此在发起PR时注意一下，否则很容易发生在IDE格式化代码后与原代码产生大量diff，这样我在阅读PR的时候就很困难。
60+
且本项目代码风格是用2个空格代表一个tab，因此在发起PR时注意一下，否则很容易发生在IDE格式化代码后与原代码产生大量diff，这样我在阅读PR的时候就很困难。

‎pom.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.github.binarywang</groupId>
77
<artifactId>weixin-java-parent</artifactId>
8-
<version>1.3.4</version>
8+
<version>1.3.5</version>
99
<packaging>pom</packaging>
1010
<name>WeiXin Java Tools - Parent</name>
1111
<description>微信公众号、企业号上级POM</description>
12-
<url>https://github.com/chanjarster/weixin-java-tools</url>
12+
<url>https://github.com/binarywang/weixin-java-tools</url>
1313

1414
<licenses>
1515
<license>
@@ -23,18 +23,23 @@
2323
<name>Daniel Qian</name>
2424
<email>[email protected]</email>
2525
</developer>
26+
<developer>
27+
<name>Binary Wang</name>
28+
<email>[email protected]</email>
29+
</developer>
2630
</developers>
2731

2832
<scm>
29-
<connection>scm:git:https://github.com/chanjarster/weixin-java-tools.git</connection>
30-
<developerConnection>scm:git:[email protected]:chanjarster/weixin-java-tools.git</developerConnection>
31-
<url>https://github.com/chanjarster/weixin-java-tools</url>
33+
<connection>scm:git:https://github.com/binarywang/weixin-java-tools.git</connection>
34+
<developerConnection>scm:git:[email protected]:binarywang/weixin-java-tools.git</developerConnection>
35+
<url>https://github.com/binarywang/weixin-java-tools</url>
3236
</scm>
3337

3438
<modules>
3539
<module>weixin-java-common</module>
3640
<module>weixin-java-cp</module>
3741
<module>weixin-java-mp</module>
42+
<module>spring-demo</module>
3843
</modules>
3944

4045
<properties>
@@ -144,6 +149,16 @@
144149
</distributionManagement>
145150

146151
<profiles>
152+
<profile>
153+
<id>doclint-java8-disable</id>
154+
<activation>
155+
<jdk>[1.8,)</jdk>
156+
</activation>
157+
<properties>
158+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
159+
</properties>
160+
</profile>
161+
147162
<profile>
148163
<id>release</id>
149164
<build>
@@ -174,6 +189,7 @@
174189
</execution>
175190
</executions>
176191
<configuration>
192+
<additionalparam>${javadoc.opts}</additionalparam>
177193
<charset>UTF-8</charset>
178194
<locale>zh_CN</locale>
179195
</configuration>

‎spring-demo/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.github.binarywang</groupId>
8+
<artifactId>weixin-java-parent</artifactId>
9+
<version>1.3.5-SNAPSHOT</version>
10+
</parent>
11+
<artifactId>spring-demo</artifactId>
12+
<packaging>war</packaging>
13+
<name>WeiXin Java Tools - demo with spring</name>
14+
<description>spring demo</description>
15+
<url>https://github.com/binarywang/weixin-java-tools</url>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.github.binarywang</groupId>
20+
<artifactId>weixin-java-common</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
</dependencies>
24+
25+
</project>

‎spring-demo/src/main/webapp/WEB-INF/web.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
4+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
5+
version="3.0">
6+
<display-name>api</display-name>
7+
<context-param>
8+
<param-name>contextConfigLocation</param-name>
9+
<param-value>classpath:applicationContext.xml</param-value>
10+
</context-param>
11+
<filter>
12+
<filter-name>encodingFilter</filter-name>
13+
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
14+
<init-param>
15+
<param-name>encoding</param-name>
16+
<param-value>UTF-8</param-value>
17+
</init-param>
18+
</filter>
19+
<filter-mapping>
20+
<filter-name>encodingFilter</filter-name>
21+
<url-pattern>/*</url-pattern>
22+
</filter-mapping>
23+
<filter>
24+
<filter-name>springSecurityFilterChain</filter-name>
25+
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
26+
</filter>
27+
<filter-mapping>
28+
<filter-name>springSecurityFilterChain</filter-name>
29+
<url-pattern>/v1/admin/*</url-pattern>
30+
</filter-mapping>
31+
32+
<listener>
33+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
34+
</listener>
35+
<listener>
36+
<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
37+
</listener>
38+
<servlet>
39+
<description>spring mvc servlet</description>
40+
<servlet-name>springMvc</servlet-name>
41+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
42+
<init-param>
43+
<param-name>contextConfigLocation</param-name>
44+
<param-value>classpath:spring-servlet-common.xml</param-value>
45+
</init-param>
46+
<load-on-startup>1</load-on-startup>
47+
</servlet>
48+
<servlet-mapping>
49+
<servlet-name>springMvc</servlet-name>
50+
<url-pattern>/</url-pattern>
51+
</servlet-mapping>
52+
<session-config>
53+
<session-timeout>30</session-timeout>
54+
</session-config>
55+
</web-app>

‎weixin-java-common/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>weixin-java-parent</artifactId>
9-
<version>1.3.4</version>
9+
<version>1.3.5</version>
1010
</parent>
1111

1212
<artifactId>weixin-java-common</artifactId>
@@ -27,31 +27,26 @@
2727
<dependency>
2828
<groupId>org.testng</groupId>
2929
<artifactId>testng</artifactId>
30-
<version>6.8.7</version>
3130
<scope>test</scope>
3231
</dependency>
3332
<dependency>
3433
<groupId>org.mockito</groupId>
3534
<artifactId>mockito-all</artifactId>
36-
<version>1.9.5</version>
3735
<scope>test</scope>
3836
</dependency>
3937
<dependency>
4038
<groupId>com.google.inject</groupId>
4139
<artifactId>guice</artifactId>
42-
<version>3.0</version>
4340
<scope>test</scope>
4441
</dependency>
4542
<dependency>
4643
<groupId>org.eclipse.jetty</groupId>
4744
<artifactId>jetty-server</artifactId>
48-
<version>9.3.0.M0</version>
4945
<scope>test</scope>
5046
</dependency>
5147
<dependency>
5248
<groupId>org.eclipse.jetty</groupId>
5349
<artifactId>jetty-servlet</artifactId>
54-
<version>9.3.0.M0</version>
5550
<scope>test</scope>
5651
</dependency>
5752
</dependencies>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.Serializable;
66

77
public class WxAccessToken implements Serializable {
8+
private static final long serialVersionUID = 8709719312922168909L;
89

910
private String accessToken;
1011

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*/
1111
public class WxCardApiSignature implements Serializable {
1212

13+
private static final long serialVersionUID = 158176707226975979L;
14+
1315
private String appId;
1416

1517
private String cardId;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
* jspai signature
77
*/
88
public class WxJsapiSignature implements Serializable {
9+
private static final long serialVersionUID = -1116808193154384804L;
10+
911
private String appid;
1012

1113
private String noncestr;

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
public class WxMenu implements Serializable {
1818

19+
private static final long serialVersionUID = -7083914585539687746L;
20+
1921
private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();
2022

2123
private WxMenuRule matchRule;
@@ -129,20 +131,20 @@ public String toString() {
129131
}
130132

131133
public static class WxMenuRule {
132-
private String groupId;
134+
private String tagId;
133135
private String sex;
134136
private String country;
135137
private String province;
136138
private String city;
137139
private String clientPlatformType;
138140
private String language;
139141

140-
public String getGroupId() {
141-
return groupId;
142+
public String getTagId() {
143+
return tagId;
142144
}
143145

144-
public void setGroupId(String groupId) {
145-
this.groupId = groupId;
146+
public void setTagId(String tagId) {
147+
this.tagId = tagId;
146148
}
147149

148150
public String getSex() {
@@ -196,7 +198,7 @@ public void setLanguage(String language) {
196198
@Override
197199
public String toString() {
198200
return "matchrule:{" +
199-
"group_id='" + groupId + '\'' +
201+
"tag_id='" + tagId + '\'' +
200202
", sex='" + sex + '\'' +
201203
", country" + country + '\'' +
202204
", province" + province + '\'' +

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import java.io.Serializable;
66

77
/**
8-
* 微信错误码说明
9-
* http://mp.weixin.qq.com/wiki/index.php?title=全局返回码说明
8+
* 微信错误码说明，请阅读： <a href="http://mp.weixin.qq.com/wiki/10/6380dc743053a91c544ffd2b7c959166.html">全局返回码说明</a>
109
* @author Daniel Qian
1110
*
1211
*/
1312
public class WxError implements Serializable {
1413

14+
private static final long serialVersionUID = 7869786563361406291L;
15+
1516
private int errorCode;
1617

1718
private String errorMsg;
@@ -52,4 +53,30 @@ public String toString() {
5253
return "微信错误: errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json;
5354
}
5455

56+
public static Builder newBuilder(){
57+
return new Builder();
58+
}
59+
60+
public static class Builder{
61+
private int errorCode;
62+
private String errorMsg;
63+
64+
public Builder setErrorCode(int errorCode) {
65+
this.errorCode = errorCode;
66+
return this;
67+
}
68+
69+
public Builder setErrorMsg(String errorMsg) {
70+
this.errorMsg = errorMsg;
71+
return this;
72+
}
73+
74+
public WxError build(){
75+
WxError wxError = new WxError();
76+
wxError.setErrorCode(this.errorCode);
77+
wxError.setErrorMsg(this.errorMsg);
78+
return wxError;
79+
}
80+
81+
}
5582
}

0 commit comments

Comments
 (0)