Skip to content

Commit fcf3dbc

Browse files
author
ecoolper
committed
Merge remote-tracking branch 'wechat/develop' into develop
# Conflicts: # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AbstractRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
2 parents adcff4e + a47a0bb commit fcf3dbc

File tree

19 files changed

+323
-221
lines changed

19 files changed

+323
-221
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.github.binarywang</groupId>
77
<artifactId>weixin-java-parent</artifactId>
8-
<version>2.7.0-SNAPSHOT</version>
8+
<version>2.6.1.BETA</version>
99
<packaging>pom</packaging>
1010
<name>WeiXin Java Tools - Parent</name>
1111
<description>微信公众号、企业号上级POM</description>

‎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>2.7.0-SNAPSHOT</version>
9+
<version>2.6.1.BETA</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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ public class WxConsts {
9191
public static final String EVT_CARD_PASS_CHECK = "card_pass_check";
9292
public static final String EVT_CARD_NOT_PASS_CHECK = "card_not_pass_check";
9393
public static final String EVT_USER_GET_CARD = "user_get_card";
94+
/**
95+
* 卡券转赠事件
96+
*/
97+
public static final String EVT_USER_GIFTING_CARD = "user_gifting_card";
9498
public static final String EVT_USER_DEL_CARD = "user_del_card";
9599
public static final String EVT_USER_CONSUME_CARD = "user_consume_card";
96100
public static final String EVT_USER_PAY_FROM_PAY_CELL = "user_pay_from_pay_cell";
@@ -101,7 +105,8 @@ public class WxConsts {
101105
public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
102106
public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
103107
public static final String EVT_POI_CHECK_NOTIFY = "poi_check_notify"; //门店审核事件推送
104-
public static final String EVN_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info"; //接收会员信息事件推送
108+
public static final String EVT_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info"; //接收会员信息事件推送
109+
105110
//以下为微信认证事件
106111
/**
107112
* 资质认证成功
@@ -185,7 +190,7 @@ public class WxConsts {
185190
* 跳转图文消息URL
186191
*/
187192
public static final String BUTTON_VIEW_LIMITED = "view_limited";
188-
193+
189194
/**
190195
* 不弹出授权页面，直接跳转，只能获取用户openid
191196
*/

‎weixin-java-cp/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>2.7.0-SNAPSHOT</version>
9+
<version>2.6.1.BETA</version>
1010
</parent>
1111

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

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
99
import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
1010
import me.chanjar.weixin.cp.api.WxCpConfigStorage;
11-
import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl;
1211

12+
import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl;
1313
import org.apache.http.HttpHost;
1414
import org.apache.http.client.config.RequestConfig;
1515
import org.apache.http.client.methods.CloseableHttpResponse;

weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java renamed to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java

File renamed without changes.

weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java renamed to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java

File renamed without changes.

‎weixin-java-mp/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>2.7.0-SNAPSHOT</version>
9+
<version>2.6.1.BETA</version>
1010
</parent>
1111
<artifactId>weixin-java-mp</artifactId>
1212
<name>WeiXin Java Tools - MP</name>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ public interface WxMpCardService {
1212

1313
/**
1414
* 得到WxMpService
15-
* @return
1615
*/
1716
WxMpService getWxMpService();
1817

1918
/**
2019
* 获得卡券api_ticket，不强制刷新卡券api_ticket
2120
*
2221
* @return 卡券api_ticket
23-
* @throws WxErrorException
2422
* @see #getCardApiTicket(boolean)
2523
*/
2624
String getCardApiTicket() throws WxErrorException;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ public WxMpCardServiceImpl(WxMpService wxMpService) {
3434
this.wxMpService = wxMpService;
3535
}
3636

37-
/**
38-
* 得到WxMpService
39-
* @return
40-
*/
4137
@Override
4238
public WxMpService getWxMpService(){
4339
return this.wxMpService;

0 commit comments

Comments
 (0)