Skip to content

Commit 331f06e

Browse files
binarywangbinarywang
authored
Merge pull request #14 from binarywang/develop
merge Develop
2 parents f9a9f97 + b8dbf70 commit 331f06e

File tree

124 files changed

+4740
-1713
lines changed

Some content is hidden

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

124 files changed

+4740
-1713
lines changed

‎pom.xml

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<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">
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">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.github.binarywang</groupId>
77
<artifactId>weixin-java-parent</artifactId>
8-
<version>1.3.5</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010
<name>WeiXin Java Tools - Parent</name>
1111
<description>微信公众号、企业号上级POM</description>
@@ -39,7 +39,6 @@
3939
<module>weixin-java-common</module>
4040
<module>weixin-java-cp</module>
4141
<module>weixin-java-mp</module>
42-
<module>spring-demo</module>
4342
</modules>
4443

4544
<properties>
@@ -50,6 +49,13 @@
5049
<slf4j.version>1.7.10</slf4j.version>
5150
<logback.version>1.1.2</logback.version>
5251
<jodd-http.version>3.6.7</jodd-http.version>
52+
<jackson.version>2.8.0</jackson.version>
53+
<gson.version>2.7</gson.version>
54+
<commons-lang3.version>3.4</commons-lang3.version>
55+
<commons-io.version>2.5</commons-io.version>
56+
<commons-codec.version>1.10</commons-codec.version>
57+
<jetty.version>9.3.0.M0</jetty.version>
58+
<jetty-new.version>9.3.10.v20160621</jetty-new.version>
5359
</properties>
5460

5561
<dependencies>
@@ -82,20 +88,30 @@
8288
<dependency>
8389
<groupId>com.google.code.gson</groupId>
8490
<artifactId>gson</artifactId>
85-
<version>2.2.2</version>
91+
<version>${gson.version}</version>
8692
</dependency>
8793
<dependency>
8894
<groupId>commons-codec</groupId>
8995
<artifactId>commons-codec</artifactId>
90-
<version>1.9</version>
96+
<version>${commons-codec.version}</version>
9197
</dependency>
9298
<dependency>
9399
<groupId>commons-io</groupId>
94100
<artifactId>commons-io</artifactId>
95-
<version>2.4</version>
101+
<version>${commons-io.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.apache.commons</groupId>
105+
<artifactId>commons-lang3</artifactId>
106+
<version>${commons-lang3.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>com.fasterxml.jackson.core</groupId>
110+
<artifactId>jackson-databind</artifactId>
111+
<version>${jackson.version}</version>
96112
</dependency>
97113
</dependencies>
98-
114+
99115
<dependencyManagement>
100116
<dependencies>
101117
<dependency>
@@ -125,13 +141,13 @@
125141
<dependency>
126142
<groupId>org.eclipse.jetty</groupId>
127143
<artifactId>jetty-server</artifactId>
128-
<version>9.3.0.M0</version>
144+
<version>${jetty.version}</version>
129145
<scope>test</scope>
130146
</dependency>
131147
<dependency>
132148
<groupId>org.eclipse.jetty</groupId>
133149
<artifactId>jetty-servlet</artifactId>
134-
<version>9.3.0.M0</version>
150+
<version>${jetty.version}</version>
135151
<scope>test</scope>
136152
</dependency>
137153
</dependencies>
@@ -149,16 +165,16 @@
149165
</distributionManagement>
150166

151167
<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-
168+
<profile>
169+
<id>doclint-java8-disable</id>
170+
<activation>
171+
<jdk>[1.8,)</jdk>
172+
</activation>
173+
<properties>
174+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
175+
</properties>
176+
</profile>
177+
162178
<profile>
163179
<id>release</id>
164180
<build>
@@ -220,6 +236,9 @@
220236
<groupId>org.apache.maven.plugins</groupId>
221237
<artifactId>maven-surefire-plugin</artifactId>
222238
<version>2.17</version>
239+
<configuration>
240+
<skip>true</skip>
241+
</configuration>
223242
</plugin>
224243
</plugins>
225244
</pluginManagement>

‎spring-demo/pom.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎weixin-java-common/pom.xml

Lines changed: 1 addition & 1 deletion
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.5</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
</parent>
1111

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

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class WxConsts {
1111
public static final String XML_MSG_TEXT = "text";
1212
public static final String XML_MSG_IMAGE = "image";
1313
public static final String XML_MSG_VOICE = "voice";
14+
public static final String XML_MSG_SHORTVIDEO = "shortvideo";
1415
public static final String XML_MSG_VIDEO = "video";
1516
public static final String XML_MSG_NEWS = "news";
1617
public static final String XML_MSG_MUSIC = "music";
@@ -20,7 +21,7 @@ public class WxConsts {
2021
public static final String XML_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
2122

2223
///////////////////////
23-
// 主动发送消息的消息类型
24+
// 主动发送消息(即客服消息)的消息类型
2425
///////////////////////
2526
public static final String CUSTOM_MSG_TEXT = "text";
2627
public static final String CUSTOM_MSG_IMAGE = "image";
@@ -103,6 +104,10 @@ public class WxConsts {
103104
public static final String EVT_USER_ENTER_SESSION_FROM_CARD = "user_enter_session_from_card";
104105
public static final String EVT_CARD_SKU_REMIND = "card_sku_remind"; // 库存报警
105106

107+
public static final String EVT_KF_CREATE_SESSION = "kf_create_session"; // 客服接入会话
108+
public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
109+
public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
110+
106111
///////////////////////
107112
// 上传多媒体文件的类型
108113
///////////////////////
@@ -133,13 +138,17 @@ public class WxConsts {
133138
/** 扫码推事件且弹出“消息接收中”提示框 */
134139
public static final String BUTTON_SCANCODE_WAITMSG = "scancode_waitmsg";
135140
/** 弹出系统拍照发图 */
136-
public static final String PIC_SYSPHOTO = "pic_sysphoto";
141+
public static final String BUTTON_PIC_SYSPHOTO = "pic_sysphoto";
137142
/** 弹出拍照或者相册发图 */
138-
public static final String PIC_PHOTO_OR_ALBUM = "pic_photo_or_album";
143+
public static final String BUTTON_PIC_PHOTO_OR_ALBUM = "pic_photo_or_album";
139144
/** 弹出微信相册发图器 */
140-
public static final String PIC_WEIXIN = "pic_weixin";
145+
public static final String BUTTON_PIC_WEIXIN = "pic_weixin";
141146
/** 弹出地理位置选择器 */
142-
public static final String LOCATION_SELECT = "location_select";
147+
public static final String BUTTON_LOCATION_SELECT = "location_select";
148+
/** 下发消息（除文本消息） */
149+
public static final String BUTTON_MEDIA_ID = "media_id";
150+
/** 跳转图文消息URL */
151+
public static final String BUTTON_VIEW_LIMITED = "view_limited";
143152

144153
///////////////////////
145154
// oauth2网页授权的scope

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

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

3-
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
4-
import org.apache.commons.codec.Charsets;
5-
63
import java.io.InputStream;
74
import java.io.InputStreamReader;
85
import java.io.Serializable;
6+
import java.nio.charset.StandardCharsets;
97
import java.util.ArrayList;
108
import java.util.List;
119

10+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
11+
1212
/**
1313
* 企业号菜单
1414
* @author Daniel Qian
@@ -45,8 +45,6 @@ public String toJson() {
4545
/**
4646
* 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化
4747
* 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式，外层多套了一个menu
48-
* @param json
49-
* @return
5048
*/
5149
public static WxMenu fromJson(String json) {
5250
return WxGsonBuilder.create().fromJson(json, WxMenu.class);
@@ -55,11 +53,9 @@ public static WxMenu fromJson(String json) {
5553
/**
5654
* 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化
5755
* 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式，外层多套了一个menu
58-
* @param is
59-
* @return
6056
*/
6157
public static WxMenu fromJson(InputStream is) {
62-
return WxGsonBuilder.create().fromJson(new InputStreamReader(is, Charsets.UTF_8), WxMenu.class);
58+
return WxGsonBuilder.create().fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), WxMenu.class);
6359
}
6460

6561
@Override
@@ -195,7 +191,7 @@ public void setLanguage(String language) {
195191
this.language = language;
196192
}
197193

198-
@Override
194+
@Override
199195
public String toString() {
200196
return "matchrule:{" +
201197
"tag_id='" + tagId + '\'' +

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/session/WxSessionManager.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@ public interface WxSessionManager {
44

55
/**
66
* 获取某个sessionId对应的session,如果sessionId没有对应的session，则新建一个并返回。
7-
* @param sessionId
8-
* @return
97
*/
108
public WxSession getSession(String sessionId);
119

1210
/**
1311
* 获取某个sessionId对应的session,如果sessionId没有对应的session，若create为true则新建一个，否则返回null。
14-
* @param sessionId
15-
* @param create
16-
* @return
1712
*/
1813
public WxSession getSession(String sessionId, boolean create);
1914

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/SHA1.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ public class SHA1 {
1212

1313
/**
1414
* 串接arr参数，生成sha1 digest
15-
*
16-
* @param arr
17-
* @return
1815
*/
1916
public static String gen(String... arr) throws NoSuchAlgorithmException {
2017
Arrays.sort(arr);
@@ -27,9 +24,6 @@ public static String gen(String... arr) throws NoSuchAlgorithmException {
2724

2825
/**
2926
* 用&串接arr参数，生成sha1 digest
30-
*
31-
* @param arr
32-
* @return
3327
*/
3428
public static String genWithAmple(String... arr) throws NoSuchAlgorithmException {
3529
Arrays.sort(arr);

0 commit comments

Comments
 (0)