From f967d739cf0d901815902231f26b359880278120 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Thu, 19 Sep 2019 19:33:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E6=A0=B8=E9=94=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java index 1bf61ffe39..57e3c3f316 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java @@ -348,7 +348,11 @@ public void cardSelfConsumeCellSet(String cardId, Boolean isOpen, param.addProperty("is_open", isOpen); param.addProperty("need_verify_cod", needVerifyCod); param.addProperty("need_remark_amount", needRemarkAmount); +<<<<<<< HEAD this.wxMpService.post(WxMpApiUrl.Card.CARD_SELF_CONSUME_CELL_SET, param.toString()); +======= + this.wxMpService.post(WxMpApiUrl.Card.CARD_PAYCELL_SET, param.toString()); +>>>>>>> :sparkles: 增加自助核销接口 } From 69d4104c8cb091531c75c1ba23adcb1433f5a577 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Thu, 19 Sep 2019 19:36:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java index 57e3c3f316..1bf61ffe39 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java @@ -348,11 +348,7 @@ public void cardSelfConsumeCellSet(String cardId, Boolean isOpen, param.addProperty("is_open", isOpen); param.addProperty("need_verify_cod", needVerifyCod); param.addProperty("need_remark_amount", needRemarkAmount); -<<<<<<< HEAD this.wxMpService.post(WxMpApiUrl.Card.CARD_SELF_CONSUME_CELL_SET, param.toString()); -======= - this.wxMpService.post(WxMpApiUrl.Card.CARD_PAYCELL_SET, param.toString()); ->>>>>>> :sparkles: 增加自助核销接口 } From 36bcab10d9c3274bb06da0697b2b03805a26003a Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Fri, 17 Jan 2020 11:48:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/bean/result/BaseWxPayResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index d58f20fb18..00b73a9c30 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -333,7 +333,7 @@ public void checkResult(WxPayService wxPayService, String signType, boolean chec //校验结果是否成功 if (checkSuccess) { - List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS, ""); + List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS); if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase()) || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) { StringBuilder errorMsg = new StringBuilder(); From a2855ac7254f446ff3f6a4dd934403db2df54fec Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Sun, 19 Jan 2020 11:15:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?:sparkles:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/bean/result/BaseWxPayResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index 00b73a9c30..d58f20fb18 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -333,7 +333,7 @@ public void checkResult(WxPayService wxPayService, String signType, boolean chec //校验结果是否成功 if (checkSuccess) { - List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS); + List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS, ""); if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase()) || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) { StringBuilder errorMsg = new StringBuilder(); From 47ae6958395ec41e605915ce0b0bed8cd6c8e115 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Tue, 3 Mar 2020 18:20:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?:sparkles:=20=E5=85=81=E8=AE=B8=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java index e57099e9d7..73b548c24f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java @@ -399,9 +399,6 @@ public void setMultiConfigStorages(Map configStorages @Override public void addConfigStorage(String mpId, WxMpConfigStorage configStorages) { synchronized (this) { - if (this.configStorageMap.containsKey(mpId)) { - throw new RuntimeException("该公众号标识已存在，请更换其他标识！"); - } this.configStorageMap.put(mpId, configStorages); } } From 591817daa5ce2e48a6da0b58543242fd21903247 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Wed, 4 Mar 2020 16:37:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=B6=88=E6=81=AF=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpMessageRouter.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java index 2571ebaa68..98ef7716f9 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java @@ -152,6 +152,13 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map context) { + return route(wxMessage, context, this.wxMpService.switchoverTo(appid)); + } + /** * 处理微信消息. */ @@ -228,6 +235,10 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) { return this.route(wxMessage, new HashMap(2)); } + public WxMpXmlOutMessage route(String appid, final WxMpXmlMessage wxMessage) { + return this.route(appid, wxMessage, new HashMap(2)); + } + private boolean isMsgDuplicated(WxMpXmlMessage wxMessage) { StringBuilder messageId = new StringBuilder(); if (wxMessage.getMsgId() == null) {