From fcc01030d2cde7ebb921d76000a7b4feb248eb76 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 18 May 2019 15:38:14 +0800 Subject: [PATCH] =?UTF-8?q?#1031=20=E5=BE=AE=E4=BF=A1=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=A1=E5=AF=B9=E8=B1=A1=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=B7=B3=E8=BD=AC=E6=BF=80=E6=B4=BB=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=89=80=E9=9C=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cp/config/WxCpJedisConfigStorage.java | 11 ++------- .../weixin/mp/api/WxMpMemberCardService.java | 9 +++---- .../api/impl/WxMpMemberCardServiceImpl.java | 4 ++-- .../weixin/mp/bean/card/MemberCard.java | 24 ++++++++++++++----- .../mp/bean/card/MemberCardCreateRequest.java | 11 +++++++-- .../mp/bean/card/MemberCardUpdateRequest.java | 7 ++++++ 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java index 7f9fcf65..7c72de0e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java @@ -9,28 +9,21 @@ import redis.clients.jedis.JedisPoolConfig; import java.io.File; /** - * Jedis client implementor for wechat config storage. *
- *    使用说明:本实现仅供参考,并不完整,
+ *    使用说明:本实现仅供参考,并不完整.
  *    比如为减少项目依赖,未加入redis分布式锁的实现,如有需要请自行实现。
  * 
* * @author gaigeshen */ public class WxCpJedisConfigStorage implements WxCpConfigStorage { - - /** - * Redis keys here - */ private static final String ACCESS_TOKEN_KEY = "WX_CP_ACCESS_TOKEN"; private static final String ACCESS_TOKEN_EXPIRES_TIME_KEY = "WX_CP_ACCESS_TOKEN_EXPIRES_TIME"; private static final String JS_API_TICKET_KEY = "WX_CP_JS_API_TICKET"; private static final String JS_API_TICKET_EXPIRES_TIME_KEY = "WX_CP_JS_API_TICKET_EXPIRES_TIME"; private static final String AGENT_JSAPI_TICKET_KEY = "WX_CP_AGENT_%s_JSAPI_TICKET"; private static final String AGENT_JSAPI_TICKET_EXPIRES_TIME_KEY = "WX_CP_AGENT_%s_JSAPI_TICKET_EXPIRES_TIME"; - /** - * Redis clients pool - */ + private final JedisPool jedisPool; private volatile String corpId; private volatile String corpSecret; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java index ba79d785..37785365 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java @@ -17,14 +17,14 @@ import me.chanjar.weixin.mp.bean.membercard.*; * @date 2018-08-30 */ public interface WxMpMemberCardService { - String MEMBER_CARD_CREAET = "https://api.weixin.qq.com/card/create"; + String MEMBER_CARD_CREATE = "https://api.weixin.qq.com/card/create"; String MEMBER_CARD_ACTIVATE = "https://api.weixin.qq.com/card/membercard/activate"; String MEMBER_CARD_USER_INFO_GET = "https://api.weixin.qq.com/card/membercard/userinfo/get"; String MEMBER_CARD_UPDATE_USER = "https://api.weixin.qq.com/card/membercard/updateuser"; /** * 会员卡激活之微信开卡接口(wx_activate=true情况调用). */ - String MEMBER_CARD_ACTIVATEUSERFORM = "https://api.weixin.qq.com/card/membercard/activateuserform/set"; + String MEMBER_CARD_ACTIVATE_USER_FORM = "https://api.weixin.qq.com/card/membercard/activateuserform/set"; /** * 获取会员卡开卡插件参数. @@ -37,7 +37,8 @@ public interface WxMpMemberCardService { String MEMBER_CARD_UPDATE = "https://api.weixin.qq.com/card/update"; /** - * 跳转型会员卡开卡字段,获取用户提交资料(wx_activate=true情况调用),开发者根据activate_ticket获取到用户填写的信息 + * 跳转型会员卡开卡字段. + * 获取用户提交资料(wx_activate=true情况调用),开发者根据activate_ticket获取到用户填写的信息 */ String MEMBER_CARD_ACTIVATE_TEMP_INFO = "https://api.weixin.qq.com/card/membercard/activatetempinfo/get"; @@ -127,7 +128,7 @@ public interface WxMpMemberCardService { CardUpdateResult updateCardInfo(MemberCardUpdateRequest memberCardUpdateRequest) throws WxErrorException; /** - * 解析跳转型开卡字段用户提交的资料 + * 解析跳转型开卡字段用户提交的资料. * 开发者在URL上截取ticket后须先进行urldecode * * @param activateTicket 用户提交的资料 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java index 6e4143ba..3eaf6141 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java @@ -70,7 +70,7 @@ public class WxMpMemberCardServiceImpl implements WxMpMemberCardService { return validResult; } - String response = this.wxMpService.post(MEMBER_CARD_CREAET, GSON.toJson(createMessageMessage)); + String response = this.wxMpService.post(MEMBER_CARD_CREATE, GSON.toJson(createMessageMessage)); return WxMpCardCreateResult.fromJson(response); } @@ -243,7 +243,7 @@ public class WxMpMemberCardServiceImpl implements WxMpMemberCardService { @Override public MemberCardActivateUserFormResult setActivateUserForm(MemberCardActivateUserFormRequest userFormRequest) throws WxErrorException { - String responseContent = this.getWxMpService().post(MEMBER_CARD_ACTIVATEUSERFORM, GSON.toJson(userFormRequest)); + String responseContent = this.getWxMpService().post(MEMBER_CARD_ACTIVATE_USER_FORM, GSON.toJson(userFormRequest)); return MemberCardActivateUserFormResult.fromJson(responseContent); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java index b8b81399..a6caf1bb 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java @@ -38,12 +38,6 @@ public final class MemberCard implements Serializable { @SerializedName("auto_activate") private boolean autoActivate; - /** - * 是否一键开卡. - */ - @SerializedName("wx_activate") - private boolean wxActivate; - /** * 显示积分. */ @@ -145,6 +139,24 @@ public final class MemberCard implements Serializable { @SerializedName("advanced_info") private AdvancedInfo advancedInfo; + /** + * 是否支持一键激活 ,填true或false. + */ + @SerializedName("wx_activate") + private boolean wxActivate; + + /** + * 是否支持跳转型一键激活,填true或false. + */ + @SerializedName("wx_activate_after_submit") + private boolean wxActivateAfterSubmit; + + /** + * 跳转型一键激活跳转的地址链接,请填写http:// 或者https://开头的链接. + */ + @SerializedName("wx_activate_after_submit_url") + private String wxActivateAfterSubmitUrl; + @Override public String toString() { return WxMpGsonBuilder.create().toJson(this); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java index b15cf225..5abdf733 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java @@ -1,13 +1,20 @@ package me.chanjar.weixin.mp.bean.card; -import java.io.Serializable; - import com.google.gson.annotations.SerializedName; import lombok.Data; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; +import java.io.Serializable; + +/** + * 创建会员卡请求对象. + * + * @author yuanqixun + */ @Data public class MemberCardCreateRequest implements Serializable { + private static final long serialVersionUID = -1044836608401698097L; + @SerializedName("card_type") private String cardType = "MEMBER_CARD"; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java index 37807a06..8c1f8535 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java @@ -6,8 +6,15 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; +/** + * 更新会员卡请求对象. + * + * @author yuanqixun + */ @Data public class MemberCardUpdateRequest implements Serializable { + private static final long serialVersionUID = -1025759626161614466L; + @SerializedName("card_id") private String cardId;