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
2025-12-22 00:48:00 +08:00 · 2017-05-08 21:36:07 +08:00
parent adcff4ec7a a47a0bb580
commit fcf3dbc12d
19 changed files with 331 additions and 229 deletions
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.github.binarywang</groupId>
    <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.0-SNAPSHOT</version>
+    <version>2.6.1.BETA</version>
  </parent>

  <artifactId>weixin-java-common</artifactId>
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -91,6 +91,10 @@ public class WxConsts {
  public static final String EVT_CARD_PASS_CHECK = "card_pass_check";
  public static final String EVT_CARD_NOT_PASS_CHECK = "card_not_pass_check";
  public static final String EVT_USER_GET_CARD = "user_get_card";
+  /**
+   * 卡券转赠事件
+   */
+  public static final String EVT_USER_GIFTING_CARD = "user_gifting_card";
  public static final String EVT_USER_DEL_CARD = "user_del_card";
  public static final String EVT_USER_CONSUME_CARD = "user_consume_card";
  public static final String EVT_USER_PAY_FROM_PAY_CELL = "user_pay_from_pay_cell";
@@ -101,7 +105,8 @@ public class WxConsts {
  public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
  public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
  public static final String EVT_POI_CHECK_NOTIFY = "poi_check_notify"; //门店审核事件推送
-  public static final String EVN_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info"; //接收会员信息事件推送
+  public static final String EVT_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info"; //接收会员信息事件推送
+
  //以下为微信认证事件
  /**
   * 资质认证成功
@@ -185,7 +190,7 @@ public class WxConsts {
   * 跳转图文消息URL
   */
  public static final String BUTTON_VIEW_LIMITED = "view_limited";
-  
+
  /**
   * 不弹出授权页面，直接跳转，只能获取用户openid
   */
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java
@@ -1,139 +0,0 @@
-package me.chanjar.weixin.cp.bean.article;
-
-/**
- * <pre>
- *  Created by BinaryWang on 2017/3/27.
- * </pre>
- * @author Binary Wang
- */
-public class MpnewsArticle {
-  private String title;
-  private String thumbMediaId;
-  private String author;
-  private String contentSourceUrl;
-  private String content;
-  private String digest;
-  private String showCoverPic;
-
-  private MpnewsArticle(Builder builder) {
-    setTitle(builder.title);
-    setThumbMediaId(builder.thumbMediaId);
-    setAuthor(builder.author);
-    setContentSourceUrl(builder.contentSourceUrl);
-    setContent(builder.content);
-    setDigest(builder.digest);
-    setShowCoverPic(builder.showCoverPic);
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public String getThumbMediaId() {
-    return thumbMediaId;
-  }
-
-  public void setThumbMediaId(String thumbMediaId) {
-    this.thumbMediaId = thumbMediaId;
-  }
-
-  public String getAuthor() {
-    return author;
-  }
-
-  public void setAuthor(String author) {
-    this.author = author;
-  }
-
-  public String getContentSourceUrl() {
-    return contentSourceUrl;
-  }
-
-  public void setContentSourceUrl(String contentSourceUrl) {
-    this.contentSourceUrl = contentSourceUrl;
-  }
-
-  public String getContent() {
-    return content;
-  }
-
-  public void setContent(String content) {
-    this.content = content;
-  }
-
-  public String getDigest() {
-    return digest;
-  }
-
-  public void setDigest(String digest) {
-    this.digest = digest;
-  }
-
-  public String getShowCoverPic() {
-    return showCoverPic;
-  }
-
-  public void setShowCoverPic(String showCoverPic) {
-    this.showCoverPic = showCoverPic;
-  }
-
-  public static final class Builder {
-    private String title;
-    private String thumbMediaId;
-    private String author;
-    private String contentSourceUrl;
-    private String content;
-    private String digest;
-    private String showCoverPic;
-
-    private Builder() {
-    }
-
-    public Builder title(String title) {
-      this.title = title;
-      return this;
-    }
-
-    public Builder thumbMediaId(String thumbMediaId) {
-      this.thumbMediaId = thumbMediaId;
-      return this;
-    }
-
-    public Builder author(String author) {
-      this.author = author;
-      return this;
-    }
-
-    public Builder contentSourceUrl(String contentSourceUrl) {
-      this.contentSourceUrl = contentSourceUrl;
-      return this;
-    }
-
-    public Builder content(String content) {
-      this.content = content;
-      return this;
-    }
-
-    public Builder digest(String digest) {
-      this.digest = digest;
-      return this;
-    }
-
-    public Builder showCoverPic(String showCoverPic) {
-      this.showCoverPic = showCoverPic;
-      return this;
-    }
-
-    public MpnewsArticle build() {
-      return new MpnewsArticle(this);
-    }
-  }
-}
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java
@@ -1,49 +0,0 @@
-package me.chanjar.weixin.cp.bean.article;
-
-/**
- * <pre>
- *  Created by BinaryWang on 2017/3/27.
- * </pre>
- *
- * @author Binary Wang
- */
-public class NewArticle {
-
-  private String title;
-  private String description;
-  private String url;
-  private String picUrl;
-
-  public String getTitle() {
-    return this.title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public String getDescription() {
-    return this.description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getUrl() {
-    return this.url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getPicUrl() {
-    return this.picUrl;
-  }
-
-  public void setPicUrl(String picUrl) {
-    this.picUrl = picUrl;
-  }
-
-}