- * 字段名：商户订单号
- * 变量名：out_trade_no
+ * 字段名：商户退款单号
+ * 变量名：out_refund_no
* 是否必填：是
- * 类型：string[1,32]
- * 描述：
- * 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一。
- * 特殊规则：最小字符长度为6
- * 示例值：1217752501201407033233368018
+ * 类型：string[1, 64]
+ * 描述：商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+ * 示例值：1217752501201407033233368018
*
*/
- @SerializedName(value = "out_trade_no")
- private String outTradeNo;
+ @SerializedName(value = "out_refund_no")
+ private String outRefundNo;
}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 9b42bd75be..73dad0c9d2 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -697,11 +697,11 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
* 接口链接：https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/{out_refund_no}
*
*
- * @param outTradeNo 商户订单号
+ * @param outRefundNo 商户退款单号
* @return 退款信息 wx pay refund query result
* @throws WxPayException the wx pay exception
*/
- WxPayRefundQueryV3Result refundQueryV3(String outTradeNo) throws WxPayException;
+ WxPayRefundQueryV3Result refundQueryV3(String outRefundNo) throws WxPayException;
/**
*
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index a80a7f4527..e5ef0be8be 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -305,15 +305,15 @@ public WxPayRefundQueryResult refundQueryV2(WxPayRefundQueryRequest request) thr
}
@Override
- public WxPayRefundQueryV3Result refundQueryV3(String outTradeNo) throws WxPayException {
- String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), outTradeNo);
+ public WxPayRefundQueryV3Result refundQueryV3(String outRefundNo) throws WxPayException {
+ String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), outRefundNo);
String response = this.getV3(url);
return GSON.fromJson(response, WxPayRefundQueryV3Result.class);
}
@Override
public WxPayRefundQueryV3Result refundQueryV3(WxPayRefundQueryV3Request request) throws WxPayException {
- String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), request.getOutTradeNo());
+ String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), request.getOutRefundNo());
String response = this.getV3(url);
return GSON.fromJson(response, WxPayRefundQueryV3Result.class);
}
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index e984b334fc..920d917ffc 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -769,8 +769,8 @@ public void testRefundV3() throws WxPayException {
@Test
public void testRefundQueryV3() throws WxPayException {
WxPayRefundQueryV3Request request = new WxPayRefundQueryV3Request();
-// request.setOutTradeNo("n1ZvYqjAg3D7LUBa");
- request.setOutTradeNo("123456789011");
+// request.setOutRefundNo("n1ZvYqjAg3D7LUBa");
+ request.setOutRefundNo("123456789011");
WxPayRefundQueryV3Result result = this.payService.refundQueryV3(request);
System.out.println(GSON.toJson(result));
}
From abbfc85e24b16334426d13f114fab7b5c78cd786 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Tue, 21 Sep 2021 17:07:10 +0800
Subject: [PATCH 0004/1079] Update README.md
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 8f0a4f95b6..e8636426c8 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@
- 1. 驰骋快速开发平台、工作流引擎、表单引擎采用GPL协议.
-2. 驰骋.net版称为ccflow, java版称为jflow,代码100%开源.
-3. 支持10多个国内外数据库. 单机版\集团版\SAAS版本.
+
1. 驰骋快速开发平台、工作流/表单引擎采用GPL协议。
+
2. 驰骋.NET版称为ccflow,Java版称为jflow，代码100%开源。
+
3. 支持10多个国内外数据库，有单机版\集团版\SAAS版本。
From b45c626e8299c9992270382cd90baf2a4b517cd5 Mon Sep 17 00:00:00 2001
From: yearliny
Date: Sat, 25 Sep 2021 23:05:28 +0800
Subject: [PATCH 0005/1079] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=9F=90?=
=?UTF-8?q?=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E4=BC=9A=E6=8A=9B=E5=87=BA?=
=?UTF-8?q?CannotResolveClassException=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
https://stackoverflow.com/questions/9508292/nodecom-thoughtworks-xstream-mapper-cannotresolveclassexception-while-using-xstr
---
.../com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java | 1 +
1 file changed, 1 insertion(+)
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 9f6f5e2700..6f66dfdd86 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
@@ -150,6 +150,7 @@ public static T fromXML(String xmlString, Class c
}
XStream xstream = XStreamInitializer.getInstance();
xstream.processAnnotations(clz);
+ xstream.setClassLoader(BaseWxPayResult.class.getClassLoader());
T result = (T) xstream.fromXML(xmlString);
result.setXmlString(xmlString);
return result;
From cecdace1c59d28eaccecd15ae99801af305df6e0 Mon Sep 17 00:00:00 2001
From: nickname263
Date: Sat, 25 Sep 2021 23:06:19 +0800
Subject: [PATCH 0006/1079] =?UTF-8?q?:new:=20#2324=E3=80=90=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E3=80=91=E6=B7=BB=E5=8A=A0=E5=AF=B9?=
=?UTF-8?q?=E6=96=B0=E7=9A=84=E6=A8=A1=E7=89=88=E5=8D=A1=E7=89=87=E6=B6=88?=
=?UTF-8?q?=E6=81=AF=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chanjar/weixin/common/api/WxConsts.java | 31 ++
.../weixin/cp/bean/message/WxCpMessage.java | 281 ++++++++++++++++
.../messagebuilder/TemplateCardBuilder.java | 300 ++++++++++++++++++
.../cp/bean/templatecard/CheckboxOption.java | 49 +++
.../bean/templatecard/HorizontalContent.java | 66 ++++
.../cp/bean/templatecard/MultipleSelect.java | 68 ++++
.../bean/templatecard/TemplateCardButton.java | 49 +++
.../bean/templatecard/TemplateCardJump.java | 65 ++++
.../cp/bean/templatecard/VerticalContent.java | 44 +++
.../cp/bean/message/WxCpMessageTest.java | 283 +++++++++++++++++
10 files changed, 1236 insertions(+)
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TemplateCardBuilder.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/CheckboxOption.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/HorizontalContent.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/MultipleSelect.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardButton.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardJump.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/VerticalContent.java
diff --git 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
index 3e08462017..c1e6d39910 100644
--- 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
@@ -120,6 +120,37 @@ public static class KefuMsgType {
* 小程序通知消息.
*/
public static final String MINIPROGRAM_NOTICE = "miniprogram_notice";
+
+ /**
+ * 模板卡片消息.
+ */
+ public static final String TEMPLATE_CARD = "template_card";
+ }
+
+ /**
+ * 企业微信模板卡片消息的卡片类型
+ */
+ public static class TemplateCardType {
+ /**
+ * 文本通知型卡片
+ */
+ public static final String TEXT_NOTICE = "text_notice";
+ /**
+ * 图文展示型卡片
+ */
+ public static final String NEWS_NOTICE = "news_notice";
+ /**
+ * 按钮交互型卡片
+ */
+ public static final String BUTTON_INTERACTION = "button_interaction";
+ /**
+ * 投票选择型卡片
+ */
+ public static final String VOTE_INTERACTION = "vote_interaction";
+ /**
+ * 多项选择型卡片
+ */
+ public static final String MULTIPLE_INTERACTION = "multiple_interaction";
}
/**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
index 244e7fed07..a2f6e6c5c6 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
@@ -8,6 +8,7 @@
import me.chanjar.weixin.cp.bean.article.NewArticle;
import me.chanjar.weixin.cp.bean.messagebuilder.*;
import me.chanjar.weixin.cp.bean.taskcard.TaskCardButton;
+import me.chanjar.weixin.cp.bean.templatecard.*;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
@@ -70,6 +71,134 @@ public class WxCpMessage implements Serializable {
private String taskId;
private List taskButtons = new ArrayList<>();
+ /**
+ * 模板型卡片特有属性
+ */
+ /**
+ * 模板卡片类型，文本通知型卡片填写 “text_notice”,
+ * 图文展示型卡片此处填写 “news_notice”,
+ * 按钮交互型卡片填写”button_interaction”,
+ * 投票选择型卡片填写”vote_interaction”,
+ * 多项选择型卡片填写 “multiple_interaction”
+ */
+ private String card_type;
+
+ /**
+ * 卡片来源样式信息，不需要来源样式可不填写
+ * 来源图片的url
+ */
+ private String source_icon_url;
+ /**
+ * 卡片来源样式信息，不需要来源样式可不填写
+ * 来源图片的描述，建议不超过20个字
+ */
+ private String source_desc;
+
+ /**
+ * 一级标题，建议不超过36个字
+ */
+ private String main_title_title;
+ /**
+ * 标题辅助信息，建议不超过44个字
+ */
+ private String main_title_desc;
+
+ /**
+ * 图文展示型的卡片必须有图片字段。
+ * 图片的url.
+ */
+ private String card_image_url;
+
+ /**
+ * 图片的宽高比，宽高比要小于2.25，大于1.3，不填该参数默认1.3
+ */
+ private Float card_image_aspect_ratio;
+ /**
+ * 关键数据样式
+ * 关键数据样式的数据内容，建议不超过14个字
+ */
+ private String emphasis_content_title;
+ /**
+ * 关键数据样式的数据描述内容，建议不超过22个字
+ */
+ private String emphasis_content_desc;
+
+ /**
+ * 二级普通文本，建议不超过160个字
+ */
+ private String sub_title_text;
+
+ /**
+ * 卡片二级垂直内容，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过4
+ */
+ private List vertical_contents;
+
+ /**
+ * 二级标题+文本列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过6
+ */
+ private List horizontal_contents;
+
+ /**
+ * 跳转指引样式的列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过3
+ */
+ private List jumps;
+
+ /**
+ * 整体卡片的点击跳转事件，text_notice必填本字段
+ * 跳转事件类型，1 代表跳转url，2 代表打开小程序。text_notice卡片模版中该字段取值范围为[1,2]
+ */
+ private Integer card_action_type;
+ /**
+ * 跳转事件的url，card_action.type是1时必填
+ */
+ private String card_action_url;
+
+ /**
+ * 跳转事件的小程序的appid，必须是与当前应用关联的小程序，card_action.type是2时必填
+ */
+ private String card_action_appid;
+
+ /**
+ * 跳转事件的小程序的pagepath，card_action.type是2时选填
+ */
+ private String card_action_pagepath;
+
+ /**
+ * 按钮交互型卡片需指定。
+ * 按钮列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过6
+ */
+ private List buttons;
+
+ /**
+ * 投票选择型卡片需要指定
+ * 选择题key值，用户提交选项后，会产生回调事件，回调事件会带上该key值表示该题，最长支持1024字节
+ */
+ private String checkbox_question_key;
+
+ /**
+ * 选择题模式，单选：0，多选：1，不填默认0
+ */
+ private Integer checkbox_mode;
+
+ /**
+ * 选项list，选项个数不超过 20 个，最少1个
+ */
+ private List options;
+
+ /**
+ * 提交按钮样式
+ * 按钮文案，建议不超过10个字，不填默认为提交
+ */
+ private String submit_button_text;
+ /**
+ * 提交按钮的key，会产生回调事件将本参数作为EventKey返回，最长支持1024字节
+ */
+ private String submit_button_key;
+ /**
+ * 下拉式的选择器列表，multiple_interaction类型的卡片该字段不可为空，一个消息最多支持 3 个选择器
+ */
+ private List selects;
+
/**
* 获得文本消息builder.
*/
@@ -140,6 +269,13 @@ public static TaskCardBuilder TASKCARD() {
return new TaskCardBuilder();
}
+ /**
+ * 获得任务卡片消息builder.
+ */
+ public static TemplateCardBuilder TEMPLATECARD() {
+ return new TemplateCardBuilder();
+ }
+
/**
* 获得小程序通知消息builder.
*/
@@ -160,6 +296,7 @@ public static MiniProgramNoticeMsgBuilder newMiniProgramNoticeBuilder() {
* {@link KefuMsgType#MARKDOWN}
* {@link KefuMsgType#TASKCARD}
* {@link KefuMsgType#MINIPROGRAM_NOTICE}
+ * {@link KefuMsgType#TEMPLATE_CARD}
*
*
* @param msgType 消息类型
@@ -328,6 +465,150 @@ private void handleMsgType(JsonObject messageJson) {
messageJson.add("miniprogram_notice", notice);
break;
}
+ case TEMPLATE_CARD: {
+ JsonObject template = new JsonObject();
+ template.addProperty("card_type", this.getCard_type());
+
+ if (StringUtils.isNotBlank(this.getSource_icon_url()) || StringUtils.isNotBlank(this.getSource_desc())) {
+ JsonObject source = new JsonObject();
+ if (StringUtils.isNotBlank(this.getSource_icon_url())) {
+ source.addProperty("icon_url", this.getSource_icon_url());
+ }
+ if (StringUtils.isNotBlank(this.getSource_desc())) {
+ source.addProperty("desc", this.getSource_desc());
+ }
+ template.add("source", source);
+ }
+
+ if (StringUtils.isNotBlank(this.getMain_title_title()) || StringUtils.isNotBlank(this.getMain_title_desc())) {
+ JsonObject main_title = new JsonObject();
+ if (StringUtils.isNotBlank(this.getMain_title_title())) {
+ main_title.addProperty("title", this.getMain_title_title());
+ }
+ if (StringUtils.isNotBlank(this.getMain_title_desc())) {
+ main_title.addProperty("desc", this.getMain_title_desc());
+ }
+ template.add("main_title", main_title);
+ }
+
+ if (StringUtils.isNotBlank(this.getEmphasis_content_title()) || StringUtils.isNotBlank(this.getEmphasis_content_desc())) {
+ JsonObject emphasis_content = new JsonObject();
+ if (StringUtils.isNotBlank(this.getEmphasis_content_title())) {
+ emphasis_content.addProperty("title", this.getEmphasis_content_title());
+ }
+ if (StringUtils.isNotBlank(this.getEmphasis_content_desc())) {
+ emphasis_content.addProperty("desc", this.getEmphasis_content_desc());
+ }
+ template.add("emphasis_content", emphasis_content);
+ }
+
+
+ if (StringUtils.isNotBlank(this.getSub_title_text())) {
+ template.addProperty("sub_title_text", this.getSub_title_text());
+ }
+
+ if (StringUtils.isNotBlank(this.getTaskId())) {
+ template.addProperty("task_id", this.getTaskId());
+ }
+
+ List+ * 模板卡片消息Builder + * 用法: WxCustomMessage m = WxCustomMessage.TEMPLATECARD().title(...)....toUser(...).build(); + *+ * + * @author yzts + * @date 2019-05-16 + */ +public class TemplateCardBuilder extends BaseBuilder
+ * 生效时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss.sss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.sss表示时分秒毫秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35.120+08:00表示，北京时间2015年5月20日 13点29分35秒。 + * 示例值：2015-05-20T13:29:35.120+08:00 + */ + @SerializedName("pause_time") + private String pauseTime; + + /** + * 批次号 + *
+ * 微信为每个代金券批次分配的唯一ID。 + * 示例值：98065001 + */ + @SerializedName("stock_id") + private String stockId; +} diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksRestartResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksRestartResult.java new file mode 100755 index 0000000000..b9078bca59 --- /dev/null +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksRestartResult.java @@ -0,0 +1,37 @@ +package com.github.binarywang.wxpay.bean.marketing; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 重启代金券批次返回结果对象 + * + * @author lichuang + */ +@NoArgsConstructor +@Data +public class FavorStocksRestartResult implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 生效时间 + *
+ * 生效时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss.sss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.sss表示时分秒毫秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35.120+08:00表示，北京时间2015年5月20日 13点29分35秒。 + * 示例值：2015-05-20T13:29:35.120+08:00 + */ + @SerializedName("restart_time") + private String restartTime; + + /** + * 批次号 + *
+ * 微信为每个代金券批次分配的唯一ID。 + * 示例值：98065001 + */ + @SerializedName("stock_id") + private String stockId; +} diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java index 5da11aabf3..ac0ed5212f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java @@ -187,10 +187,10 @@ public interface MarketingFavorService { * * * @param request 请求对象 - * @return FavorCallbacksSaveResult 微信返回的结果信息。 + * @return FavorStocksPauseResult 微信返回的结果信息。 * @throws WxPayException the wx pay exception */ - FavorStocksStartResult pauseFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException; + FavorStocksPauseResult pauseFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException; /** *
@@ -200,10 +200,10 @@ public interface MarketingFavorService {
*
*
* @param request 请求对象
- * @return FavorCallbacksSaveResult 微信返回的结果信息。
+ * @return FavorStocksRestartResult 微信返回的结果信息。
* @throws WxPayException the wx pay exception
*/
- FavorStocksStartResult restartFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException;
+ FavorStocksRestartResult restartFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException;
UseNotifyData parseNotifyData(String data, SignatureHeader header) throws WxPayException;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java
index 5923d0e106..a10bbbb085 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java
@@ -154,19 +154,19 @@ public FavorCallbacksSaveResult saveFavorCallbacksV3(FavorCallbacksSaveRequest r
}
@Override
- public FavorStocksStartResult pauseFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException {
- String url = String.format("%s/v3/marketing/favor/stocks/%s/start", this.payService.getPayBaseUrl(), stockId);
+ public FavorStocksPauseResult pauseFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException {
+ String url = String.format("%s/v3/marketing/favor/stocks/%s/pause", this.payService.getPayBaseUrl(), stockId);
RsaCryptoUtil.encryptFields(request, this.payService.getConfig().getVerifier().getValidCertificate());
String result = this.payService.postV3WithWechatpaySerial(url, GSON.toJson(request));
- return GSON.fromJson(result, FavorStocksStartResult.class);
+ return GSON.fromJson(result, FavorStocksPauseResult.class);
}
@Override
- public FavorStocksStartResult restartFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException {
- String url = String.format("%s/v3/marketing/favor/stocks/%s/start", this.payService.getPayBaseUrl(), stockId);
+ public FavorStocksRestartResult restartFavorStocksV3(String stockId, FavorStocksSetRequest request) throws WxPayException {
+ String url = String.format("%s/v3/marketing/favor/stocks/%s/restart", this.payService.getPayBaseUrl(), stockId);
RsaCryptoUtil.encryptFields(request, this.payService.getConfig().getVerifier().getValidCertificate());
String result = this.payService.postV3WithWechatpaySerial(url, GSON.toJson(request));
- return GSON.fromJson(result, FavorStocksStartResult.class);
+ return GSON.fromJson(result, FavorStocksRestartResult.class);
}
/**
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImplTest.java
index 48fdf8c8e5..7a532d6bdb 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImplTest.java
@@ -175,7 +175,7 @@ public void testSaveFavorCallbacksV3() throws WxPayException {
public void testPauseFavorStocksV3() throws WxPayException {
FavorStocksSetRequest request = new FavorStocksSetRequest();
request.setStockCreatorMchid(wxPayService.getConfig().getMchId());
- FavorStocksStartResult result = wxPayService.getMarketingFavorService().pauseFavorStocksV3(stockId, request);
+ FavorStocksPauseResult result = wxPayService.getMarketingFavorService().pauseFavorStocksV3(stockId, request);
log.info("result: {}", GSON.toJson(result));
}
@@ -184,7 +184,7 @@ public void testPauseFavorStocksV3() throws WxPayException {
public void testRestartFavorStocksV3() throws WxPayException {
FavorStocksSetRequest request = new FavorStocksSetRequest();
request.setStockCreatorMchid(wxPayService.getConfig().getMchId());
- FavorStocksStartResult result = wxPayService.getMarketingFavorService().restartFavorStocksV3(stockId, request);
+ FavorStocksRestartResult result = wxPayService.getMarketingFavorService().restartFavorStocksV3(stockId, request);
log.info("result: {}", GSON.toJson(result));
}
From a5c141f7bebf65894ae64803d94c561de83da69a Mon Sep 17 00:00:00 2001
From: ArBing + * 创建调用wx.agentConfig时所需要的签名 + * + * 详情请见：https://open.work.weixin.qq.com/api/doc/90000/90136/94313 + *+ * + * @param url url + * @return the agent jsapi signature + * @throws WxErrorException + */ + WxCpAgentJsapiSignature createAgentJsapiSignature(String url) throws WxErrorException; /** * 小程序登录凭证校验 diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java index 0a06571c97..89221f1a1e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java @@ -20,6 +20,7 @@ import me.chanjar.weixin.common.util.http.*; import me.chanjar.weixin.common.util.json.GsonParser; import me.chanjar.weixin.cp.api.*; +import me.chanjar.weixin.cp.bean.WxCpAgentJsapiSignature; import me.chanjar.weixin.cp.bean.WxCpMaJsCode2SessionResult; import me.chanjar.weixin.cp.bean.WxCpProviderToken; import me.chanjar.weixin.cp.config.WxCpConfigStorage; @@ -171,6 +172,30 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException return jsapiSignature; } + @Override + public WxCpAgentJsapiSignature createAgentJsapiSignature(String url) throws WxErrorException { + long timestamp = System.currentTimeMillis() / 1000; + String noncestr = RandomUtils.getRandomStr(); + String jsapiTicket = getAgentJsapiTicket(false); + String signature = SHA1.genWithAmple( + "jsapi_ticket=" + jsapiTicket, + "noncestr=" + noncestr, + "timestamp=" + timestamp, + "url=" + url + ); + + WxCpAgentJsapiSignature jsapiSignature = new WxCpAgentJsapiSignature(); + jsapiSignature.setTimestamp(timestamp); + jsapiSignature.setNonceStr(noncestr); + jsapiSignature.setUrl(url); + jsapiSignature.setSignature(signature); + + jsapiSignature.setCorpid(this.configStorage.getCorpId()); + jsapiSignature.setAgentid(this.configStorage.getAgentId()); + + return jsapiSignature; + } + @Override public WxCpMaJsCode2SessionResult jsCode2Session(String jsCode) throws WxErrorException { Map
* 是否必填：是
*
*/
- @SerializedName("pay_method")
- private String payMethod;
+ @SerializedName("pay_method_type")
+ private Integer payMethodType;
/**
* 预支付ID
From f4c18d7eb80f6bb4a74406fa9c9b948b55d7293f Mon Sep 17 00:00:00 2001
From: Binary Wang + * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/add?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Add_draft.html + *+ * + * @param title 标题 + * @param content 图文消息的具体内容，支持HTML标签，必须少于2万字符，小于1M，且此处会去除JS,涉及图片url必须来源 "上传图文消息内的图片获取URL"接口获取。外部图片url将被过滤。 + * @param thumbMediaId 图文消息的封面图片素材id（必须是永久MediaID） + * @throws WxErrorException . + */ + String addDraft(String title, String content, String thumbMediaId) throws WxErrorException; + + /** + * 新建草稿 - 完整参数 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/add?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Add_draft.html + *+ * + * @param addDraft 新建草稿信息 + * @throws WxErrorException . + */ + String addDraft(WxMpAddDraft addDraft) throws WxErrorException; + + /** + * 修改草稿 - 完整参数 + * 正常情况下调用成功时，errcode将为0。错误时微信会返回错误码等信息，请根据错误码查询错误信息 + *
+ * 请求地址： POST https://api.weixin.qq.com/cgi-bin/draft/update?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Update_draft.html + *+ * + * @param updateDraftInfo 修改草稿信息 + * @throws WxErrorException . + */ + Boolean updateDraft(WxMpUpdateDraft updateDraftInfo) throws WxErrorException; + + /** + * 获取草稿信息 + * + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/get?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Get_draft.html + *+ * + * @param mediaId 要获取的草稿的media_id + * @return 草稿信息 + * @throws WxErrorException . + */ + WxMpDraftInfo getDraft(String mediaId) throws WxErrorException; + + /** + * 删除草稿 + * 正常情况下调用成功时，errcode将为0。错误时微信会返回错误码等信息，请根据错误码查询错误信息。 + * 多次删除同一篇草稿，也返回 0. + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/delete?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Delete_draft.html + *+ * + * @param mediaId 要删除的草稿的media_id + * @throws WxErrorException . + */ + Boolean delDraft(String mediaId) throws WxErrorException; + + /** + * 获取草稿列表 + * + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/batchget?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Get_draft_list.html + *+ * + * @param offset 分页页数，从0开始 从全部素材的该偏移位置开始返回，0表示从第一个素材返回 + * @param count 每页数量 返回素材的数量，取值在1到20之间 + * @param noContent 1 表示不返回 content 字段，0 表示正常返回，默认为 0 + * @return 草稿信息列表 + * @throws WxErrorException . + */ + WxMpDraftList listDraft(int offset, int count, int noContent) throws WxErrorException; + + /** + * 获取草稿列表 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/batchget?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Get_draft_list.html + *+ * + * @param offset 分页页数，从0开始 从全部素材的该偏移位置开始返回，0表示从第一个素材返回 + * @param count 每页数量 返回素材的数量，取值在1到20之间 + * @return + * @throws WxErrorException + */ + WxMpDraftList listDraft(int offset, int count) throws WxErrorException; + + /** + * 获取草稿数量 + * 开发者可以根据本接口来获取草稿的总数。此接口只统计数量，不返回草稿的具体内容。 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/count?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Count_drafts.html + *+ * + * @return 草稿的总数 + * @throws WxErrorException . + */ + Long countDraft() throws WxErrorException; + +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpFreePublishService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpFreePublishService.java new file mode 100644 index 0000000000..c695942790 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpFreePublishService.java @@ -0,0 +1,113 @@ +package me.chanjar.weixin.mp.api; + +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishInfo; +import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishList; +import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishStatus; + +/** + * 微信 发布能力 接口. + * + * @author dragon + * @date 2021-10-23 + */ +public interface WxMpFreePublishService { + + /** + * 发布接口 - 只有默认必填参数 + * 开发者需要先将图文素材以草稿的形式保存（见“草稿箱/新建草稿”，如需从已保存的草稿中选择，见“草稿箱/获取草稿列表”），选择要发布的草稿 media_id 进行发布 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/freepublish/submit?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Publish.html + *+ * + * @param mediaId 要发布的草稿的media_id + * @throws WxErrorException . + */ + String submit(String mediaId) throws WxErrorException; + + /** + * 发布状态轮询接口 + * 开发者可以尝试通过下面的发布状态轮询接口获知发布情况。 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/freepublish/get?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Get_status.html + *+ * + * @param publishId 发布任务id + * @throws WxErrorException . + */ + WxMpFreePublishStatus getPushStatus(String publishId) throws WxErrorException; + + /** + * 删除发布 + * 发布成功之后，随时可以通过该接口删除。此操作不可逆，请谨慎操作。 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/freepublish/delete?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Delete_posts.html + *+ * + * @param articleId 成功发布时返回的 article_id + * @param index 要删除的文章在图文消息中的位置，第一篇编号为1，该字段不填或填0会删除全部文章 + * @throws WxErrorException . + */ + Boolean deletePush(String articleId, Integer index) throws WxErrorException; + + /** + * 删除发布 - 此条发布的所有内容，不指定文章编号 + * 发布成功之后，随时可以通过该接口删除。此操作不可逆，请谨慎操作。 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/freepublish/delete?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Delete_posts.html + *+ * + * @param articleId 成功发布时返回的 article_id + * @throws WxErrorException . + */ + Boolean deletePushAllArticle(String articleId) throws WxErrorException; + + /** + * 通过 article_id 获取已发布文章 + * 开发者可以通过 article_id 获取已发布的图文信息。 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/freepublish/getarticle?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Get_article_from_id.html + *+ * + * @param articleId 要获取的草稿的article_id + * @return 已发布文章信息 + * @throws WxErrorException . + */ + WxMpFreePublishInfo getArticleFromId(String articleId) throws WxErrorException; + + /** + * 获取成功发布列表 - 支持选择是否返回：图文消息的具体内容 + * + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/batchget?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Get_publication_records.html + *+ * + * @param offset 分页页数，从0开始 从全部素材的该偏移位置开始返回，0表示从第一个素材返回 + * @param count 每页数量 返回素材的数量，取值在1到20之间 + * @param noContent 1 表示不返回 content 字段，0 表示正常返回，默认为 0 + * @return 草稿信息列表 + * @throws WxErrorException . + */ + WxMpFreePublishList getPublicationRecords(int offset, int count, int noContent) throws WxErrorException; + + /** + * 获取成功发布列表 - 默认返回 图文消息的具体内容 + *
+ * 请求地址：POST https://api.weixin.qq.com/cgi-bin/draft/batchget?access_token=ACCESS_TOKEN + * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Publish/Get_publication_records.html + *+ * + * @param offset 分页页数，从0开始 从全部素材的该偏移位置开始返回，0表示从第一个素材返回 + * @param count 每页数量 返回素材的数量，取值在1到20之间 + * @return + * @throws WxErrorException + */ + WxMpFreePublishList getPublicationRecords(int offset, int count) throws WxErrorException; + +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java index 6b6e30b7f3..fbe9e2d43a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java @@ -567,6 +567,20 @@ public interface WxMpService extends WxService { */ WxMpReimburseInvoiceService getReimburseInvoiceService(); + /** + * 返回草稿箱相关接口 + * + * @return WxMpDraftService + */ + WxMpDraftService getDraftService(); + + /** + * 返回发布能力接口 + * + * @return WxMpFreePublishService + */ + WxMpFreePublishService getFreePublishService(); + /** * . * @@ -818,4 +832,18 @@ public interface WxMpService extends WxService { * @param merchantInvoiceService the merchant invoice service */ void setMerchantInvoiceService(WxMpMerchantInvoiceService merchantInvoiceService); + + /** + * Sets draft service. + * + * @param draftService the draft service + */ + void setDraftService(WxMpDraftService draftService); + + /** + * Sets free publish service. + * + * @param freePublishService the free publish service + */ + void setFreePublishService(WxMpFreePublishService freePublishService); } 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 2b8d9bfd39..d11499bd4f 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 @@ -25,7 +25,11 @@ import me.chanjar.weixin.common.util.DataUtils; import me.chanjar.weixin.common.util.RandomUtils; import me.chanjar.weixin.common.util.crypto.SHA1; -import me.chanjar.weixin.common.util.http.*; +import me.chanjar.weixin.common.util.http.RequestExecutor; +import me.chanjar.weixin.common.util.http.RequestHttp; +import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor; +import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor; +import me.chanjar.weixin.common.util.http.URIUtil; import me.chanjar.weixin.common.util.json.GsonParser; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import me.chanjar.weixin.mp.api.*; @@ -42,7 +46,16 @@ import java.util.Map; import java.util.concurrent.locks.Lock; -import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.*; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.CLEAR_QUOTA_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.FETCH_SHORTEN_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.GEN_SHORTEN_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.GET_CALLBACK_IP_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.GET_CURRENT_AUTOREPLY_INFO_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.GET_TICKET_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.NETCHECK_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.QRCONNECT_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.SEMANTIC_SEMPROXY_SEARCH_URL; +import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.SHORTURL_API_URL; /** * 基础实现类. @@ -146,6 +159,14 @@ public abstract class BaseWxMpServiceImpl
@@ -1374,6 +1377,90 @@ enum Guide implements WxMpApiUrl {
;
+ private final String prefix;
+ private final String path;
+
+ }
+
+ /**
+ * 草稿箱 能力:
+ * 新建草稿
+ * 获取草稿
+ * 删除草稿
+ * 修改草稿
+ * 获取草稿总数
+ * 获取草稿列表
+ * MP端开关（仅内测期间使用）- 上线后废弃，没实现，可以自己去公众号后台开启草稿箱
+ */
+ @AllArgsConstructor
+ @Getter
+ enum Draft implements WxMpApiUrl {
+
+ /**
+ * 新建草稿
+ */
+ ADD_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/add"),
+ /**
+ * 修改草稿
+ */
+ UPDATE_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/update"),
+ /**
+ * 获取草稿
+ */
+ GET_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/get"),
+ /**
+ * 删除草稿
+ */
+ DEL_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/delete"),
+ /**
+ * 获取草稿列表
+ */
+ LIST_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/batchget"),
+ /**
+ * 获取草稿总数
+ */
+ COUNT_DRAFT(API_DEFAULT_HOST_URL, "/cgi-bin/draft/count");
+
+ private final String prefix;
+ private final String path;
+
+ }
+
+ /**
+ * 发布能力:
+ * 发布接口
+ * 发布状态轮询接口
+ * 事件推送发布结果 -- 是回调，没实现
+ * 删除发布
+ * 通过 article_id 获取已发布文章
+ * 获取成功发布列表
+ */
+ @AllArgsConstructor
+ @Getter
+ enum FreePublish implements WxMpApiUrl {
+
+ /**
+ * 发布接口
+ */
+ SUBMIT(API_DEFAULT_HOST_URL, "/cgi-bin/freepublish/submit"),
+ /**
+ * 通过 article_id 获取已发布文章
+ */
+ GET_ARTICLE(API_DEFAULT_HOST_URL, "/cgi-bin/freepublish/getarticle"),
+ /**
+ * 发布状态轮询接口
+ */
+ GET_PUSH_STATUS(API_DEFAULT_HOST_URL, "/cgi-bin/freepublish/get"),
+ /**
+ * 删除发布
+ */
+ DEL_PUSH(API_DEFAULT_HOST_URL, "/cgi-bin/freepublish/delete"),
+ /**
+ * 获取成功发布列表
+ */
+ BATCH_GET(API_DEFAULT_HOST_URL, "/cgi-bin/freepublish/batchget")
+ ;
+
private final String prefix;
private final String path;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpDraftServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpDraftServiceImplTest.java
new file mode 100644
index 0000000000..193580a9f1
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpDraftServiceImplTest.java
@@ -0,0 +1,127 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.test.ApiTestModule;
+import me.chanjar.weixin.mp.bean.draft.WxMpAddDraft;
+import me.chanjar.weixin.mp.bean.draft.WxMpDraftArticles;
+import me.chanjar.weixin.mp.bean.draft.WxMpDraftInfo;
+import me.chanjar.weixin.mp.bean.draft.WxMpDraftList;
+import me.chanjar.weixin.mp.bean.draft.WxMpUpdateDraft;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * 草稿箱单元测试.
+ *
+ * @author dragon
+ * @date 2021-10-22
+ */
+@Guice(modules = ApiTestModule.class)
+public class WxMpDraftServiceImplTest {
+
+ /**
+ * 1.先上传一个永久图片素材：me.chanjar.weixin.mp.api.impl.WxMpMaterialServiceImplTest.testUploadMaterial
+ * 2.后续图文需要设置一个永久素材id
+ */
+ final String thumbMediaId = "zUUtT8ZYeXzZ4slFbtnAkh7Yd-f45DbFoF9ERzVC6s4";
+
+ /**
+ * 新增草稿后返回的id，后续查询、修改、删除，获取等需要使用
+ */
+ final String mediaId = "zUUtT8ZYeXzZ4slFbtnAkpgGKyqnTsjtUvMdVBRWJVk";
+
+ @Inject
+ protected WxMpService wxService;
+
+ @Test
+ public void testAddDraft() throws WxErrorException {
+ // {"mediaId":"zUUtT8ZYeXzZ4slFbtnAkh7Yd-f45DbFoF9ERzVC6s4","url":"http://mmbiz.qpic.cn/mmbiz_jpg/fLtyChQRfH84IyicNUbGt3l3IlHxJRibSFz7Tky0ibmzKykzVbo9tZGYhXQGJ2npFtDPbvPhKYxBz6JxkYIibTmUicQ/0?wx_fmt=jpeg"}
+ this.wxService.getDraftService().addDraft("标题", "图文消息的具体内容", thumbMediaId);
+ // 【响应数据】：{"media_id":"zUUtT8ZYeXzZ4slFbtnAks-nZeGiPQmwvhShTh72CqM","item":[]}
+ }
+
+ @Test
+ public void testAddGuide_another() throws WxErrorException {
+ List draftArticleList = new ArrayList<>();
+ WxMpDraftArticles draftArticle = WxMpDraftArticles.builder()
+ .title("新建草稿-对象形式")
+ .author("dragon")
+ .digest("图文消息的摘要，仅有单图文消息才有摘要，多图文此处为空")
+ .content("图文消息的具体内容，支持HTML标签，必须少于2万字符，小于1M，且此处会去除JS")
+ .contentSourceUrl("https://github.com/Wechat-Group/WxJava")
+ .thumbMediaId(thumbMediaId)
+ // 显示封面、打开评论、所有人可评论
+ .showCoverPic(1).needOpenComment(1).onlyFansCanComment(0)
+ .build();
+ draftArticleList.add(draftArticle);
+
+ WxMpAddDraft addDraft = WxMpAddDraft.builder().articles(draftArticleList).build();
+ String mediaId = this.wxService.getDraftService().addDraft(addDraft);
+ // 【响应数据】：{"media_id":"zUUtT8ZYeXzZ4slFbtnAkpgGKyqnTsjtUvMdVBRWJVk","item":[]}
+ assertThat(mediaId).isNotNull();
+ }
+
+ @Test
+ public void testGetDraft() throws WxErrorException {
+ final WxMpDraftInfo draftInfo = this.wxService.getDraftService().getDraft(mediaId);
+ assertThat(draftInfo).isNotNull();
+ // 【响应数据】：{"news_item":[{"title":"标题","author":"","digest":"图文消息的具体内容","content":"图文消息的具体内容","content_source_url":"","thumb_media_id":"zUUtT8ZYeXzZ4slFbtnAkh7Yd-f45DbFoF9ERzVC6s4","show_cover_pic":1,"url":"http:\/\/mp.weixin.qq.com\/s?__biz=Mzk0OTI5MzM1OQ==&mid=100000006&idx=1&sn=89903965ae5ebd6014903c7c5ca34daa&chksm=435bd946742c5050d18da32289904db5ede8bbd157d181438231a1762b85030419b3c0ed4c00#rd","thumb_url":"http:\/\/mmbiz.qpic.cn\/mmbiz_jpg\/fLtyChQRfH84IyicNUbGt3l3IlHxJRibSFz7Tky0ibmzKykzVbo9tZGYhXQGJ2npFtDPbvPhKYxBz6JxkYIibTmUicQ\/0?wx_fmt=jpeg","need_open_comment":0,"only_fans_can_comment":0}],"create_time":1634886802,"update_time":1634886802}
+ }
+
+ @Test
+ public void testUpdateDraft() throws WxErrorException {
+ WxMpDraftArticles draftArticles = WxMpDraftArticles.builder()
+ .title("新标题").content("新图文消息的具体内容").thumbMediaId(thumbMediaId).build();
+ WxMpUpdateDraft updateDraft = WxMpUpdateDraft.builder()
+ .mediaId(mediaId)
+ .index(0)
+ .articles(draftArticles)
+ .build();
+ Boolean updateDraftResult = this.wxService.getDraftService().updateDraft(updateDraft);
+ // assertThat(updateDraftResult).isTrue();
+ assertThat(updateDraftResult).isTrue();
+ }
+
+ @Test
+ public void testDelDraft() throws WxErrorException {
+ Boolean delDraftResult = this.wxService.getDraftService().delDraft(mediaId);
+ // 【响应数据】：{"errcode":0,"errmsg":"ok"}
+ assertThat(delDraftResult).isTrue();
+ }
+
+ @Test
+ public void testListDraft() throws WxErrorException {
+ WxMpDraftList draftList = this.wxService.getDraftService().listDraft(0, 10);
+ /*
+ 【响应数据】：{"item":[{"media_id":"zUUtT8ZYeXzZ4slFbtnAks-nZeGiPQmwvhShTh72CqM",
+ "content":{
+ "news_item":
+ [
+ {"title":"标题","author":"","digest":"图文消息的具体内容","content":"图文消息的具体内容",
+ "content_source_url":"","thumb_media_id":"zUUtT8ZYeXzZ4slFbtnAkh7Yd-f45DbFoF9ERzVC6s4",
+ "show_cover_pic":1,"url":"http:\/\/mp.weixin.qq.com\/s?__biz=Mzk0OTI5MzM1?wx_fmt=jpeg",
+ "need_open_comment":0,"only_fans_can_comment":0}],
+ "create_time":1634886802,"update_time":1634886802},"update_time":1634886802}
+ ]
+ ,"total_count":1,"item_count":1}
+
+ */
+ assertThat(draftList).isNotNull();
+ }
+
+ @Test
+ public void testCountDraft() throws WxErrorException {
+ Long countDraft = this.wxService.getDraftService().countDraft();
+ // 【响应数据】：{"total_count":1}
+ assertThat(countDraft).isNotNull();
+ }
+
+}
+
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpFreePublishServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpFreePublishServiceImplTest.java
new file mode 100644
index 0000000000..ff5cd0e5d3
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpFreePublishServiceImplTest.java
@@ -0,0 +1,109 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.test.ApiTestModule;
+import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishInfo;
+import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishList;
+import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishStatus;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * 发布能力-单元测试.
+ *
+ * @author dragon
+ * @date 2021-10-23
+ */
+@Guice(modules = ApiTestModule.class)
+public class WxMpFreePublishServiceImplTest {
+
+ /**
+ * 新增草稿后返回的id，发布需要使用
+ */
+ final String mediaId = "HKVdzjkDfooMqBqJtvSs2EEeRAJaM33gJgkii_JDOHg";
+
+ /**
+ * 发布后的id，后续查询等需要使用
+ */
+ final String publishId = "2650177669";
+
+ /**
+ * 图文的 article_id，后续查询图文详情、删除发布内容 需要使用
+ * 要根据 publishId 来获取 article_id
+ *
+ * @see this.testGetPushStatus
+ */
+ final String articleId = "zjMKVd1g66BkEkpetwml4ElbDdniE8JeI2Ec324Sjqg";
+
+ @Inject
+ protected WxMpService wxService;
+
+ @Test
+ public void testSubmit() throws WxErrorException {
+ String submit = this.wxService.getFreePublishService().submit(mediaId);
+ assertThat(submit).isNotBlank();
+ // 【响应数据】：{"errcode":0,"errmsg":"ok","publish_id":2650177668}
+ }
+
+ @Test
+ public void testGetPushStatus() throws WxErrorException {
+ WxMpFreePublishStatus pushStatus = this.wxService.getFreePublishService().getPushStatus(publishId);
+ assertThat(pushStatus).isNotNull();
+ // 【响应数据】：{"publish_id":2650177668,"publish_status":0,"article_id":"zjMKVd1g66BkEkpetwml4J-4gNf4I1nsh-B-r_inemw",
+ // "article_detail":{"count":1,"item":
+ // [{"idx":1,"article_url":
+ // "https://mp.weixin.qq.com/s?__biz=MzAwMTE2MzA1xxxxxxxxxx"
+ // }]},"fail_idx":[]}
+ // article_url -> 已发布内容可被自定义菜单、自动回复、话题引用，也可用于公开传播
+ }
+
+ @Test
+ public void testGetArticleFromId() throws WxErrorException {
+ WxMpFreePublishInfo articleFromId = this.wxService.getFreePublishService().getArticleFromId(articleId);
+ assertThat(articleFromId).isNotNull();
+ /* 【响应数据】：{"news_item":[{"title":"欢迎你加入啊~ 这是我的第一条文字消息草稿","author":"","digest":"","content":"欢迎你加入啊~ 这是我的第一条文字消息草稿",
+ "content_source_url":"","thumb_media_id":"","show_cover_pic":0,"url":"http:\/\/mp.weixin.qq
+ .com\/s?__biz=MzAwMTE2MzA1Mg==&mid=2650177668","thumb_url":"","need_open_comment":1,"only_fans_can_comment":1,"is_deleted":false}],
+ "create_time":1634961670,"update_time":1634961672}
+ */
+ }
+
+ @Test
+ public void testDelPush() throws WxErrorException {
+ Boolean deletePush = this.wxService.getFreePublishService().deletePush(articleId, 0);
+ // 【响应数据】：{"errcode":0,"errmsg":"ok"}
+ assertThat(deletePush).isTrue();
+ }
+
+ @Test
+ public void testDeletePushAllArticle() throws WxErrorException {
+ Boolean deletePush = this.wxService.getFreePublishService().deletePushAllArticle(articleId);
+ // 【响应数据】：{"errcode":0,"errmsg":"ok"}
+ assertThat(deletePush).isTrue();
+ }
+
+ @Test
+ public void testGetPublicationRecords() throws WxErrorException {
+ WxMpFreePublishList publicationRecords = this.wxService.getFreePublishService().getPublicationRecords(0, 10, 0);
+ /*
+ 【响应数据】：
+ {"item":[{"article_id":"zjMKVd1g66BkEkpetwml4BOSzatuEYNY3TFhCc0kSIE","content":{"news_item":[
+ {"title":"新建草稿-对象形式","author":"dragon","digest":"图文消息的摘要，仅有单图文消息才有摘要，多图文此处为空",
+ "content":"图文消息的具体内容，支持HTML标签，必须少于2万字符，小于1M，且此处会去除JS",
+ "content_source_url":"https:\/\/github.com\/Wechat-Group\/WxJava","thumb_media_id":"HKVdzjkDfooMqBqJtvSs2Ajz2v6L_vtGhyyr_mqKcPU",
+ "show_cover_pic":1,"url":"http:\/\/mp.weixin.qq.com\/s?__biz=MzAwMTE2MzA1Mg==&mid=26501776710e5adb91#rd",
+ "thumb_url":"http:\/\/mmbiz.qpic.cn\/mmbiz_jpg\/0QSAUfroWrUmxHthQ\/0?wx_fmt=jpeg",
+ "need_open_comment":1,"only_fans_can_comment":0,"is_deleted":false}],
+ "create_time":1634976306,"update_time":1634976318}}
+ ]
+ ,"total_count":1,"item_count":1}
+ */
+ assertThat(publicationRecords).isNotNull();
+ }
+
+}
+
From a2042dd7c285e28c8da8080b67d9d630e7f3754c Mon Sep 17 00:00:00 2001
From: tt <30398051+zhentang3@users.noreply.github.com>
Date: Sat, 23 Oct 2021 23:25:58 +0800
Subject: [PATCH 0017/1079] =?UTF-8?q?:art:=20#2354=20=E3=80=90=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91urlscheme=E5=A2=9E=E5=8A=A0=E8=A6=81?=
=?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=80=BC?=
=?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
index 799a7390a6..80c5f90347 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
@@ -39,6 +39,12 @@ public class WxMaGenerateSchemeRequest {
@SerializedName("expire_time")
private Long expireTime;
+ /**
+ * 要打开的小程序版本。正式版为"release"，体验版为"trial"，开发版为"develop"默认值：release
+ */
+ @SerializedName("env_version")
+ private String envVersion = "release";
+
@Data
@Builder(builderMethodName = "newBuilder")
public static class JumpWxa {
From 44e4ee44160e1a85723c0c93e0ad107ff1286892 Mon Sep 17 00:00:00 2001
From: Kyle Scully
Date: Sat, 23 Oct 2021 08:26:45 -0700
Subject: [PATCH 0018/1079] :art: modifier order
---
.../weixin/common/util/http/WxDnsResolver.java | 2 +-
.../cp/config/impl/WxCpRedissonConfigImpl.java | 8 ++++----
.../config/impl/WxMaRedissonConfigImpl.java | 8 ++++----
.../wx/miniapp/util/WxMaConfigHolder.java | 2 +-
.../weixin/mp/util/WxMpConfigStorageHolder.java | 2 +-
.../impl/AbstractWxOpenInRedisConfigStorage.java | 14 +++++++-------
.../wxpay/bean/request/BaseWxPayRequest.java | 2 +-
.../qidian/util/WxQidianConfigStorageHolder.java | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java
index d0321af097..ff0977e8d8 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/WxDnsResolver.java
@@ -18,7 +18,7 @@
*/
public class WxDnsResolver implements DnsResolver {
- private final static String WECHAT_API_URL = "api.weixin.qq.com";
+ private static final String WECHAT_API_URL = "api.weixin.qq.com";
private static Map MAPPINGS = new HashMap<>();
protected final Logger log = LoggerFactory.getLogger(WxDnsResolver.class);
private String wxApiIp;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
index 61894b7599..a449348ad7 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
@@ -20,19 +20,19 @@ public class WxCpRedissonConfigImpl extends WxCpDefaultConfigImpl {
/**
* The constant LOCK_KEY.
*/
- protected final static String LOCK_KEY = "wechat_cp_lock:";
+ protected static final String LOCK_KEY = "wechat_cp_lock:";
/**
* The constant CP_ACCESS_TOKEN_KEY.
*/
- protected final static String CP_ACCESS_TOKEN_KEY = "wechat_cp_access_token_key:";
+ protected static final String CP_ACCESS_TOKEN_KEY = "wechat_cp_access_token_key:";
/**
* The constant CP_JSAPI_TICKET_KEY.
*/
- protected final static String CP_JSAPI_TICKET_KEY = "wechat_cp_jsapi_ticket_key:";
+ protected static final String CP_JSAPI_TICKET_KEY = "wechat_cp_jsapi_ticket_key:";
/**
* The constant CP_AGENT_JSAPI_TICKET_KEY.
*/
- protected final static String CP_AGENT_JSAPI_TICKET_KEY = "wechat_cp_agent_jsapi_ticket_key:";
+ protected static final String CP_AGENT_JSAPI_TICKET_KEY = "wechat_cp_agent_jsapi_ticket_key:";
private final WxRedisOps redisOps;
/**
* redis 存储的 key 的前缀，可为空
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
index c45ad50946..b2d115fd26 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
@@ -18,10 +18,10 @@
*/
public class WxMaRedissonConfigImpl extends WxMaDefaultConfigImpl {
- protected final static String LOCK_KEY = "wechat_ma_lock:";
- protected final static String MA_ACCESS_TOKEN_KEY = "wechat_ma_access_token_key:";
- protected final static String MA_JSAPI_TICKET_KEY = "wechat_ma_jsapi_ticket_key:";
- protected final static String MA_CARD_API_TICKET_KEY = "wechat_ma_card_api_ticket_key:";
+ protected static final String LOCK_KEY = "wechat_ma_lock:";
+ protected static final String MA_ACCESS_TOKEN_KEY = "wechat_ma_access_token_key:";
+ protected static final String MA_JSAPI_TICKET_KEY = "wechat_ma_jsapi_ticket_key:";
+ protected static final String MA_CARD_API_TICKET_KEY = "wechat_ma_card_api_ticket_key:";
/**
* redis 存储的 key 的前缀，可为空
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/WxMaConfigHolder.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/WxMaConfigHolder.java
index e73cb2282d..f99e9616d8 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/WxMaConfigHolder.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/WxMaConfigHolder.java
@@ -7,7 +7,7 @@
* @date 2020-08-16
*/
public class WxMaConfigHolder {
- private final static ThreadLocal THREAD_LOCAL = new ThreadLocal() {
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal() {
@Override
protected String initialValue() {
return "default";
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
index e844c4866b..bb3d8eb43c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
@@ -5,7 +5,7 @@
* @date 2019-03-20 22:06
*/
public class WxMpConfigStorageHolder {
- private final static ThreadLocal THREAD_LOCAL = new ThreadLocal() {
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal() {
@Override
protected String initialValue() {
return "default";
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
index 52799da57c..5f21a94af3 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
@@ -8,16 +8,16 @@
* @date 2020/01/09
**/
public abstract class AbstractWxOpenInRedisConfigStorage extends WxOpenInMemoryConfigStorage {
- protected final static String COMPONENT_VERIFY_TICKET_KEY = "wechat_component_verify_ticket:";
- protected final static String COMPONENT_ACCESS_TOKEN_KEY = "wechat_component_access_token:";
+ protected static final String COMPONENT_VERIFY_TICKET_KEY = "wechat_component_verify_ticket:";
+ protected static final String COMPONENT_ACCESS_TOKEN_KEY = "wechat_component_access_token:";
- protected final static String AUTHORIZER_REFRESH_TOKEN_KEY = "wechat_authorizer_refresh_token:";
- protected final static String AUTHORIZER_ACCESS_TOKEN_KEY = "wechat_authorizer_access_token:";
+ protected static final String AUTHORIZER_REFRESH_TOKEN_KEY = "wechat_authorizer_refresh_token:";
+ protected static final String AUTHORIZER_ACCESS_TOKEN_KEY = "wechat_authorizer_access_token:";
- protected final static String LOCK_KEY = "wechat_lock:";
+ protected static final String LOCK_KEY = "wechat_lock:";
- protected final static String JSAPI_TICKET_KEY = "wechat_jsapi_ticket:";
- protected final static String CARD_API_TICKET_KEY = "wechat_card_api_ticket:";
+ protected static final String JSAPI_TICKET_KEY = "wechat_jsapi_ticket:";
+ protected static final String CARD_API_TICKET_KEY = "wechat_card_api_ticket:";
/**
* redis 存储的 key 的前缀，可为空
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
index 394bc8969b..fde7f7150f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
@@ -322,7 +322,7 @@ public Map getSignParams() {
*
* @param map 传入的属性Map
*/
- abstract protected void storeMap(Map map);
+ protected abstract void storeMap(Map map);
/**
*
diff --git a/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/util/WxQidianConfigStorageHolder.java b/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/util/WxQidianConfigStorageHolder.java
index 1177ce4ac6..9ce4366b99 100644
--- a/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/util/WxQidianConfigStorageHolder.java
+++ b/weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/util/WxQidianConfigStorageHolder.java
@@ -5,7 +5,7 @@
* @date 2020年12月26日
*/
public class WxQidianConfigStorageHolder {
- private final static ThreadLocal THREAD_LOCAL = new ThreadLocal() {
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal() {
@Override
protected String initialValue() {
return "default";
From 3039dd018e3faa11230a44f842b43db9b3fabbda Mon Sep 17 00:00:00 2001
From: Kyle Scully
Date: Sat, 23 Oct 2021 08:27:14 -0700
Subject: [PATCH 0019/1079] :art: Use explicit types on lambda arguments
---
.../common/util/http/apache/ApacheHttpDnsClientBuilder.java | 2 +-
.../chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java | 2 +-
.../test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java | 6 +++---
.../binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java | 2 +-
.../chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
index af3a32ff71..698eb47bb9 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
@@ -48,7 +48,7 @@ public class ApacheHttpDnsClientBuilder implements ApacheHttpClientBuilder {
private DnsResolver dnsResover;
- private HttpRequestRetryHandler httpRequestRetryHandler = (exception, executionCount, context) -> false;
+ private HttpRequestRetryHandler httpRequestRetryHandler = (IOException exception, int executionCount, HttpContext context) -> false;
private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory();
private String httpProxyHost;
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
index 739470a2d7..2e91aacbf4 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
@@ -92,7 +92,7 @@ public WxCpConfigStorage getWxCpConfigStorage() {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
index 52bc8e2ab7..afc596df1b 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
@@ -49,14 +49,14 @@ private static void initWeixin() throws IOException {
wxCpService = new WxCpServiceImpl();
wxCpService.setWxCpConfigStorage(config);
- WxCpMessageHandler handler = (wxMessage, context, wxService, sessionManager) -> {
+ WxCpMessageHandler handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> {
WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("测试加密消息")
.fromUser(wxMessage.getToUserName())
.toUser(wxMessage.getFromUserName()).build();
return m;
};
- WxCpMessageHandler oauth2handler = (wxMessage, context, wxService, sessionManager) -> {
+ WxCpMessageHandler oauth2handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> {
String href = "测试oauth2";
@@ -78,7 +78,7 @@ private static void initWeixin() throws IOException {
.end()
.rule()
.event(WxCpConsts.EventType.CHANGE_CONTACT)
- .handler((wxMessage, context, wxCpService, sessionManager) -> {
+ .handler((WxCpXmlMessage wxMessage, Map context, WxCpService wxCpService, WxSessionManager sessionManager) -> {
System.out.println("通讯录发生变更");
return null;
})
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
index 73343d8e4e..7310a8fcd5 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
@@ -127,7 +127,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
index c4b57ff13c..834ed8cb76 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
@@ -237,7 +237,7 @@ public HttpType getRequestType() {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
From 7164e2619508fca38e5e3ab64890cb3281cea07b Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 25 Oct 2021 00:09:14 +0800
Subject: [PATCH 0020/1079] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../binarywang/wxpay/bean/ecommerce/RefundsRequest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
index 3666b43195..e026a403ee 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
@@ -16,8 +16,8 @@
*/
@Data
@Builder
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor
+@AllArgsConstructor
public class RefundsRequest implements Serializable {
private static final long serialVersionUID = -3186851559004865784L;
From dde445150a084daaea16dbaf9af7dddd31dea549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E5=AE=89?=
Date: Sun, 31 Oct 2021 23:16:08 +0800
Subject: [PATCH 0021/1079] =?UTF-8?q?:new:=20#2365=20=E3=80=90=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E3=80=91=E6=96=B0=E5=A2=9E=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E4=BC=81=E4=B8=9A=E7=BE=A4=E5=8F=91=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E5=8F=8A=E7=BB=93=E6=9E=9C=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apache/ApacheHttpDnsClientBuilder.java | 4 +
.../cp/api/WxCpExternalContactService.java | 51 ++++++++++-
.../impl/WxCpExternalContactServiceImpl.java | 85 ++++++++++++++++++-
.../contact/WxCpGroupMsgListResult.java | 60 +++++++++++++
.../contact/WxCpGroupMsgSendResult.java | 56 ++++++++++++
.../contact/WxCpGroupMsgTaskResult.java | 50 +++++++++++
.../weixin/cp/constant/WxCpApiPathConsts.java | 4 +
7 files changed, 306 insertions(+), 4 deletions(-)
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgListResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgSendResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgTaskResult.java
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
index 698eb47bb9..e1959f08f0 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java
@@ -20,10 +20,12 @@
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.protocol.HttpContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.concurrent.NotThreadSafe;
+import java.io.IOException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -52,10 +54,12 @@ public class ApacheHttpDnsClientBuilder implements ApacheHttpClientBuilder {
private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory();
private String httpProxyHost;
+
private int httpProxyPort;
private String httpProxyUsername;
private String httpProxyPassword;
+
/**
* 闲置连接监控线程.
*/
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index 2a6ffe218a..32a4df416f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -20,8 +20,8 @@
import me.chanjar.weixin.cp.bean.external.WxCpUserTransferCustomerResp;
import me.chanjar.weixin.cp.bean.external.WxCpUserTransferResultResp;
import me.chanjar.weixin.cp.bean.external.WxCpWelcomeMsg;
-import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactBatchInfo;
-import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactInfo;
+import me.chanjar.weixin.cp.bean.external.contact.*;
+import me.chanjar.weixin.cp.bean.oa.WxCpApprovalInfoQueryFilter;
import org.jetbrains.annotations.NotNull;
import java.util.Date;
@@ -587,4 +587,51 @@ WxCpExternalContactBatchInfo getContactDetailBatch(String[] userIdList, String c
WxCpBaseResp markTag(String userid, String externalUserid, String[] addTag, String[] removeTag) throws WxErrorException;
+ /**
+ *
+ * 企业和第三方应用可通过此接口获取企业与成员的群发记录。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338
+ *
+ *
+ * @param chatType 群发任务的类型，默认为single，表示发送给客户，group表示发送给客户群
+ * @param startTime 群发任务记录开始时间
+ * @param endTime 群发任务记录结束时间
+ * @param creator 群发任务创建人企业账号id
+ * @param filterType 创建人类型。0：企业发表 1：个人发表 2：所有，包括个人创建以及企业创建，默认情况下为所有类型
+ * @param limit 返回的最大记录数，整型，最大值100，默认值50，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpGroupMsgListResult getGroupMsgListV2(String chatType, @NonNull Date startTime, @NonNull Date endTime, String creator, Integer filterType, Integer limit, String cursor) throws WxErrorException;
+
+ /**
+ *
+ * 企业和第三方应用可通过此接口获取企业与成员的群发记录。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338#获取企业群发成员执行结果
+ *
+ *
+ * @param msgid 群发消息的id，通过获取群发记录列表接口返回
+ * @param userid 发送成员userid，通过获取群发成员发送任务列表接口返回
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpGroupMsgSendResult getGroupMsgSendResult(String msgid, String userid, Integer limit, String cursor) throws WxErrorException;
+
+ /**
+ *
+ * 获取群发成员发送任务列表。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338#获取群发成员发送任务列表
+ *
+ *
+ * @param msgid 群发消息的id，通过获取群发记录列表接口返回
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpGroupMsgTaskResult getGroupMsgTask(String msgid, Integer limit, String cursor) throws WxErrorException;
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index d4b4e7db48..598f4ac28c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -31,8 +31,7 @@
import me.chanjar.weixin.cp.bean.external.WxCpUserTransferResultResp;
import me.chanjar.weixin.cp.bean.external.WxCpUserWithExternalPermission;
import me.chanjar.weixin.cp.bean.external.WxCpWelcomeMsg;
-import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactBatchInfo;
-import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactInfo;
+import me.chanjar.weixin.cp.bean.external.contact.*;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
@@ -449,4 +448,86 @@ public WxCpBaseResp markTag(String userid, String externalUserid, String[] addTa
final String result = this.mainService.post(url, json.toString());
return WxCpBaseResp.fromJson(result);
}
+
+ /**
+ *
+ * 企业和第三方应用可通过此接口获取企业与成员的群发记录。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338
+ *
+ *
+ * @param chatType 群发任务的类型，默认为single，表示发送给客户，group表示发送给客户群
+ * @param startTime 群发任务记录开始时间
+ * @param endTime 群发任务记录结束时间
+ * @param creator 群发任务创建人企业账号id
+ * @param filterType 创建人类型。0：企业发表 1：个人发表 2：所有，包括个人创建以及企业创建，默认情况下为所有类型
+ * @param limit 返回的最大记录数，整型，最大值100，默认值50，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpGroupMsgListResult getGroupMsgListV2(String chatType, @NonNull Date startTime, @NonNull Date endTime, String creator, Integer filterType, Integer limit, String cursor) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("chat_type", chatType);
+ json.addProperty("start_time", startTime.getTime() / 1000);
+ json.addProperty("end_time", endTime.getTime() / 1000);
+ json.addProperty("creator", creator);
+ json.addProperty("filter_type", filterType);
+ json.addProperty("limit", limit);
+ json.addProperty("cursor", cursor);
+
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_SEND_RESULT);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGroupMsgListResult.fromJson(result);
+ }
+
+ /**
+ *
+ * 企业和第三方应用可通过此接口获取企业与成员的群发记录。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338#获取企业群发成员执行结果
+ *
+ *
+ * @param msgid 群发消息的id，通过获取群发记录列表接口返回
+ * @param userid 发送成员userid，通过获取群发成员发送任务列表接口返回
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpGroupMsgSendResult getGroupMsgSendResult(String msgid, String userid, Integer limit, String cursor) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("msgid", msgid);
+ json.addProperty("userid", userid);
+ json.addProperty("limit", limit);
+ json.addProperty("cursor", cursor);
+
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_SEND_RESULT);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGroupMsgSendResult.fromJson(result);
+ }
+
+ /**
+ *
+ * 获取群发成员发送任务列表。
+ * https://work.weixin.qq.com/api/doc/90000/90135/93338#获取群发成员发送任务列表
+ *
+ *
+ * @param msgid 群发消息的id，通过获取群发记录列表接口返回
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpGroupMsgTaskResult getGroupMsgTask(String msgid, Integer limit, String cursor) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("msgid", msgid);
+ json.addProperty("limit", limit);
+ json.addProperty("cursor", cursor);
+
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_SEND_RESULT);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGroupMsgTaskResult.fromJson(result);
+ }
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgListResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgListResult.java
new file mode 100644
index 0000000000..e8cb1b81c9
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgListResult.java
@@ -0,0 +1,60 @@
+package me.chanjar.weixin.cp.bean.external.contact;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.msg.Attachment;
+import me.chanjar.weixin.cp.bean.external.msg.Text;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 获取企业群发成员执行结果
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/93338
+ *
+ *
+ * @author Mr.Pan
+ */
+@Getter
+@Setter
+public class WxCpGroupMsgListResult extends WxCpBaseResp implements Serializable {
+
+ private static final long serialVersionUID = 3464981991558716620L;
+
+ @SerializedName("group_msg_list")
+ private List groupMsgList;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @Getter
+ @Setter
+ public static class ExternalContactGroupMsgInfo implements Serializable {
+
+ private static final long serialVersionUID = 3108435608725559381L;
+ @SerializedName("msgid")
+ private String msgId;
+
+ private String creator;
+
+ private Text text;
+
+ private List attachments;
+
+ @SerializedName("create_type")
+ private Integer createType;
+
+ @SerializedName("create_time")
+ private Long createTime;
+
+ }
+
+ public static WxCpGroupMsgListResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGroupMsgListResult.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgSendResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgSendResult.java
new file mode 100644
index 0000000000..704e53b8d3
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgSendResult.java
@@ -0,0 +1,56 @@
+package me.chanjar.weixin.cp.bean.external.contact;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 获取企业群发成员执行结果
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/93338
+ *
+ *
+ * @author Mr.Pan
+ */
+@Getter
+@Setter
+public class WxCpGroupMsgSendResult extends WxCpBaseResp implements Serializable {
+ private static final long serialVersionUID = -5166048319463473186L;
+
+ @SerializedName("send_list")
+ private List sendList;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @Getter
+ @Setter
+ public static class ExternalContactGroupMsgSendInfo implements Serializable {
+ private static final long serialVersionUID = 1500416806087532531L;
+
+ @SerializedName("external_userid")
+ private String externalUserId;
+
+ @SerializedName("chat_id")
+ private String chatId;
+
+ @SerializedName("userid")
+ private String userId;
+
+ private Integer status;
+
+ @SerializedName("send_time")
+ private Long sendTime;
+
+ }
+
+ public static WxCpGroupMsgSendResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGroupMsgSendResult.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgTaskResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgTaskResult.java
new file mode 100644
index 0000000000..0f2299bb4e
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/WxCpGroupMsgTaskResult.java
@@ -0,0 +1,50 @@
+package me.chanjar.weixin.cp.bean.external.contact;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 获取群发成员发送任务列表
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/93338
+ *
+ *
+ * @author Mr.Pan
+ */
+@Getter
+@Setter
+public class WxCpGroupMsgTaskResult extends WxCpBaseResp implements Serializable {
+ private static final long serialVersionUID = -5166048319463473186L;
+
+ @SerializedName("task_list")
+ private List taskList;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @Getter
+ @Setter
+ public static class ExternalContactGroupMsgTaskInfo implements Serializable {
+ private static final long serialVersionUID = 1500416806087532531L;
+
+ @SerializedName("userid")
+ private String userId;
+
+ private Integer status;
+
+ @SerializedName("send_time")
+ private Long sendTime;
+
+ }
+
+ public static WxCpGroupMsgTaskResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGroupMsgTaskResult.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index 1a184e9a54..dfa0c63477 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -205,5 +205,9 @@ interface ExternalContact {
String EDIT_CORP_TAG = "/cgi-bin/externalcontact/edit_corp_tag";
String DEL_CORP_TAG = "/cgi-bin/externalcontact/del_corp_tag";
String MARK_TAG = "/cgi-bin/externalcontact/mark_tag";
+
+ String GET_GROUP_MSG_SEND_RESULT = "/cgi-bin/externalcontact/get_groupmsg_send_result";
+ String GET_GROUP_MSG_TASK = "/cgi-bin/externalcontact/get_groupmsg_task";
+ String GET_GROUP_MSG_LIST_V2 = "/cgi-bin/externalcontact/get_groupmsg_list_v2";
}
}
From 537a9332c0bf29d549e7ed788a3ed183f2c054c1 Mon Sep 17 00:00:00 2001
From: Boris
Date: Sun, 31 Oct 2021 23:25:27 +0800
Subject: [PATCH 0022/1079] =?UTF-8?q?:new:=20#2361=20=E3=80=90=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E6=9C=8B=E5=8F=8B=E5=9C=88=E7=9B=B8=E5=85=B3=E7=9A=84?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cp/api/WxCpExternalContactService.java | 108 ++++++++++++++++-
.../impl/WxCpExternalContactServiceImpl.java | 112 +++++++++++++++++-
.../cp/bean/external/WxCpAddMomentResult.java | 27 +++++
.../cp/bean/external/WxCpAddMomentTask.java | 36 ++++++
.../bean/external/WxCpGetMomentComments.java | 40 +++++++
.../external/WxCpGetMomentCustomerList.java | 30 +++++
.../cp/bean/external/WxCpGetMomentList.java | 30 +++++
.../external/WxCpGetMomentSendResult.java | 30 +++++
.../cp/bean/external/WxCpGetMomentTask.java | 41 +++++++
.../external/WxCpGetMomentTaskResult.java | 50 ++++++++
.../WxCpUserExternalTagGroupInfo.java | 4 +-
.../cp/bean/external/moment/CustomerItem.java | 14 +++
.../external/moment/ExternalContactList.java | 13 ++
.../cp/bean/external/moment/MomentInfo.java | 28 +++++
.../cp/bean/external/moment/SenderList.java | 15 +++
.../cp/bean/external/moment/VisibleRange.java | 13 ++
.../weixin/cp/bean/external/msg/Link.java | 2 +
.../weixin/cp/bean/external/msg/Location.java | 16 +++
.../weixin/cp/bean/external/msg/Video.java | 2 +
.../cp/bean/message/WxCpTpXmlMessage.java | 33 ++++++
.../weixin/cp/constant/WxCpApiPathConsts.java | 9 ++
.../WxCpExternalContactServiceImplTest.java | 4 +-
22 files changed, 651 insertions(+), 6 deletions(-)
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Location.java
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index 32a4df416f..d252fb831e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -3,8 +3,16 @@
import lombok.NonNull;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.WxCpAddMomentResult;
+import me.chanjar.weixin.cp.bean.external.WxCpAddMomentTask;
import me.chanjar.weixin.cp.bean.external.WxCpContactWayInfo;
import me.chanjar.weixin.cp.bean.external.WxCpContactWayResult;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentComments;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentCustomerList;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentList;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentSendResult;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTask;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTaskResult;
import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplate;
import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplateAddResult;
import me.chanjar.weixin.cp.bean.external.WxCpUpdateRemarkRequest;
@@ -181,7 +189,7 @@ public interface WxCpExternalContactService {
* @return 该企业的外部联系人ID
* @throws WxErrorException .
*/
- String unionidToExternalUserid(String unionid) throws WxErrorException;
+ String unionidToExternalUserid(@NotNull String unionid,String openid) throws WxErrorException;
/**
* 批量获取客户详情.
@@ -586,6 +594,104 @@ WxCpExternalContactBatchInfo getContactDetailBatch(String[] userIdList, String c
*/
WxCpBaseResp markTag(String userid, String externalUserid, String[] addTag, String[] removeTag) throws WxErrorException;
+ /**
+ *
+ * 企业和第三方应用可通过该接口创建客户朋友圈的发表任务。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/95094
+ *
+ * @param task
+ * @return wx cp add moment result
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpAddMomentResult addMomentTask(WxCpAddMomentTask task) throws WxErrorException;
+
+ /**
+ *
+ * 由于发表任务的创建是异步执行的，应用需要再调用该接口以获取创建的结果。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/95094
+ *
+ * @param jobId 异步任务id，最大长度为64字节，由创建发表内容到客户朋友圈任务接口获取
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentTaskResult getMomentTaskResult(String jobId) throws WxErrorException;
+
+ /**
+ *
+ * 获取客户朋友圈全部的发表记录 获取企业全部的发表列表
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/93333
+ *
+ * @param startTime 朋友圈记录开始时间。Unix时间戳
+ * @param endTime 朋友圈记录结束时间。Unix时间戳
+ * @param creator 朋友圈创建人的userid
+ * @param filterType 朋友圈类型。0：企业发表 1：个人发表 2：所有，包括个人创建以及企业创建，默认情况下为所有类型
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @param limit 返回的最大记录数，整型，最大值100，默认值100，超过最大值时取默认值
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentList getMomentList(Long startTime, Long endTime, String creator, Integer filterType,
+ String cursor, Integer limit) throws WxErrorException;
+
+ /**
+ *
+ * 获取客户朋友圈全部的发表记录 获取客户朋友圈企业发表的列表
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/93333
+ *
+ * @param momentId 朋友圈id,仅支持企业发表的朋友圈id
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentTask getMomentTask(String momentId, String cursor, Integer limit)
+ throws WxErrorException;
+
+ /**
+ *
+ * 获取客户朋友圈全部的发表记录 获取客户朋友圈发表时选择的可见范围
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/93333
+ *
+ * @param momentId 朋友圈id
+ * @param userId 企业发表成员userid，如果是企业创建的朋友圈，可以通过获取客户朋友圈企业发表的
+ * 列表获取已发表成员userid，如果是个人创建的朋友圈，创建人userid就是企业发表成员userid
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @param limit 返回的最大记录数，整型，最大值1000，默认值500，超过最大值时取默认值
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentCustomerList getMomentCustomerList(String momentId, String userId,
+ String cursor, Integer limit) throws WxErrorException;
+
+ /**
+ *
+ * 获取客户朋友圈全部的发表记录 获取客户朋友圈发表后的可见客户列表
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/93333
+ *
+ * @param momentId 朋友圈id
+ * @param userId 企业发表成员userid，如果是企业创建的朋友圈，可以通过获取客户朋友圈企业发表的列表获取已发表成员userid，
+ * 如果是个人创建的朋友圈，创建人userid就是企业发表成员userid
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @param limit 返回的最大记录数，整型，最大值5000，默认值3000，超过最大值时取默认值
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentSendResult getMomentSendResult(String momentId, String userId,
+ String cursor, Integer limit) throws WxErrorException;
+
+ /**
+ *
+ * 获取客户朋友圈全部的发表记录 获取客户朋友圈的互动数据
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/93333
+ *
+ * @param momentId 朋友圈id
+ * @param userId 企业发表成员userid，如果是企业创建的朋友圈，可以通过获取客户朋友圈企业发表的列表获取已发表成员userid，
+ * 如果是个人创建的朋友圈，创建人userid就是企业发表成员userid
+ * @return
+ * @throws WxErrorException
+ */
+ WxCpGetMomentComments getMomentComments(String momentId, String userId)
+ throws WxErrorException;
/**
*
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 598f4ac28c..72c2c93b90 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -12,8 +12,16 @@
import me.chanjar.weixin.cp.api.WxCpExternalContactService;
import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.WxCpAddMomentResult;
+import me.chanjar.weixin.cp.bean.external.WxCpAddMomentTask;
import me.chanjar.weixin.cp.bean.external.WxCpContactWayInfo;
import me.chanjar.weixin.cp.bean.external.WxCpContactWayResult;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentComments;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentCustomerList;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentList;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentSendResult;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTask;
+import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTaskResult;
import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplate;
import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplateAddResult;
import me.chanjar.weixin.cp.bean.external.WxCpUpdateRemarkRequest;
@@ -137,9 +145,12 @@ public String convertToOpenid(@NotNull String externalUserId) throws WxErrorExce
}
@Override
- public String unionidToExternalUserid(@NotNull String unionid) throws WxErrorException {
+ public String unionidToExternalUserid(@NotNull String unionid,String openid) throws WxErrorException {
JsonObject json = new JsonObject();
json.addProperty("unionid", unionid);
+ if(StringUtils.isNotEmpty(openid)){
+ json.addProperty("openid",openid);
+ }
final String url = this.mainService.getWxCpConfigStorage().getApiUrl(UNIONID_TO_EXTERNAL_USERID);
String responseContent = this.mainService.post(url, json.toString());
JsonObject tmpJson = GsonParser.parse(responseContent);
@@ -449,6 +460,105 @@ public WxCpBaseResp markTag(String userid, String externalUserid, String[] addTa
return WxCpBaseResp.fromJson(result);
}
+ @Override
+ public WxCpAddMomentResult addMomentTask(WxCpAddMomentTask task) throws WxErrorException {
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(ADD_MOMENT_TASK);
+ final String result = this.mainService.post(url, task.toJson());
+ return WxCpAddMomentResult.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentTaskResult getMomentTaskResult(String jobId) throws WxErrorException {
+ String params = "&jobid=" + jobId;
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_TASK_RESULT);
+ final String result = this.mainService.get(url, params);
+ return WxCpGetMomentTaskResult.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentList getMomentList(Long startTime, Long endTime, String creator, Integer filterType,
+ String cursor, Integer limit) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("start_time", startTime);
+ json.addProperty("end_time", endTime);
+ if (!StringUtils.isEmpty(creator)) {
+ json.addProperty("creator", creator);
+ }
+ if (filterType!=null) {
+ json.addProperty("filter_type", filterType);
+ }
+ if (!StringUtils.isEmpty(cursor)) {
+ json.addProperty("cursor", cursor);
+ }
+ if (limit!=null) {
+ json.addProperty("limit", limit);
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_LIST);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGetMomentList.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentTask getMomentTask(String momentId, String cursor, Integer limit)
+ throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("moment_id", momentId);
+ if (!StringUtils.isEmpty(cursor)) {
+ json.addProperty("cursor", cursor);
+ }
+ if (limit!=null) {
+ json.addProperty("limit", limit);
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_TASK);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGetMomentTask.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentCustomerList getMomentCustomerList(String momentId, String userId,
+ String cursor, Integer limit) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("moment_id", momentId);
+ json.addProperty("userid", userId);
+ if (!StringUtils.isEmpty(cursor)) {
+ json.addProperty("cursor", cursor);
+ }
+ if (limit!=null) {
+ json.addProperty("limit", limit);
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_CUSTOMER_LIST);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGetMomentCustomerList.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentSendResult getMomentSendResult(String momentId, String userId,
+ String cursor, Integer limit) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("moment_id", momentId);
+ json.addProperty("userid", userId);
+ if (!StringUtils.isEmpty(cursor)) {
+ json.addProperty("cursor", cursor);
+ }
+ if (limit!=null) {
+ json.addProperty("limit", limit);
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_SEND_RESULT);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGetMomentSendResult.fromJson(result);
+ }
+
+ @Override
+ public WxCpGetMomentComments getMomentComments(String momentId, String userId)
+ throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("moment_id", momentId);
+ json.addProperty("userid", userId);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_MOMENT_COMMENTS);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGetMomentComments.fromJson(result);
+ }
+
/**
*
* 企业和第三方应用可通过此接口获取企业与成员的群发记录。
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
new file mode 100644
index 0000000000..3cfd66bb35
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 创建发表任务结果
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpAddMomentResult extends WxCpBaseResp {
+
+ @SerializedName("jobid")
+ private String jobId;
+
+ public static WxCpAddMomentResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpAddMomentResult.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
new file mode 100644
index 0000000000..3e952ccb90
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
@@ -0,0 +1,36 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import me.chanjar.weixin.cp.bean.external.msg.Attachment;
+import me.chanjar.weixin.cp.bean.external.msg.Text;
+import me.chanjar.weixin.cp.bean.external.moment.VisibleRange;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 创建发表任务
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxCpAddMomentTask implements Serializable {
+ @SerializedName("visible_range")
+ private VisibleRange visibleRange;
+
+ private Text text;
+
+ private List attachments;
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
new file mode 100644
index 0000000000..0cf49adcaa
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
@@ -0,0 +1,40 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取客户朋友圈的互动数据
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentComments extends WxCpBaseResp {
+ @SerializedName("comment_list")
+ private List commentList;
+ @SerializedName("like_list")
+ private List likeList;
+
+ @Getter
+ @Setter
+ public static class CommentLikeItem {
+ @SerializedName("external_userid")
+ private String externalUserId;
+ @SerializedName("create_time")
+ private Long createTime;
+ }
+
+ public static WxCpGetMomentComments fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentComments.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
new file mode 100644
index 0000000000..795c9520d1
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
@@ -0,0 +1,30 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.moment.CustomerItem;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取客户朋友圈发表时选择的可见范围
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentCustomerList extends WxCpBaseResp {
+ @SerializedName("next_cursor")
+ private String nextCursor;
+ @SerializedName("customer_list")
+ private List customerList;
+
+ public static WxCpGetMomentCustomerList fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentCustomerList.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
new file mode 100644
index 0000000000..6f4d07288e
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
@@ -0,0 +1,30 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.moment.MomentInfo;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取企业全部的发表列表
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentList extends WxCpBaseResp {
+ @SerializedName("next_cursor")
+ private String nextCursor;
+ @SerializedName("moment_list")
+ private List momentList;
+
+ public static WxCpGetMomentList fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentList.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
new file mode 100644
index 0000000000..c7a6f48524
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
@@ -0,0 +1,30 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.moment.CustomerItem;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取客户朋友圈发表后的可见客户列表
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentSendResult extends WxCpBaseResp {
+ @SerializedName("next_cursor")
+ private String nextCursor;
+ @SerializedName("customer_list")
+ private List customerList;
+
+ public static WxCpGetMomentSendResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentSendResult.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
new file mode 100644
index 0000000000..041d5e8029
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
@@ -0,0 +1,41 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取客户朋友圈企业发表的列表
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentTask extends WxCpBaseResp {
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @SerializedName("task_list")
+ private List taskList;
+
+ @Getter
+ @Setter
+ public static class MomentTaskItem {
+ @SerializedName("userid")
+ private String userId;
+ @SerializedName("publish_status")
+ private String publishStatus;
+ }
+
+ public static WxCpGetMomentTask fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentTask.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
new file mode 100644
index 0000000000..f7ca6d8f38
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
@@ -0,0 +1,50 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.moment.ExternalContactList;
+import me.chanjar.weixin.cp.bean.external.moment.SenderList;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 企业发表内容到客户的朋友圈 获取任务创建结果
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class WxCpGetMomentTaskResult extends WxCpBaseResp {
+ private Integer status;
+ private String type;
+ private TaskResult result;
+
+ @Getter
+ @Setter
+ public static class TaskResult extends WxCpBaseResp {
+ @SerializedName("moment_id")
+ private String momentId;
+ @SerializedName("invalid_sender_list")
+ private SenderList invalidSenderList;
+ @SerializedName("invalid_external_contact_list")
+ private ExternalContactList invalidExternalContactList;
+
+ public static TaskResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, TaskResult.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+ }
+
+ public static WxCpGetMomentTaskResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGetMomentTaskResult.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpUserExternalTagGroupInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpUserExternalTagGroupInfo.java
index 5893065962..69e337b82d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpUserExternalTagGroupInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpUserExternalTagGroupInfo.java
@@ -35,7 +35,7 @@ public static class TagGroup implements Serializable {
private Long createTime;
@SerializedName("order")
- private Integer order;
+ private Long order;
@SerializedName("deleted")
private Boolean deleted;
@@ -67,7 +67,7 @@ public static class Tag implements Serializable {
private Long createTime;
@SerializedName("order")
- private Integer order;
+ private Long order;
@SerializedName("deleted")
private Boolean deleted;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
new file mode 100644
index 0000000000..08b1242392
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
@@ -0,0 +1,14 @@
+package me.chanjar.weixin.cp.bean.external.moment;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CustomerItem {
+ @SerializedName("external_userid")
+ private String externalUserId;
+ @SerializedName("userid")
+ private String userId;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
new file mode 100644
index 0000000000..4d08bf3583
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
@@ -0,0 +1,13 @@
+package me.chanjar.weixin.cp.bean.external.moment;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ExternalContactList {
+ @SerializedName("tag_list")
+ private List tagList;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
new file mode 100644
index 0000000000..2ed770e101
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
@@ -0,0 +1,28 @@
+package me.chanjar.weixin.cp.bean.external.moment;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import me.chanjar.weixin.cp.bean.external.msg.Image;
+import me.chanjar.weixin.cp.bean.external.msg.Link;
+import me.chanjar.weixin.cp.bean.external.msg.Location;
+import me.chanjar.weixin.cp.bean.external.msg.Text;
+import me.chanjar.weixin.cp.bean.external.msg.Video;
+
+@Data
+public class MomentInfo {
+ @SerializedName("moment_id")
+ private String momentId;
+ @SerializedName("creator")
+ private String creator;
+ @SerializedName("create_time")
+ private String createTime;
+ @SerializedName("create_type")
+ private Integer createType;
+ @SerializedName("visible_type")
+ private Integer visibleType;
+ private Text text;
+ private Image image;
+ private Video video;
+ private Link link;
+ private Location location;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
new file mode 100644
index 0000000000..45889684c5
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
@@ -0,0 +1,15 @@
+package me.chanjar.weixin.cp.bean.external.moment;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SenderList {
+ @SerializedName("user_list")
+ private List userList;
+ @SerializedName("department_list")
+ private List departmentList;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
new file mode 100644
index 0000000000..251fb5e64c
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
@@ -0,0 +1,13 @@
+package me.chanjar.weixin.cp.bean.external.moment;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class VisibleRange implements Serializable {
+ @SerializedName("sender_list")
+ private SenderList senderList;
+ @SerializedName("external_contact_list")
+ private ExternalContactList externalContactList;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Link.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Link.java
index a949a1a0f1..a33f4ad9ae 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Link.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Link.java
@@ -19,4 +19,6 @@ public class Link implements Serializable {
private String picUrl;
private String desc;
private String url;
+ @SerializedName("media_id")
+ private String mediaId;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Location.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Location.java
new file mode 100644
index 0000000000..944f2f4876
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Location.java
@@ -0,0 +1,16 @@
+package me.chanjar.weixin.cp.bean.external.msg;
+
+import lombok.Data;
+
+/**
+ * 地理位置
+ *
+ * @author leiin
+ * @date 2021-10-29
+ */
+@Data
+public class Location {
+ private String latitude;
+ private String longitude;
+ private String name;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Video.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Video.java
index 237fb75cfe..863b028126 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Video.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Video.java
@@ -16,4 +16,6 @@ public class Video implements Serializable {
private static final long serialVersionUID = -6048642921382867138L;
@SerializedName("media_id")
private String mediaId;
+ @SerializedName("thumb_media_id")
+ private String thumbMediaId;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java
index e165e7c29d..fc159a9a3b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java
@@ -189,6 +189,39 @@ public class WxCpTpXmlMessage implements Serializable {
@XStreamConverter(value = XStreamCDataConverter.class)
protected String externalUserID;
+ @XStreamAlias("State")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String state;
+
+ @XStreamAlias("Source")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String source;
+
+ @XStreamAlias("FailReason")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String failReason;
+
+ @XStreamAlias("ChatId")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String chatId;
+
+ @XStreamAlias("UpdateDetail")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String updateDetail;
+
+ @XStreamAlias("JoinScene")
+ protected Integer joinScene;
+
+ @XStreamAlias("QuitScene")
+ protected Integer quitScene;
+
+ @XStreamAlias("MemChangeCnt")
+ protected Integer memChangeCnt;
+
+ @XStreamAlias("TagType")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ protected String tagType;
+
@XStreamAlias("WelcomeCode")
@XStreamConverter(value = XStreamCDataConverter.class)
protected String welcomeCode;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index dfa0c63477..c09116d752 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -206,8 +206,17 @@ interface ExternalContact {
String DEL_CORP_TAG = "/cgi-bin/externalcontact/del_corp_tag";
String MARK_TAG = "/cgi-bin/externalcontact/mark_tag";
+ String ADD_MOMENT_TASK = "/cgi-bin/externalcontact/add_moment_task";
+ String GET_MOMENT_TASK_RESULT = "/cgi-bin/externalcontact/get_moment_task_result";
+ String GET_MOMENT_LIST = "/cgi-bin/externalcontact/get_moment_list";
+ String GET_MOMENT_TASK = "/cgi-bin/externalcontact/get_moment_task";
+ String GET_MOMENT_CUSTOMER_LIST = "/cgi-bin/externalcontact/get_moment_customer_list";
+ String GET_MOMENT_SEND_RESULT = "/cgi-bin/externalcontact/get_moment_send_result";
+ String GET_MOMENT_COMMENTS = "/cgi-bin/externalcontact/get_moment_comments";
+
String GET_GROUP_MSG_SEND_RESULT = "/cgi-bin/externalcontact/get_groupmsg_send_result";
String GET_GROUP_MSG_TASK = "/cgi-bin/externalcontact/get_groupmsg_task";
String GET_GROUP_MSG_LIST_V2 = "/cgi-bin/externalcontact/get_groupmsg_list_v2";
+
}
}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
index cfbdcca930..60fdeb9b2e 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
@@ -138,13 +138,13 @@ public void testAddCorpTag() throws WxErrorException {
List list = new ArrayList<>();
WxCpUserExternalTagGroupInfo.Tag tag = new WxCpUserExternalTagGroupInfo.Tag();
tag.setName("测试标签20");
- tag.setOrder(1);
+ tag.setOrder(1L);
list.add(tag);
WxCpUserExternalTagGroupInfo tagGroupInfo = new WxCpUserExternalTagGroupInfo();
WxCpUserExternalTagGroupInfo.TagGroup tagGroup = new WxCpUserExternalTagGroupInfo.TagGroup();
tagGroup.setGroupName("其他");
- tagGroup.setOrder(1);
+ tagGroup.setOrder(1L);
tagGroup.setTag(list);
tagGroupInfo.setTagGroup(tagGroup);
From 6f57d4a5223df965cfda4e4ad973532927f8b4f1 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Sun, 31 Oct 2021 23:33:10 +0800
Subject: [PATCH 0023/1079] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wxpay/bean/marketing/FavorStocksCreateRequest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateRequest.java
index 2225009075..855edc8528 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateRequest.java
@@ -314,8 +314,8 @@ public static class StockUseRule implements Serializable {
@Data
@NoArgsConstructor
public static class PatternInfo implements Serializable {
-
private static final long serialVersionUID = 1L;
+
/**
*
* 字段名：使用说明
@@ -391,14 +391,14 @@ public static class PatternInfo implements Serializable {
*
*/
@SerializedName(value = "coupon_image")
- private Boolean couponImage;
+ private String couponImage;
}
@Data
@NoArgsConstructor
public static class CouponUseRule implements Serializable {
-
private static final long serialVersionUID = 1L;
+
/**
*
* 字段名：券生效时间
From 7b4ba553ac51e995c3204bb754cf351bb6d4c95f Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Sun, 31 Oct 2021 23:48:54 +0800
Subject: [PATCH 0024/1079] =?UTF-8?q?:art:=20#2331=20=E3=80=90=E5=85=AC?=
=?UTF-8?q?=E4=BC=97=E5=8F=B7=E3=80=91=E3=80=90=E5=BC=80=E6=94=BE=E5=B9=B3?=
=?UTF-8?q?=E5=8F=B0=E3=80=91=E6=A0=B9=E6=8D=AE=E5=BE=AE=E4=BF=A1=E5=B9=B3?=
=?UTF-8?q?=E5=8F=B0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=9C=80=E6=96=B0=E8=B0=83=E6=95=B4=E5=8E=BB=E6=8E=89=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=B1=BB=E9=83=A8=E5=88=86=E6=97=A0?=
=?UTF-8?q?=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../weixin/common/bean/WxOAuth2UserInfo.java | 17 -----------------
.../weixin/mp/bean/result/WxMpUser.java | 11 -----------
.../mp/util/json/WxMpUserGsonAdapter.java | 18 ------------------
3 files changed, 46 deletions(-)
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java
index e647560026..69518b2565 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxOAuth2UserInfo.java
@@ -25,23 +25,6 @@ public class WxOAuth2UserInfo implements Serializable {
* nickname 普通用户昵称
*/
private String nickname;
- /**
- * sex 普通用户性别，1为男性，2为女性
- */
- private Integer sex;
- /**
- * city 普通用户个人资料填写的城市
- */
- private String city;
-
- /**
- * province 普通用户个人资料填写的省份
- */
- private String province;
- /**
- * country 国家，如中国为CN
- */
- private String country;
/**
* headimgurl 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），
* 用户没有头像时该项为空
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
index 4d22fab9e9..6edf351d44 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -22,18 +22,7 @@ public class WxMpUser implements Serializable {
private Boolean subscribe;
private String openId;
private String nickname;
- /**
- * 性别描述信息：男、女、未知等.
- */
- private String sexDesc;
- /**
- * 性别表示：1，2等数字.
- */
- private Integer sex;
private String language;
- private String city;
- private String province;
- private String country;
private String headImgUrl;
private Long subscribeTime;
/**
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
index 910ae8c89f..f3a20fbcab 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -20,13 +20,10 @@ public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
if (subscribe != null) {
user.setSubscribe(!new Integer(0).equals(subscribe));
}
- user.setCity(GsonHelper.getString(o, "city"));
- user.setCountry(GsonHelper.getString(o, "country"));
user.setHeadImgUrl(GsonHelper.getString(o, "headimgurl"));
user.setLanguage(GsonHelper.getString(o, "language"));
user.setNickname(GsonHelper.getString(o, "nickname"));
user.setOpenId(GsonHelper.getString(o, "openid"));
- user.setProvince(GsonHelper.getString(o, "province"));
user.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time"));
user.setUnionId(GsonHelper.getString(o, "unionid"));
user.setRemark(GsonHelper.getString(o, "remark"));
@@ -37,21 +34,6 @@ public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
user.setQrScene(GsonHelper.getString(o, "qr_scene"));
user.setQrSceneStr(GsonHelper.getString(o, "qr_scene_str"));
- Integer sex = GsonHelper.getInteger(o, "sex");
- if (sex != null) {
- user.setSex(sex);
- switch (sex) {
- case 1:
- user.setSexDesc("男");
- break;
- case 2:
- user.setSexDesc("女");
- break;
- default:
- user.setSexDesc("未知");
- }
-
- }
return user;
}
From e343159e3a062135794146b3ed9596a12e9ce299 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Sun, 31 Oct 2021 23:51:51 +0800
Subject: [PATCH 0025/1079] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/me/chanjar/weixin/common/util/DataUtils.java | 3 ++-
.../chanjar/weixin/common/util/xml/XStreamInitializer.java | 1 -
.../chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java | 2 +-
.../test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java | 6 +++---
.../binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java | 2 +-
.../chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java | 2 +-
.../binarywang/wxpay/bean/result/WxSignQueryResult.java | 2 ++
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java
index 983d9a668f..b8fb42e0e9 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java
@@ -1,5 +1,6 @@
package me.chanjar.weixin.common.util;
+import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.StringUtils;
/**
@@ -17,7 +18,7 @@ public class DataUtils {
public static E handleDataWithSecret(E data) {
E dataForLog = data;
if(data instanceof String && StringUtils.contains((String)data, "&secret=")){
- dataForLog = (E) StringUtils.replaceAll((String)data,"&secret=\\w+&","&secret=******&");
+ dataForLog = (E) RegExUtils.replaceAll((String)data,"&secret=\\w+&","&secret=******&");
}
return dataForLog;
}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
index 6997eb490d..334d75ee32 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
@@ -80,7 +80,6 @@ protected void setupConverters() {
};
xstream.ignoreUnknownElements();
xstream.setMode(XStream.NO_REFERENCES);
- XStream.setupDefaultSecurity(xstream);
xstream.autodetectAnnotations(true);
// setup proper security by limiting which classes can be loaded by XStream
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
index 2e91aacbf4..739470a2d7 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
@@ -92,7 +92,7 @@ public WxCpConfigStorage getWxCpConfigStorage() {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
index afc596df1b..52bc8e2ab7 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
@@ -49,14 +49,14 @@ private static void initWeixin() throws IOException {
wxCpService = new WxCpServiceImpl();
wxCpService.setWxCpConfigStorage(config);
- WxCpMessageHandler handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> {
+ WxCpMessageHandler handler = (wxMessage, context, wxService, sessionManager) -> {
WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("测试加密消息")
.fromUser(wxMessage.getToUserName())
.toUser(wxMessage.getFromUserName()).build();
return m;
};
- WxCpMessageHandler oauth2handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> {
+ WxCpMessageHandler oauth2handler = (wxMessage, context, wxService, sessionManager) -> {
String href = "测试oauth2";
@@ -78,7 +78,7 @@ private static void initWeixin() throws IOException {
.end()
.rule()
.event(WxCpConsts.EventType.CHANGE_CONTACT)
- .handler((WxCpXmlMessage wxMessage, Map context, WxCpService wxCpService, WxSessionManager sessionManager) -> {
+ .handler((wxMessage, context, wxCpService, sessionManager) -> {
System.out.println("通讯录发生变更");
return null;
})
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
index 7310a8fcd5..dcbe3b3b0b 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
@@ -127,7 +127,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((invocation) -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
index 834ed8cb76..c4b57ff13c 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
@@ -237,7 +237,7 @@ public HttpType getRequestType() {
RequestExecutor re = mock(RequestExecutor.class);
AtomicInteger counter = new AtomicInteger();
- Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> {
+ Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> {
counter.incrementAndGet();
WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build();
throw new WxErrorException(error);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java
index 492c6c9251..abb72a5b79 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java
@@ -3,6 +3,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import org.w3c.dom.Document;
@@ -18,6 +19,7 @@
*
*/
@Data
+@EqualsAndHashCode(callSuper = true)
@AllArgsConstructor
@NoArgsConstructor
public class WxSignQueryResult extends BaseWxPayResult implements Serializable {
From 5f1aa6fc97a8299455816c9581762c742b36c086 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 1 Nov 2021 00:18:42 +0800
Subject: [PATCH 0026/1079] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java | 3 ++-
.../java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java | 3 ++-
.../java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java | 3 +++
.../weixin/cp/bean/external/WxCpAddMomentResult.java | 3 +++
.../weixin/cp/bean/external/WxCpContactWayResult.java | 3 +++
.../weixin/cp/bean/external/WxCpGetMomentComments.java | 3 +++
.../weixin/cp/bean/external/WxCpGetMomentCustomerList.java | 7 ++++++-
.../chanjar/weixin/cp/bean/external/WxCpGetMomentList.java | 3 +++
.../weixin/cp/bean/external/WxCpGetMomentSendResult.java | 3 +++
.../chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java | 3 +++
.../weixin/cp/bean/external/WxCpGetMomentTaskResult.java | 3 +++
.../me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java | 2 ++
.../java/me/chanjar/weixin/open/bean/ma/WxMaScheme.java | 4 ++++
13 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
index 2aa89d2158..5d77c975d5 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
@@ -14,8 +15,8 @@
* @author huangxiaoming
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpTpAdmin extends WxCpBaseResp {
-
private static final long serialVersionUID = -5028321625140879571L;
@SerializedName("admin")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
index 440e7b4df5..c949b0a1ba 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
/**
@@ -9,8 +10,8 @@
* @author huangxiaoming
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpTpUserDetail extends WxCpBaseResp {
-
private static final long serialVersionUID = -5028321625140879571L;
/**
* 用户所属企业的corpid
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
index 6739082faf..0138b2a9d9 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserInfo.java
@@ -2,12 +2,15 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
/**
* @author huangxiaoming
*/
+
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpTpUserInfo extends WxCpBaseResp {
private static final long serialVersionUID = -5028321625140879571L;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
index 3cfd66bb35..8c67c814fc 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentResult.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
@@ -12,7 +13,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpAddMomentResult extends WxCpBaseResp {
+ private static final long serialVersionUID = -7212260280504857210L;
@SerializedName("jobid")
private String jobId;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
index 6bb9c41398..0a49719a95 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
@@ -9,7 +10,9 @@
* 「联系我」方式 处理结果
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpContactWayResult extends WxCpBaseResp {
+ private static final long serialVersionUID = -2612867517869192015L;
@SerializedName("config_id")
private String configId;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
index 0cf49adcaa..6976702612 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
@@ -15,7 +16,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentComments extends WxCpBaseResp {
+ private static final long serialVersionUID = -9056664072546234965L;
@SerializedName("comment_list")
private List commentList;
@SerializedName("like_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
index 795c9520d1..0d144da14f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentCustomerList.java
@@ -1,12 +1,14 @@
package me.chanjar.weixin.cp.bean.external;
import com.google.gson.annotations.SerializedName;
-import java.util.List;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
import me.chanjar.weixin.cp.bean.external.moment.CustomerItem;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+import java.util.List;
+
/**
* 企业发表内容到客户的朋友圈 获取客户朋友圈发表时选择的可见范围
*
@@ -14,7 +16,10 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentCustomerList extends WxCpBaseResp {
+ private static final long serialVersionUID = -8792120670063917097L;
+
@SerializedName("next_cursor")
private String nextCursor;
@SerializedName("customer_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
index 6f4d07288e..6ba154df83 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
import me.chanjar.weixin.cp.bean.external.moment.MomentInfo;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
@@ -14,7 +15,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentList extends WxCpBaseResp {
+ private static final long serialVersionUID = 106159971765109008L;
@SerializedName("next_cursor")
private String nextCursor;
@SerializedName("moment_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
index c7a6f48524..38cd89a454 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
import me.chanjar.weixin.cp.bean.external.moment.CustomerItem;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
@@ -14,7 +15,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentSendResult extends WxCpBaseResp {
+ private static final long serialVersionUID = -5782811995184523379L;
@SerializedName("next_cursor")
private String nextCursor;
@SerializedName("customer_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
index 041d5e8029..aa45bec4ef 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
@@ -15,7 +16,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentTask extends WxCpBaseResp {
+ private static final long serialVersionUID = 5621905029624794129L;
@SerializedName("next_cursor")
private String nextCursor;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
index f7ca6d8f38..019e7fdf1d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
@@ -16,7 +17,9 @@
* @date 2021-10-29
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpGetMomentTaskResult extends WxCpBaseResp {
+ private static final long serialVersionUID = 2515140928288915077L;
private Integer status;
private String type;
private TaskResult result;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java
index b9b1af3c3a..7d372cdfcf 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.io.Serializable;
@@ -10,6 +11,7 @@
* @author element
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxCpApprovalApplier extends WxCpOperator implements Serializable {
private static final long serialVersionUID = -8974662568286821271L;
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaScheme.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaScheme.java
index faa56bec34..a3d9e7af07 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaScheme.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaScheme.java
@@ -1,9 +1,13 @@
package me.chanjar.weixin.open.bean.ma;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import me.chanjar.weixin.open.bean.result.WxOpenResult;
@Data
+@EqualsAndHashCode(callSuper = true)
public class WxMaScheme extends WxOpenResult {
+ private static final long serialVersionUID = 6099475183322341647L;
+
private String openlink;
}
From d5d61a4e1af69c995717ab74b28fed257975e4d0 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 1 Nov 2021 20:52:39 +0800
Subject: [PATCH 0027/1079] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=204.2?=
=?UTF-8?q?.0=20=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
spring-boot-starters/pom.xml | 2 +-
.../wx-java-miniapp-spring-boot-starter/pom.xml | 2 +-
spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml | 2 +-
spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml | 2 +-
spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml | 2 +-
spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml | 2 +-
weixin-graal/pom.xml | 2 +-
weixin-java-common/pom.xml | 2 +-
weixin-java-cp/pom.xml | 2 +-
weixin-java-miniapp/pom.xml | 2 +-
weixin-java-mp/pom.xml | 2 +-
weixin-java-open/pom.xml | 2 +-
weixin-java-pay/pom.xml | 2 +-
weixin-java-qidian/pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 842aae46f1..f2e64f533c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
pom
WxJava - Weixin/Wechat Java SDK
微信开发Java SDK
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 85fe5094b0..c6fbf375fb 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -4,7 +4,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
pom
wx-java-spring-boot-starters
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 743650b256..cd6e6da4be 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
wx-java-spring-boot-starters
com.github.binarywang
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index e62e70040c..aceef96ca7 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
wx-java-spring-boot-starters
com.github.binarywang
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 9545eb445f..78fc9bdc45 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
wx-java-spring-boot-starters
com.github.binarywang
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 074e202146..588f4b8f5a 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
wx-java-spring-boot-starters
com.github.binarywang
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml
index fe8b29ecaa..63cf2f2a56 100644
--- a/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml
@@ -3,7 +3,7 @@
wx-java-spring-boot-starters
com.github.binarywang
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 896a812b5a..7b5d9ad662 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-graal
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 665f0d7b87..c5b0918c95 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-common
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 90edd559fb..85b5738665 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-cp
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 1dba48165a..39d3442b4e 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-miniapp
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 62ebb65b13..86b562160b 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-mp
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 2407c52146..1676d1c01d 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-open
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index acd179ce4b..b6f9dfb246 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
4.0.0
diff --git a/weixin-java-qidian/pom.xml b/weixin-java-qidian/pom.xml
index f36c374918..4576f69186 100644
--- a/weixin-java-qidian/pom.xml
+++ b/weixin-java-qidian/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.1.9.B
+ 4.2.0
weixin-java-qidian
From dd83e1655a14daa7acba93b9db6d664eb3eab702 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 1 Nov 2021 23:50:01 +0800
Subject: [PATCH 0028/1079] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index e8636426c8..cecfc0215d 100644
--- a/README.md
+++ b/README.md
@@ -21,24 +21,21 @@
-
+
+
+ 赞助商招募中，欢迎联系洽谈
+
+
+
-
-
-
-
-
1. 驰骋快速开发平台、工作流/表单引擎采用GPL协议。
-
2. 驰骋.NET版称为ccflow,Java版称为jflow，代码100%开源。
-
3. 支持10多个国内外数据库，有单机版\集团版\SAAS版本。
-
### 重要信息
-1. **2021-06-02 发布 [【4.1.0正式版】](https://mp.weixin.qq.com/s/nIk_xOf6dxkhKfqq830Cuw)**！
+1. **2021-11-01 发布 [【4.2.0正式版】](https://mp.weixin.qq.com/s/nIk_xOf6dxkhKfqq830Cuw)**！
1. 新手重要提示：本项目仅是一个SDK开发工具包，未提供Web实现，建议使用 `maven` 或 `gradle` 引用本项目即可使用本SDK提供的各种功能，详情可参考 **[【Demo项目】](demo.md)** 或本项目中的部分单元测试代码；另外微信开发新手请务必阅读[【开发文档 Wiki 首页】](https://github.com/Wechat-Group/WxJava/wiki)的常见问题部分，可以少走很多弯路，节省不少时间。
1. 技术交流群：想获得QQ群/微信群/钉钉企业群等信息的同学，请使用微信扫描上面的微信公众号二维码关注 `WxJava` 后点击相关菜单即可获取加入方式，同时也可以在微信中搜索 `weixin-java-tools` 或 `WxJava` 后选择正确的公众号进行关注，该公众号会及时通知SDK相关更新信息，并不定期分享微信Java开发相关技术知识；
1. 钉钉技术交流群：`32206329`（技术交流2群）, `30294972`（技术交流1群，目前已满），`35724728`（通知群，实时通知Github项目变更记录）。
From 88301a619251c9b4a3c87f71c2e4117443f4661d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E5=AE=89?=
Date: Wed, 3 Nov 2021 23:20:33 +0800
Subject: [PATCH 0029/1079] =?UTF-8?q?:new:=20#2372=E3=80=90=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E3=80=91=E6=96=B0=E5=A2=9E=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E7=BE=A4opengid=E8=BD=AC=E6=8D=A2=E5=92=8C=E5=85=A5?=
=?UTF-8?q?=E7=BE=A4=E6=AC=A2=E8=BF=8E=E8=AF=AD=E7=B4=A0=E6=9D=90=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cp/api/WxCpExternalContactService.java | 99 +++++++++++----
.../impl/WxCpExternalContactServiceImpl.java | 120 +++++++++++++-----
.../WxCpGroupWelcomeTemplateResult.java | 45 +++++++
.../weixin/cp/constant/WxCpApiPathConsts.java | 6 +
4 files changed, 216 insertions(+), 54 deletions(-)
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index d252fb831e..396bbe4a9c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -3,31 +3,7 @@
import lombok.NonNull;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
-import me.chanjar.weixin.cp.bean.external.WxCpAddMomentResult;
-import me.chanjar.weixin.cp.bean.external.WxCpAddMomentTask;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayResult;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentComments;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentCustomerList;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentList;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentSendResult;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTask;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTaskResult;
-import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplate;
-import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplateAddResult;
-import me.chanjar.weixin.cp.bean.external.WxCpUpdateRemarkRequest;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatStatistic;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatTransferResp;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalTagGroupInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalTagGroupList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalUnassignList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalUserBehaviorStatistic;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferCustomerReq;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferCustomerResp;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferResultResp;
-import me.chanjar.weixin.cp.bean.external.WxCpWelcomeMsg;
+import me.chanjar.weixin.cp.bean.external.*;
import me.chanjar.weixin.cp.bean.external.contact.*;
import me.chanjar.weixin.cp.bean.oa.WxCpApprovalInfoQueryFilter;
import org.jetbrains.annotations.NotNull;
@@ -191,6 +167,30 @@ public interface WxCpExternalContactService {
*/
String unionidToExternalUserid(@NotNull String unionid,String openid) throws WxErrorException;
+ /**
+ * 客户群opengid转换
+ *
+ *
+ * 文档地址：https://open.work.weixin.qq.com/api/doc/90000/90135/94822
+ *
+ * 用户在微信里的客户群里打开小程序时，某些场景下可以获取到群的opengid，如果该群是企业微信的客户群，
+ * 则企业或第三方可以调用此接口将一个opengid转换为客户群chat_id
+ *
+ * 权限说明：
+ *
+ * 企业需要使用“客户联系”secret或配置到“可调用应用”列表中的自建应用secret所获取的accesstoken来调用（accesstoken如何获取？）
+ * 第三方应用需具有“企业客户权限->客户基础信息”权限
+ * 对于第三方/自建应用，群主必须在应用的可见范围
+ * 仅支持企业服务人员创建的客户群
+ * 仅可转换出自己企业下的客户群chat_id
+ *
+ *
+ * @param opengid 小程序在微信获取到的群ID，参见wx.getGroupEnterInfo(https://developers.weixin.qq.com/miniprogram/dev/api/open-api/group/wx.getGroupEnterInfo.html)
+ * @return 客户群ID，可以用来调用获取客户群详情
+ * @throws WxErrorException .
+ */
+ String opengidToChatid(@NotNull String opengid) throws WxErrorException;
+
/**
* 批量获取客户详情.
*
@@ -740,4 +740,53 @@ WxCpGetMomentComments getMomentComments(String momentId, String userId)
*/
WxCpGroupMsgTaskResult getGroupMsgTask(String msgid, Integer limit, String cursor) throws WxErrorException;
+ /**
+ *
+ * 添加入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#添加入群欢迎语素材
+ *
+ *
+ * @param template 素材内容
+ * @return template_id 欢迎语素材id
+ * @throws WxErrorException the wx error exception
+ */
+ String addGroupWelcomeTemplate(WxCpGroupWelcomeTemplateResult template) throws WxErrorException;
+
+ /**
+ *
+ * 编辑入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#编辑入群欢迎语素材
+ *
+ *
+ * @param template
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpBaseResp editGroupWelcomeTemplate(WxCpGroupWelcomeTemplateResult template) throws WxErrorException;
+
+ /**
+ *
+ * 获取入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#获取入群欢迎语素材
+ *
+ *
+ * @param templateId 群欢迎语的素材id
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpGroupWelcomeTemplateResult getGroupWelcomeTemplate(@NotNull String templateId) throws WxErrorException;
+
+ /**
+ *
+ * 删除入群欢迎语素材。
+ * 企业可通过此API删除入群欢迎语素材，且仅能删除调用方自己创建的入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#删除入群欢迎语素材
+ *
+ *
+ * @param templateId 群欢迎语的素材id
+ * @param templateId 授权方安装的应用agentid。仅旧的第三方多应用套件需要填此参数
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpBaseResp delGroupWelcomeTemplate(@NotNull String templateId, String agentId) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 72c2c93b90..19937e3827 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -12,33 +12,7 @@
import me.chanjar.weixin.cp.api.WxCpExternalContactService;
import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.WxCpBaseResp;
-import me.chanjar.weixin.cp.bean.external.WxCpAddMomentResult;
-import me.chanjar.weixin.cp.bean.external.WxCpAddMomentTask;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayResult;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentComments;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentCustomerList;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentList;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentSendResult;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTask;
-import me.chanjar.weixin.cp.bean.external.WxCpGetMomentTaskResult;
-import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplate;
-import me.chanjar.weixin.cp.bean.external.WxCpMsgTemplateAddResult;
-import me.chanjar.weixin.cp.bean.external.WxCpUpdateRemarkRequest;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalContactList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatStatistic;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatTransferResp;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalTagGroupInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalTagGroupList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalUnassignList;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalUserBehaviorStatistic;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferCustomerReq;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferCustomerResp;
-import me.chanjar.weixin.cp.bean.external.WxCpUserTransferResultResp;
-import me.chanjar.weixin.cp.bean.external.WxCpUserWithExternalPermission;
-import me.chanjar.weixin.cp.bean.external.WxCpWelcomeMsg;
+import me.chanjar.weixin.cp.bean.external.*;
import me.chanjar.weixin.cp.bean.external.contact.*;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@@ -157,6 +131,16 @@ public String unionidToExternalUserid(@NotNull String unionid,String openid) thr
return tmpJson.get("external_userid").getAsString();
}
+ @Override
+ public String opengidToChatid(@NotNull String opengid) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("opengid",opengid);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(OPENID_TO_CHATID);
+ String responseContent = this.mainService.post(url, json.toString());
+ JsonObject tmpJson = GsonParser.parse(responseContent);
+ return tmpJson.get("chat_id").getAsString();
+ }
+
@Override
public WxCpExternalContactBatchInfo getContactDetailBatch(String[] userIdList,
String cursor,
@@ -586,7 +570,7 @@ public WxCpGroupMsgListResult getGroupMsgListV2(String chatType, @NonNull Date s
json.addProperty("limit", limit);
json.addProperty("cursor", cursor);
- final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_SEND_RESULT);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_LIST_V2);
final String result = this.mainService.post(url, json.toString());
return WxCpGroupMsgListResult.fromJson(result);
}
@@ -636,8 +620,86 @@ public WxCpGroupMsgTaskResult getGroupMsgTask(String msgid, Integer limit, Strin
json.addProperty("limit", limit);
json.addProperty("cursor", cursor);
- final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_SEND_RESULT);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_GROUP_MSG_TASK);
final String result = this.mainService.post(url, json.toString());
return WxCpGroupMsgTaskResult.fromJson(result);
}
+
+ /**
+ *
+ * 添加入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#添加入群欢迎语素材
+ *
+ *
+ * @param template 素材内容
+ * @return template_id 欢迎语素材id
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public String addGroupWelcomeTemplate(WxCpGroupWelcomeTemplateResult template) throws WxErrorException {
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_WELCOME_TEMPLATE_ADD);
+ final String responseContent = this.mainService.post(url, template.toJson());
+ JsonObject tmpJson = GsonParser.parse(responseContent);
+ return tmpJson.get("template_id").getAsString();
+ }
+
+ /**
+ *
+ * 编辑入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#编辑入群欢迎语素材
+ *
+ *
+ * @param template
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpBaseResp editGroupWelcomeTemplate(WxCpGroupWelcomeTemplateResult template) throws WxErrorException {
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_WELCOME_TEMPLATE_EDIT);
+ final String result = this.mainService.post(url, template.toJson());
+ return WxCpGroupWelcomeTemplateResult.fromJson(result);
+ }
+
+ /**
+ *
+ * 获取入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#获取入群欢迎语素材
+ *
+ *
+ * @param templateId 群欢迎语的素材id
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpGroupWelcomeTemplateResult getGroupWelcomeTemplate(@NotNull String templateId) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("template_id", templateId);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_WELCOME_TEMPLATE_GET);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpGroupWelcomeTemplateResult.fromJson(result);
+ }
+
+ /**
+ *
+ * 删除入群欢迎语素材。
+ * 企业可通过此API删除入群欢迎语素材，且仅能删除调用方自己创建的入群欢迎语素材。
+ * https://open.work.weixin.qq.com/api/doc/90000/90135/92366#删除入群欢迎语素材
+ *
+ *
+ * @param templateId 群欢迎语的素材id
+ * @param agentId
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpBaseResp delGroupWelcomeTemplate(@NotNull String templateId, String agentId) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("template_id", templateId);
+ if (!StringUtils.isEmpty(agentId)) {
+ json.addProperty("agentid", agentId);
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_WELCOME_TEMPLATE_DEL);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpBaseResp.fromJson(result);
+ }
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
new file mode 100644
index 0000000000..5b92a02098
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
@@ -0,0 +1,45 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.bean.external.msg.*;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 入群欢迎语素材.
+ *
+ * @author Mr.Pan
+ * @date 2021-11-3
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxCpGroupWelcomeTemplateResult extends WxCpBaseResp implements Serializable {
+ private static final long serialVersionUID = -6406667238670580612L;
+
+ private Text text;
+
+ private Image image;
+
+ private Link link;
+
+ private MiniProgram miniprogram;
+
+ private File file;
+
+ private Video video;
+
+ public static WxCpGroupWelcomeTemplateResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpGroupWelcomeTemplateResult.class);
+ }
+
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index c09116d752..ddc56d133e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -194,6 +194,7 @@ interface ExternalContact {
String RESIGNED_TRANSFER_RESULT = "/cgi-bin/externalcontact/resigned/transfer_result";
String GROUP_CHAT_LIST = "/cgi-bin/externalcontact/groupchat/list";
String GROUP_CHAT_INFO = "/cgi-bin/externalcontact/groupchat/get";
+ String OPENID_TO_CHATID= "/cgi-bin/externalcontact/opengid_to_chatid";
String GROUP_CHAT_TRANSFER = "/cgi-bin/externalcontact/groupchat/transfer";
String LIST_USER_BEHAVIOR_DATA = "/cgi-bin/externalcontact/get_user_behavior_data";
String LIST_GROUP_CHAT_DATA = "/cgi-bin/externalcontact/groupchat/statistic";
@@ -218,5 +219,10 @@ interface ExternalContact {
String GET_GROUP_MSG_TASK = "/cgi-bin/externalcontact/get_groupmsg_task";
String GET_GROUP_MSG_LIST_V2 = "/cgi-bin/externalcontact/get_groupmsg_list_v2";
+ String GROUP_WELCOME_TEMPLATE_ADD = "/cgi-bin/externalcontact/group_welcome_template/add";
+ String GROUP_WELCOME_TEMPLATE_EDIT = "/cgi-bin/externalcontact/group_welcome_template/edit";
+ String GROUP_WELCOME_TEMPLATE_GET = "/cgi-bin/externalcontact/group_welcome_template/get";
+ String GROUP_WELCOME_TEMPLATE_DEL = "/cgi-bin/externalcontact/group_welcome_template/del";
+
}
}
From bb6bec04b1202ce319a0a7ff7470252ae0d9f62b Mon Sep 17 00:00:00 2001
From: ray Wang
Date: Mon, 8 Nov 2021 18:44:57 +0800
Subject: [PATCH 0030/1079] =?UTF-8?q?:new:=20#2379=20=E3=80=90=E5=BE=AE?=
=?UTF-8?q?=E4=BF=A1=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0=E3=80=91=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E4=B8=AA=E4=BA=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BF=AB?=
=?UTF-8?q?=E9=80=9F=E6=B3=A8=E5=86=8C=E5=92=8C=E8=AF=95=E7=94=A8=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BF=AB=E9=80=9F=E6=B3=A8=E5=86=8C=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../open/api/WxOpenComponentService.java | 48 +++++++++++++++++++
.../api/impl/WxOpenComponentServiceImpl.java | 28 +++++++++++
.../open/bean/message/WxOpenXmlMessage.java | 15 ++++++
.../result/WxOpenRegisterBetaWeappResult.java | 14 ++++++
.../WxOpenRegisterPersonalWeappResult.java | 15 ++++++
5 files changed, 120 insertions(+)
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterBetaWeappResult.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterPersonalWeappResult.java
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java
index c25acdf1aa..d56d8d4329 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java
@@ -120,6 +120,21 @@ public interface WxOpenComponentService {
*/
String FAST_REGISTER_WEAPP_SEARCH_URL = "https://api.weixin.qq.com/cgi-bin/component/fastregisterweapp?action=search";
+ /**
+ * 快速创建个人小程序接口.
+ */
+ String FAST_REGISTER_PERSONAL_WEAPP_URL = "https://api.weixin.qq.com/wxa/component/fastregisterpersonalweapp?action=create";
+
+ /**
+ * 查询快速创建个人小程序任务状态接口.
+ */
+ String FAST_REGISTER_PERSONAL_WEAPP_SEARCH_URL = "https://api.weixin.qq.com/wxa/component/fastregisterpersonalweapp?action=query";
+
+ /**
+ * 快速创建试用小程序接口.
+ */
+ String FAST_REGISTER_BETA_WEAPP_URL = "https://api.weixin.qq.com/wxa/component/fastregisterbetaweapp";
+
/**
* 代小程序实现业务.
* 小程序代码模版库管理：https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1506504150_nMMh6&token=&lang=zh_CN
@@ -581,6 +596,39 @@ public interface WxOpenComponentService {
WxOpenResult fastRegisterWeappSearch(String name, String legalPersonaWechat, String legalPersonaName) throws WxErrorException;
+ /**
+ * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/Register_Mini_Programs/fastregisterpersonalweapp.html
+ * 快速创建个人小程序
+ *
+ * @param idname 个人用户名字
+ * @param wxuser 个人用户微信号
+ * @param componentPhone 第三方联系电话
+ * @return the wx open result
+ * @throws WxErrorException
+ */
+ WxOpenRegisterPersonalWeappResult fastRegisterPersonalWeapp(String idname, String wxuser, String componentPhone) throws WxErrorException;
+
+ /**
+ * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/Register_Mini_Programs/fastregisterpersonalweapp.html
+ * 查询个人小程序注册任务状态
+ *
+ * @param taskid 任务ID
+ * @return the wx open result
+ * @throws WxErrorException
+ */
+ WxOpenRegisterPersonalWeappResult fastRegisterPersonalWeappSearch(String taskid) throws WxErrorException;
+
+ /**
+ * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/beta_Mini_Programs/fastregister.html
+ * 注册试用小程序
+ *
+ * @param name 小程序名称
+ * @param openid 微信用户的openid（不是微信号）
+ * @return the wx open result
+ * @throws WxErrorException
+ */
+ WxOpenRegisterBetaWeappResult fastRegisterBetaWeapp(String name, String openid) throws WxErrorException;
+
/**
* https://api.weixin.qq.com/product/register/register_shop?component_access_token=xxxxxxxxx
* 注册小商店账号
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
index ac71523a7e..28bd71cb54 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
@@ -626,6 +626,34 @@ public WxOpenResult fastRegisterWeappSearch(String name, String legalPersonaWech
return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
}
+ @Override
+ public WxOpenRegisterPersonalWeappResult fastRegisterPersonalWeapp(String idname, String wxuser, String componentPhone) throws WxErrorException {
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("idname", idname);
+ jsonObject.addProperty("wxuser", wxuser);
+ jsonObject.addProperty("component_phone", componentPhone);
+ String response = post(FAST_REGISTER_PERSONAL_WEAPP_URL, jsonObject.toString(), "component_access_token");
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenRegisterPersonalWeappResult.class);
+ }
+
+ @Override
+ public WxOpenRegisterPersonalWeappResult fastRegisterPersonalWeappSearch(String taskid) throws WxErrorException {
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("taskid", taskid);
+ String response = post(FAST_REGISTER_PERSONAL_WEAPP_SEARCH_URL, jsonObject.toString(), "component_access_token");
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenRegisterPersonalWeappResult.class);
+ }
+
+ @Override
+ public WxOpenRegisterBetaWeappResult fastRegisterBetaWeapp(String name, String openid) throws WxErrorException {
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("name", name);
+ jsonObject.addProperty("openid", openid);
+ String response = wxOpenService.getWxOpenComponentService()
+ .post(FAST_REGISTER_BETA_WEAPP_URL, jsonObject.toString(), "access_token");
+ return WxOpenGsonBuilder.create().fromJson(response, WxOpenRegisterBetaWeappResult.class);
+ }
+
@Override
public WxOpenResult registerShop(String wxName, String idCardName, String idCardNumber, String channelId, Integer apiOpenstoreType, String authPageUrl) throws WxErrorException {
JsonObject jsonObject = new JsonObject();
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
index 7a41355920..a79a7a9af0 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
@@ -102,6 +102,21 @@ public static class Info implements Serializable {
@XStreamAlias("component_phone")
@XStreamConverter(value = XStreamCDataConverter.class)
private String componentPhone;
+
+ // 创建个人小程序审核通知数据
+ @XStreamAlias("wxuser")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String wxuser;
+
+ @XStreamAlias("idname")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String idname;
+
+ // 创建试用小程序成功/失败的通知数据
+ @XStreamAlias("unique_id")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String uniqueId;
+
}
public static String wxMpOutXmlMessageToEncryptedXml(WxMpXmlOutMessage message, WxOpenConfigStorage wxOpenConfigStorage) {
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterBetaWeappResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterBetaWeappResult.java
new file mode 100644
index 0000000000..735a26eca8
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterBetaWeappResult.java
@@ -0,0 +1,14 @@
+package me.chanjar.weixin.open.bean.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxOpenRegisterBetaWeappResult extends WxOpenResult {
+ @SerializedName("authorize_url")
+ private String authorizeUrl;
+ @SerializedName("unique_id")
+ protected String uniqueId;
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterPersonalWeappResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterPersonalWeappResult.java
new file mode 100644
index 0000000000..18ef23e39d
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenRegisterPersonalWeappResult.java
@@ -0,0 +1,15 @@
+package me.chanjar.weixin.open.bean.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxOpenRegisterPersonalWeappResult extends WxOpenResult {
+ private String taskid;
+ @SerializedName("authorize_url")
+ private String authorizeUrl;
+ @SerializedName("status")
+ private Integer status;
+}
From def6856b020ae6c4976f02875fefe8e8b1ea5336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=95=87=E6=B6=9B?=
Date: Mon, 8 Nov 2021 21:00:55 +0800
Subject: [PATCH 0031/1079] =?UTF-8?q?:new:=20#2373=20=E3=80=90=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91urllink=E7=94=9F=E6=88=90=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0env=5Fversion=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E7=8E=AF=E5=A2=83=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bean/urllink/GenerateUrlLinkRequest.java | 14 +++++++++++++-
.../miniapp/api/impl/WxMaLinkServiceImplTest.java | 15 +++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/urllink/GenerateUrlLinkRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/urllink/GenerateUrlLinkRequest.java
index 207aa3deee..9578e76949 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/urllink/GenerateUrlLinkRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/urllink/GenerateUrlLinkRequest.java
@@ -1,9 +1,10 @@
package cn.binarywang.wx.miniapp.bean.urllink;
-import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.io.Serializable;
@@ -16,6 +17,8 @@
*/
@Data
@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class GenerateUrlLinkRequest implements Serializable {
private static final long serialVersionUID = -2183685760797791910L;
@@ -36,6 +39,15 @@ public class GenerateUrlLinkRequest implements Serializable {
*/
private String query;
+ /**
+ * 要打开的小程序版本。正式版为"release"，体验版为"trial"，开发版为"develop"，仅在微信外打开时生效。
+ *
+ * 是否必填： 否
+ *
+ */
+ @SerializedName("env_version")
+ private String envVersion = "release";
+
/**
* 生成的 URL Link 类型，到期失效：true，永久有效：false
*
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLinkServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLinkServiceImplTest.java
index c97e11077d..8774affc0e 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLinkServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLinkServiceImplTest.java
@@ -5,12 +5,14 @@
import cn.binarywang.wx.miniapp.bean.urllink.GenerateUrlLinkRequest;
import cn.binarywang.wx.miniapp.test.ApiTestModule;
import com.google.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.testng.annotations.Guice;
import org.testng.annotations.Test;
@Test
@Guice(modules = ApiTestModule.class)
+@Slf4j
public class WxMaLinkServiceImplTest {
@Inject
private WxMaService wxMaService;
@@ -34,4 +36,17 @@ public void testGenerateShortLink() throws WxErrorException {
System.out.println("generate:");
System.out.println(generate);
}
+
+ /**
+ * 多版本链接生成测试
+ * 开发时,仅支持IOS设备打开体验版及开发版
+ */
+ @Test
+ public void testGenerateMultiEnvUrlLink() throws WxErrorException {
+ String url = this.wxMaService.getLinkService().generateUrlLink(GenerateUrlLinkRequest.builder()
+ .path("")
+ .envVersion("trial")
+ .build());
+ log.info("generate url link = {}", url);
+ }
}
From 23a115fdee69f6fe555a9ac28a023ca30390cf04 Mon Sep 17 00:00:00 2001
From: tt <30398051+zhentang3@users.noreply.github.com>
Date: Mon, 8 Nov 2021 21:03:18 +0800
Subject: [PATCH 0032/1079] =?UTF-8?q?:art:=20#2375=20=E3=80=90=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91urlscheme=E7=94=9F=E6=88=90=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bean/scheme/WxMaGenerateSchemeRequest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
index 80c5f90347..f8ef32b2fd 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/scheme/WxMaGenerateSchemeRequest.java
@@ -39,12 +39,6 @@ public class WxMaGenerateSchemeRequest {
@SerializedName("expire_time")
private Long expireTime;
- /**
- * 要打开的小程序版本。正式版为"release"，体验版为"trial"，开发版为"develop"默认值：release
- */
- @SerializedName("env_version")
- private String envVersion = "release";
-
@Data
@Builder(builderMethodName = "newBuilder")
public static class JumpWxa {
@@ -66,6 +60,12 @@ public static class JumpWxa {
*/
@SerializedName("query")
private String query;
+
+ /**
+ * 要打开的小程序版本。正式版为"release"，体验版为"trial"，开发版为"develop"默认值：release
+ */
+ @SerializedName("env_version")
+ private String envVersion = "release";
}
public String toJson() {
From ef99e3d24f17d6e8df60c6b16f7ea0522cc8d3bb Mon Sep 17 00:00:00 2001
From: hywr <33077958+hywr@users.noreply.github.com>
Date: Sun, 14 Nov 2021 21:29:00 +0800
Subject: [PATCH 0033/1079] =?UTF-8?q?:new:=20#2385=20=E3=80=90=E5=BC=80?=
=?UTF-8?q?=E6=94=BE=E5=B9=B3=E5=8F=B0=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E4=B8=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=BE=E7=BD=AE=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E9=9A=90=E7=A7=81=E6=8C=87=E5=BC=95=E7=9A=84=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chanjar/weixin/common/error/WxError.java | 7 +
.../open/api/WxOpenMaPrivacyService.java | 65 +++++++
.../weixin/open/api/WxOpenMaService.java | 7 +
.../api/impl/WxOpenMaPrivacyServiceImpl.java | 55 ++++++
.../open/api/impl/WxOpenMaServiceImpl.java | 4 +
.../ma/privacy/GetPrivacySettingResult.java | 118 +++++++++++
.../open/bean/ma/privacy/PrivacyKeyEnum.java | 62 ++++++
.../bean/ma/privacy/PrivacyOwnerSetting.java | 65 +++++++
.../bean/ma/privacy/SetPrivacySetting.java | 68 +++++++
.../ma/privacy/UploadPrivacyFileResult.java | 22 +++
.../GenericUploadRequestExecutor.java | 184 ++++++++++++++++++
11 files changed, 657 insertions(+)
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaPrivacyService.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaPrivacyServiceImpl.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/GetPrivacySettingResult.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyKeyEnum.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyOwnerSetting.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/SetPrivacySetting.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/UploadPrivacyFileResult.java
create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxError.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxError.java
index f1be843827..044086496d 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxError.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxError.java
@@ -2,6 +2,7 @@
import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.enums.WxType;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import org.apache.commons.lang3.StringUtils;
@@ -17,6 +18,7 @@
* @author Daniel Qian & Binary Wang
*/
@Data
+@NoArgsConstructor
@Builder
public class WxError implements Serializable {
private static final long serialVersionUID = 7869786563361406291L;
@@ -39,6 +41,11 @@ public class WxError implements Serializable {
private String json;
+ public WxError(int errorCode, String errorMsg) {
+ this.errorCode = errorCode;
+ this.errorMsg = errorMsg;
+ }
+
public static WxError fromJson(String json) {
return fromJson(json, null);
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaPrivacyService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaPrivacyService.java
new file mode 100644
index 0000000000..4bf78f53bc
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaPrivacyService.java
@@ -0,0 +1,65 @@
+package me.chanjar.weixin.open.api;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.open.bean.ma.privacy.GetPrivacySettingResult;
+import me.chanjar.weixin.open.bean.ma.privacy.SetPrivacySetting;
+import me.chanjar.weixin.open.bean.ma.privacy.UploadPrivacyFileResult;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * 微信第三方平台 小程序用户隐私保护指引接口
+ * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+ *
+ * @author 广州跨界
+ */
+public interface WxOpenMaPrivacyService {
+
+ /**
+ * 1 设置小程序用户隐私保护指引
+ */
+ String OPEN_SET_PRIVACY_SETTING = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting";
+
+ /**
+ * 2 查询小程序用户隐私保护指引
+ */
+ String OPEN_GET_PRIVACY_SETTING = "https://api.weixin.qq.com/cgi-bin/component/getprivacysetting";
+
+ /**
+ * 3 上传小程序用户隐私保护指引文件
+ */
+ String OPEN_UPLOAD_PRIVACY_FILE = "https://api.weixin.qq.com/cgi-bin/component/uploadprivacyextfile";
+
+
+ /**
+ * 查询小程序用户隐私保护指引
+ * 文档地址:https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/get_privacy_setting.html
+ *
+ * @param privacyVer 1表示现网版本，即，传1则该接口返回的内容是现网版本的；2表示开发版，即，传2则该接口返回的内容是开发版本的。默认是2。
+ * @return 查询结果
+ * @throws WxErrorException 如果出错,抛出此异常
+ */
+ GetPrivacySettingResult getPrivacySetting(@Nullable Integer privacyVer) throws WxErrorException;
+
+
+ /**
+ * 设置小程序用户隐私保护指引
+ * 文档地址:https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+ *
+ * @param dto 参数对象
+ * @throws WxErrorException 如果出错,抛出此异常
+ */
+ void setPrivacySetting(SetPrivacySetting dto) throws WxErrorException;
+
+
+ /**
+ * 上传小程序用户隐私保护指引文件
+ * 本接口用于上传自定义的小程序的用户隐私保护指引
+ * 仅限文本文件, 限制文件大小为不超过100kb，否则会报错
+ * 文档地址:https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/upload_privacy_exfile.html
+ *
+ * @param content 文本文件内容
+ * @return 上传结果
+ * @throws WxErrorException 如果出错,抛出此异常
+ */
+ UploadPrivacyFileResult uploadPrivacyFile(String content) throws WxErrorException;
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
index cbb4b23783..f907ff9be6 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
@@ -632,6 +632,13 @@ WxOpenMaDomainResult modifyDomain(String action, List requestDomains, Li
*/
WxOpenMaBasicService getBasicService();
+ /**
+ * 小程序用户隐私保护指引服务
+ *
+ * @return 小程序用户隐私保护指引服务
+ */
+ WxOpenMaPrivacyService getPrivacyService();
+
/**
* 小程序审核 提审素材上传接口
*
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaPrivacyServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaPrivacyServiceImpl.java
new file mode 100644
index 0000000000..f7deb523c6
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaPrivacyServiceImpl.java
@@ -0,0 +1,55 @@
+package me.chanjar.weixin.open.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import me.chanjar.weixin.common.error.WxError;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.open.api.WxOpenMaPrivacyService;
+import me.chanjar.weixin.open.bean.ma.privacy.GetPrivacySettingResult;
+import me.chanjar.weixin.open.bean.ma.privacy.SetPrivacySetting;
+import me.chanjar.weixin.open.bean.ma.privacy.UploadPrivacyFileResult;
+import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信第三方平台 小程序用户隐私保护指引接口
+ * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+ *
+ * @author 广州跨界
+ */
+@AllArgsConstructor
+public class WxOpenMaPrivacyServiceImpl implements WxOpenMaPrivacyService {
+
+ private final WxMaService wxMaService;
+
+
+ @Override
+ public GetPrivacySettingResult getPrivacySetting(@Nullable Integer privacyVer) throws WxErrorException {
+ Map params = new HashMap<>();
+ if (privacyVer != null) {
+ params.put("privacy_ver", privacyVer);
+ }
+ String json = wxMaService.post(OPEN_GET_PRIVACY_SETTING, params);
+ return WxOpenGsonBuilder.create().fromJson(json, GetPrivacySettingResult.class);
+ }
+
+ @Override
+ public void setPrivacySetting(SetPrivacySetting dto) throws WxErrorException {
+ wxMaService.post(OPEN_SET_PRIVACY_SETTING, dto);
+ }
+
+ @SneakyThrows
+ @Override
+ public UploadPrivacyFileResult uploadPrivacyFile(String content) throws WxErrorException {
+ // TODO 应实现通过InputStream上传的功能，一下代码暂时无法正常运行
+// ByteArrayInputStream data = new ByteArrayInputStream(content.getBytes("GBK"));
+// GenericUploadRequestExecutor executor = new GenericUploadRequestExecutor(wxMaService.getRequestHttp(), "POST", "file", "/temp.txt");
+// String json = wxMaService.execute(executor, OPEN_UPLOAD_PRIVACY_FILE, data);
+// return WxOpenGsonBuilder.create().fromJson(json, UploadPrivacyFileResult.class);
+ throw new WxErrorException(new WxError(5003, "暂未实现用户隐私指引内容上传"));
+ }
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
index 4fb637b393..7188a669c2 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
@@ -15,6 +15,7 @@
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.open.api.WxOpenComponentService;
import me.chanjar.weixin.open.api.WxOpenMaBasicService;
+import me.chanjar.weixin.open.api.WxOpenMaPrivacyService;
import me.chanjar.weixin.open.api.WxOpenMaService;
import me.chanjar.weixin.open.bean.ma.WxMaQrcodeParam;
import me.chanjar.weixin.open.bean.ma.WxMaScheme;
@@ -42,12 +43,15 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ
private final String appId;
@Getter
private final WxOpenMaBasicService basicService;
+ @Getter
+ private final WxOpenMaPrivacyService privacyService;
public WxOpenMaServiceImpl(WxOpenComponentService wxOpenComponentService, String appId, WxMaConfig wxMaConfig) {
this.wxOpenComponentService = wxOpenComponentService;
this.appId = appId;
this.wxMaConfig = wxMaConfig;
this.basicService = new WxOpenMaBasicServiceImpl(this);
+ this.privacyService = new WxOpenMaPrivacyServiceImpl(this);
initHttp();
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/GetPrivacySettingResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/GetPrivacySettingResult.java
new file mode 100644
index 0000000000..a3b0a6ef1b
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/GetPrivacySettingResult.java
@@ -0,0 +1,118 @@
+package me.chanjar.weixin.open.bean.ma.privacy;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.open.bean.result.WxOpenResult;
+
+import java.util.List;
+
+/**
+ * 查询小程序用户隐私保护指引 响应
+ *
+ * @author 广州跨界
+ */
+@Getter
+@Setter
+public class GetPrivacySettingResult extends WxOpenResult {
+
+ /**
+ * 代码是否存在， 0 不存在， 1 存在 。如果最近没有通过commit接口上传代码，则会出现 code_exist=0的情况。
+ */
+ @SerializedName("code_exist")
+ private Integer codeExist;
+
+ /**
+ * 代码检测出来的用户信息类型（privacy_key）
+ */
+ @SerializedName("privacy_list")
+ private List privacyList;
+
+ /**
+ * 要收集的用户信息配置
+ */
+ @SerializedName("setting_list")
+ private List settingList;
+
+ /**
+ * 更新时间
+ */
+ @SerializedName("update_time")
+ private Long updateTime;
+
+ /**
+ * 收集方（开发者）信息配置
+ */
+ @SerializedName("owner_setting")
+ private PrivacyOwnerSetting ownerSetting;
+
+ /**
+ * 收集方（开发者）信息配置
+ */
+ @SerializedName("privacy_desc")
+ private PrivacyDesc privacyDesc;
+
+
+ @Data
+ public static class Setting {
+
+ /**
+ * 官方的可选值参考下方说明；该字段也支持自定义
+ *
+ * @see PrivacyKeyEnum
+ * @see PrivacyKeyEnum#getKey()
+ */
+ @SerializedName("privacy_key")
+ private String privacyKey;
+
+ /**
+ * 请填写收集该信息的用途。例如privacy_key=Location（位置信息），那么privacy_text则填写收集位置信息的用途。
+ * 无需再带上“为了”或者“用于”这些字眼，小程序端的显示格式是为了xxx，因此开发者只需要直接填写用途即可。
+ */
+ @SerializedName("privacy_text")
+ private String privacyText;
+
+ /**
+ * 用户信息类型的中文名称
+ *
+ * @see PrivacyKeyEnum#getDesc() ()
+ */
+ @SerializedName("privacy_label")
+ private String privacyLabel;
+ }
+
+
+ @Data
+ public static class PrivacyDesc {
+
+ /**
+ * 用户信息类型
+ */
+ @SerializedName("privacy_desc_list")
+ private List privacyDescList;
+ }
+
+ @Data
+ public static class PrivacyDescItem {
+
+ /**
+ * 用户信息类型的英文key
+ *
+ * @see PrivacyKeyEnum
+ * @see PrivacyKeyEnum#getKey()
+ */
+ @SerializedName("privacy_key")
+ private String privacyKey;
+
+ /**
+ * 用户信息类型的中文描述
+ *
+ * @see PrivacyKeyEnum#getDesc()
+ */
+ @SerializedName("privacy_desc")
+ private String privacyDesc;
+ }
+
+
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyKeyEnum.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyKeyEnum.java
new file mode 100644
index 0000000000..c3d6af281a
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyKeyEnum.java
@@ -0,0 +1,62 @@
+package me.chanjar.weixin.open.bean.ma.privacy;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 隐私key枚举
+ *
+ * @author 广州跨界
+ */
+@Getter
+@AllArgsConstructor
+public enum PrivacyKeyEnum {
+
+ USER_INFO("UserInfo", "用户信息（微信昵称、头像）"),
+
+ LOCATION("Location", "位置信息"),
+
+ ADDRESS("Address", "地址"),
+
+ INVOICE("Invoice", "发票信息"),
+
+ RUN_DATA("RunData", "微信运动数据"),
+
+ RECORD("Record", "麦克风"),
+
+ ALBUM("Album", "选中的照片或视频信息"),
+
+ CAMERA("Camera", "摄像头"),
+
+ PHONE_NUMBER("PhoneNumber", "手机号码"),
+
+ CONTACT("Contact", "通讯录（仅写入）权限"),
+
+ DEVICE_INFO("DeviceInfo", "设备信息"),
+
+ EXID_NUMBER("EXIDNumber", "身份证号码"),
+
+ EX_ORDER_INFO("EXOrderInfo", "订单信息"),
+
+ EX_USER_PUBLISH_CONTENT("EXUserPublishContent", "发布内容"),
+
+ EX_USER_FOLLOW_ACCT("EXUserFollowAcct", "所关注账号"),
+
+ EX_USER_OP_LOG("EXUserOpLog", "操作日志"),
+
+ ALBUM_WRITE_ONLY("AlbumWriteOnly", "相册（仅写入）权限"),
+
+ LICENSE_PLATE("LicensePlate", "车牌号"),
+
+ BLUE_TOOTH("BlueTooth", "蓝牙"),
+
+ CALENDAR_WRITE_ONLY("CalendarWriteOnly", "日历（仅写入）权限"),
+
+ EMAIL("Email", "邮箱"),
+
+ MESSAGE_FILE("MessageFile", "选中的文件"),
+ ;
+
+ private final String key;
+ private final String desc;
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyOwnerSetting.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyOwnerSetting.java
new file mode 100644
index 0000000000..a52d0588a9
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/PrivacyOwnerSetting.java
@@ -0,0 +1,65 @@
+package me.chanjar.weixin.open.bean.ma.privacy;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * 小程序用户隐私保护指引 收集方（开发者）信息配置
+ *
+ * @author 广州跨界
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PrivacyOwnerSetting {
+
+ /**
+ * 信息收集方（开发者）的邮箱地址，4种联系方式至少要填一种
+ */
+ @SerializedName("contact_email")
+ private String contactEmail;
+
+ /**
+ * 信息收集方（开发者）的手机号，4种联系方式至少要填一种
+ */
+ @SerializedName("contact_phone")
+ private String contactPhone;
+
+ /**
+ * 信息收集方（开发者）的qq号，4种联系方式至少要填一种
+ */
+ @SerializedName("contact_qq")
+ private String contactQq;
+
+ /**
+ * 信息收集方（开发者）的微信号，4种联系方式至少要填一种
+ */
+ @SerializedName("contact_weixin")
+ private String contactWeixin;
+
+ /**
+ * 如果开发者不使用微信提供的标准化用户隐私保护指引模板，也可以上传自定义的用户隐私保护指引，通过上传接口上传后可获取media_id
+ */
+ @SerializedName("ext_file_media_id")
+ private String extFileMediaId;
+
+ /**
+ * 通知方式，指的是当开发者收集信息有变动时，通过该方式通知用户。这里服务商需要按照实际情况填写，例如通过弹窗或者公告或者其他方式。
+ */
+ @NotNull
+ @SerializedName("notice_method")
+ private String noticeMethod;
+
+ /**
+ * 存储期限，指的是开发者收集用户信息存储多久。如果不填则展示为【开发者承诺，除法律法规另有规定，开发者对你的信息保存期限应当为实现处理目的所必要的最短时间】，
+ * 如果填请填数字+天，例如“30天”，否则会出现87072的报错。
+ */
+ @SerializedName("store_expire_timestamp")
+ private String storeExpireTimestamp;
+
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/SetPrivacySetting.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/SetPrivacySetting.java
new file mode 100644
index 0000000000..d74b86d45a
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/SetPrivacySetting.java
@@ -0,0 +1,68 @@
+package me.chanjar.weixin.open.bean.ma.privacy;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * 设置小程序用户隐私保护指引参数
+ *
+ * @author 广州跨界
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SetPrivacySetting {
+
+ /**
+ * 用户隐私保护指引的版本，1表示现网版本；2表示开发版。默认是2开发版。
+ */
+ @SerializedName("privacy_ver")
+ private Integer privacyVer;
+
+ /**
+ * 收集方（开发者）信息配置
+ */
+ @NotNull
+ @SerializedName("owner_setting")
+ private PrivacyOwnerSetting ownerSetting;
+
+ /**
+ * 要收集的用户信息配置
+ */
+ @NotNull
+ @SerializedName("setting_list")
+ private List settingList;
+
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Setting {
+
+ /**
+ * 官方的可选值参考下方说明；该字段也支持自定义
+ *
+ * @see PrivacyKeyEnum
+ * @see PrivacyKeyEnum#getKey()
+ */
+ @NotNull
+ @SerializedName("privacy_key")
+ private String privacyKey;
+
+ /**
+ * 请填写收集该信息的用途。例如privacy_key=Location（位置信息），那么privacy_text则填写收集位置信息的用途。
+ * 无需再带上“为了”或者“用于”这些字眼，小程序端的显示格式是为了xxx，因此开发者只需要直接填写用途即可。
+ */
+ @NotNull
+ @SerializedName("privacy_text")
+ private String privacyText;
+ }
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/UploadPrivacyFileResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/UploadPrivacyFileResult.java
new file mode 100644
index 0000000000..d2fcfecc50
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/privacy/UploadPrivacyFileResult.java
@@ -0,0 +1,22 @@
+package me.chanjar.weixin.open.bean.ma.privacy;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.open.bean.result.WxOpenResult;
+
+/**
+ * 上传小程序用户隐私保护指引文件 响应
+ *
+ * @author 广州跨界
+ */
+@Getter
+@Setter
+public class UploadPrivacyFileResult extends WxOpenResult {
+
+ /**
+ * 文件的media_id
+ */
+ @SerializedName("ext_file_media_id")
+ private String extFileMediaId;
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
new file mode 100644
index 0000000000..3ef3fd2e1e
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
@@ -0,0 +1,184 @@
+package me.chanjar.weixin.open.executor;
+
+import jodd.http.HttpConnectionProvider;
+import jodd.http.HttpRequest;
+import jodd.http.HttpResponse;
+import jodd.http.ProxyInfo;
+import lombok.Data;
+import me.chanjar.weixin.common.enums.WxType;
+import me.chanjar.weixin.common.error.WxError;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestHttp;
+import me.chanjar.weixin.common.util.http.ResponseHandler;
+import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
+import okhttp3.*;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.*;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+/**
+ * 通用的上传请求执行器
+ */
+public class GenericUploadRequestExecutor implements RequestExecutor {
+
+ private final Executor executor;
+
+ /**
+ * 构造通用执行器
+ *
+ * @param requestHttp http请求
+ * @param httpMethod http方法(POST PUT PATCH)
+ * @param paramName 参数名
+ * @param fileName 文件名
+ */
+ @SuppressWarnings("all")
+ public GenericUploadRequestExecutor(RequestHttp requestHttp, String httpMethod, String paramName, String fileName) {
+ switch (requestHttp.getRequestType()) {
+ case APACHE_HTTP:
+ executor = new ApacheExecutor();
+ break;
+ case OK_HTTP:
+ executor = new OkExecutor();
+ break;
+ case JODD_HTTP:
+ executor = new JoddExecutor();
+ break;
+ default:
+ throw new UnsupportedOperationException("使用了暂不支持的HTTP客户端:" + requestHttp.getRequestType());
+ }
+ executor.setRequestHttp((RequestHttp) requestHttp);
+ executor.setHttpMethod(httpMethod);
+ executor.setParamName(paramName);
+ executor.setFileName(fileName);
+ }
+
+ @Override
+ public String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException {
+ String json = executor.execute(uri, data, wxType);
+ WxError error = WxError.fromJson(json, wxType);
+ if (error.getErrorCode() != 0) {
+ throw new WxErrorException(error);
+ }
+ return json;
+ }
+
+ @Override
+ public void execute(String uri, InputStream data, ResponseHandler handler, WxType wxType) throws WxErrorException, IOException {
+ handler.handle(this.execute(uri, data, wxType));
+ }
+
+ /**
+ * 内部请求执行器
+ *
+ * @param http客户端
+ * @param http代理
+ */
+ @Data
+ public static abstract class Executor {
+
+ private RequestHttp requestHttp;
+ private String httpMethod;
+ private String paramName;
+ private String fileName;
+
+ public abstract String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException;
+ }
+
+ /**
+ * 阿帕奇执行器
+ */
+ public static class ApacheExecutor extends Executor {
+
+ @Override
+ public String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException {
+ HttpEntityEnclosingRequestBase bodyRequest;
+ switch (getHttpMethod()) {
+ case "POST":
+ bodyRequest = new HttpPost(uri);
+ break;
+ case "PUT":
+ bodyRequest = new HttpPut(uri);
+ break;
+ case "PATCH":
+ bodyRequest = new HttpPatch(uri);
+ break;
+ default:
+ throw new IllegalAccessError("不支持的请求方式:" + getHttpMethod());
+ }
+ if (getRequestHttp().getRequestHttpProxy() != null) {
+ RequestConfig config = RequestConfig.custom().setProxy(getRequestHttp().getRequestHttpProxy()).build();
+ bodyRequest.setConfig(config);
+ }
+
+ HttpEntity entity = MultipartEntityBuilder
+ .create()
+ .addBinaryBody(getParamName(), data, ContentType.create("multipart/form-data", StandardCharsets.UTF_8), getFileName())
+ .setMode(HttpMultipartMode.RFC6532)
+ .build();
+ bodyRequest.setEntity(entity);
+ bodyRequest.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
+
+ try (CloseableHttpResponse response = getRequestHttp().getRequestHttpClient().execute(bodyRequest)) {
+ return Utf8ResponseHandler.INSTANCE.handleResponse(response);
+ } finally {
+ bodyRequest.releaseConnection();
+ }
+ }
+ }
+
+ /**
+ * ok执行器
+ */
+ public static class OkExecutor extends Executor {
+
+ @Override
+ public String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException {
+ OkHttpClient client = getRequestHttp().getRequestHttpClient();
+
+ byte[] bytes = data instanceof ByteArrayInputStream ? ((ByteArrayInputStream) data).readAllBytes() : IOUtils.toByteArray(data);
+ RequestBody body = new MultipartBody.Builder()
+ .setType(Objects.requireNonNull(MediaType.parse("multipart/form-data")))
+ .addFormDataPart("media", getFileName(), RequestBody.create(bytes, MediaType.parse("application/octet-stream")))
+ .build();
+
+ Request request = new Request.Builder().url(uri).method(getHttpMethod(), body).build();
+ Response response = client.newCall(request).execute();
+ return response.body().string();
+ }
+ }
+
+ /**
+ * jodd执行器
+ */
+ public static class JoddExecutor extends Executor {
+
+ @Override
+ public String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException {
+ HttpRequest request = HttpRequest.post(uri);
+ if (getRequestHttp().getRequestHttpProxy() != null) {
+ getRequestHttp().getRequestHttpClient().useProxy(getRequestHttp().getRequestHttpProxy());
+ }
+ request.withConnectionProvider(getRequestHttp().getRequestHttpClient());
+
+ byte[] bytes = data instanceof ByteArrayInputStream ? ((ByteArrayInputStream) data).readAllBytes() : IOUtils.toByteArray(data);
+ request.form(getParamName(), data);
+
+ HttpResponse response = request.send();
+ response.charset(StandardCharsets.UTF_8.name());
+ return response.bodyText();
+ }
+ }
+}
From 93779d227ab956d24760f73e7d3d1be806637d28 Mon Sep 17 00:00:00 2001
From: Lo_ading
Date: Sun, 14 Nov 2021 21:31:29 +0800
Subject: [PATCH 0034/1079] =?UTF-8?q?:new=20:#2382=20=E3=80=90=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E5=95=86=E5=93=81=E5=9B=BE=E5=86=8C=E7=9A=84=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cp/api/WxCpExternalContactService.java | 34 ++++++++++--
.../impl/WxCpExternalContactServiceImpl.java | 49 ++++++++++++++++-
.../bean/external/WxCpProductAlbumInfo.java | 53 +++++++++++++++++++
.../external/WxCpProductAlbumListResult.java | 35 ++++++++++++
.../bean/external/WxCpProductAlbumResult.java | 31 +++++++++++
.../external/contact/ExternalContact.java | 20 +++++++
.../cp/bean/external/product/Attachment.java | 31 +++++++++++
.../cp/bean/external/product/Image.java | 20 +++++++
.../weixin/cp/constant/WxCpApiPathConsts.java | 3 ++
.../weixin/cp/constant/WxCpConsts.java | 11 ++++
.../WxCpExternalContactServiceImplTest.java | 17 +++++-
11 files changed, 298 insertions(+), 6 deletions(-)
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index 396bbe4a9c..40e7741a97 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -109,7 +109,7 @@ public interface WxCpExternalContactService {
* @param userId 外部联系人的userid
* @return . external contact
* @throws WxErrorException the wx error exception
- * @deprecated 建议使用 {@link #getContactDetail(String)}
+ * @deprecated 建议使用 {@link #getContactDetail(String, String)}
*/
@Deprecated
WxCpExternalContactInfo getExternalContact(String userId) throws WxErrorException;
@@ -130,10 +130,11 @@ public interface WxCpExternalContactService {
*
*
* @param userId 外部联系人的userid，注意不是企业成员的帐号
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
* @return . contact detail
* @throws WxErrorException .
*/
- WxCpExternalContactInfo getContactDetail(String userId) throws WxErrorException;
+ WxCpExternalContactInfo getContactDetail(String userId, String cursor) throws WxErrorException;
/**
* 企业和服务商可通过此接口，将微信外部联系人的userid转为微信openid，用于调用支付相关接口。暂不支持企业微信外部联系人（ExternalUserid为wo开头）的userid转openid。
@@ -190,7 +191,7 @@ public interface WxCpExternalContactService {
* @throws WxErrorException .
*/
String opengidToChatid(@NotNull String opengid) throws WxErrorException;
-
+
/**
* 批量获取客户详情.
*
@@ -789,4 +790,31 @@ WxCpGetMomentComments getMomentComments(String momentId, String userId)
* @throws WxErrorException the wx error exception
*/
WxCpBaseResp delGroupWelcomeTemplate(@NotNull String templateId, String agentId) throws WxErrorException;
+
+ /**
+ *
+ * 获取商品图册
+ * https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册列表
+ *
+ *
+ * @param limit 返回的最大记录数，整型，最大值100，默认值50，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpProductAlbumListResult getProductAlbumList(Integer limit, String cursor) throws WxErrorException;
+
+ /**
+ *
+ * 获取商品图册
+ * https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册
+ *
+ *
+ * @param productId 商品id
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpProductAlbumResult getProductAlbum(String productId) throws WxErrorException;
+
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 19937e3827..d9426a8340 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -102,8 +102,12 @@ public WxCpExternalContactInfo getExternalContact(String userId) throws WxErrorE
}
@Override
- public WxCpExternalContactInfo getContactDetail(String userId) throws WxErrorException {
- final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_CONTACT_DETAIL + userId);
+ public WxCpExternalContactInfo getContactDetail(String userId, String cursor) throws WxErrorException {
+ String params = userId;
+ if(StringUtils.isNotEmpty(cursor)){
+ params = params + "&cursor=" + cursor;
+ }
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_CONTACT_DETAIL + params);
String responseContent = this.mainService.get(url, null);
return WxCpExternalContactInfo.fromJson(responseContent);
}
@@ -702,4 +706,45 @@ public WxCpBaseResp delGroupWelcomeTemplate(@NotNull String templateId, String a
final String result = this.mainService.post(url, json.toString());
return WxCpBaseResp.fromJson(result);
}
+
+ /**
+ *
+ * 获取商品图册
+ * https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册列表
+ *
+ *
+ * @param limit 返回的最大记录数，整型，最大值100，默认值50，超过最大值时取默认值
+ * @param cursor 用于分页查询的游标，字符串类型，由上一次调用返回，首次调用可不填
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpProductAlbumListResult getProductAlbumList(Integer limit, String cursor) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("limit", limit);
+ json.addProperty("cursor", cursor);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_PRODUCT_ALBUM_LIST);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpProductAlbumListResult.fromJson(result);
+ }
+
+ /**
+ *
+ * 获取商品图册
+ * https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册
+ *
+ *
+ * @param productId 商品id
+ * @return wx cp base resp
+ * @throws WxErrorException the wx error exception
+ */
+ @Override
+ public WxCpProductAlbumResult getProductAlbum(String productId) throws WxErrorException {
+ JsonObject json = new JsonObject();
+ json.addProperty("product_id", productId);
+ final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_PRODUCT_ALBUM);
+ final String result = this.mainService.post(url, json.toString());
+ return WxCpProductAlbumResult.fromJson(result);
+ }
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
new file mode 100644
index 0000000000..d84b9f232c
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
@@ -0,0 +1,53 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.external.product.Attachment;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ *
+ * 获取商品图册
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册
+ *
+ *
+ * @author Lo_ading
+ */
+@Getter
+@Setter
+public class WxCpProductAlbumInfo implements Serializable {
+
+ private static final long serialVersionUID = -8338202601802366899L;
+
+ @SerializedName("product_id")
+ private String productId;
+
+ @SerializedName("product_sn")
+ private String productSn;
+
+ @SerializedName("description")
+ private String description;
+
+ /**
+ * NOTE: 20211110 价钱返回全部为0
+ */
+ @SerializedName("price")
+ private Integer price;
+
+ /**
+ * NOTE: 20211110 商品列表接口不返回此字段, 商品详情接口返回
+ */
+ @SerializedName("create_time")
+ private Long createTime;
+
+ @SerializedName("attachments")
+ private List attachments;
+
+ public static WxCpProductAlbumInfo fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpProductAlbumInfo.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
new file mode 100644
index 0000000000..29b9d4c571
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
@@ -0,0 +1,35 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ *
+ * 获取商品图册列表执行结果
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册列表
+ *
+ *
+ * @author Lo_ading
+ */
+@Getter
+@Setter
+public class WxCpProductAlbumListResult extends WxCpBaseResp implements Serializable {
+
+ private static final long serialVersionUID = 121265727802015428L;
+
+ @SerializedName("product_list")
+ private List productList;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ public static WxCpProductAlbumListResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpProductAlbumListResult.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
new file mode 100644
index 0000000000..74e5fc3be4
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
@@ -0,0 +1,31 @@
+package me.chanjar.weixin.cp.bean.external;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ *
+ * 获取商品图册执行结果
+ * 参考文档：https://work.weixin.qq.com/api/doc/90000/90135/95096#获取商品图册
+ *
+ *
+ * @author Lo_ading
+ */
+@Getter
+@Setter
+public class WxCpProductAlbumResult extends WxCpBaseResp implements Serializable {
+
+ private static final long serialVersionUID = 4076734101839851497L;
+
+ @SerializedName("product")
+ private WxCpProductAlbumInfo product;
+
+ public static WxCpProductAlbumResult fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpProductAlbumResult.class);
+ }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/ExternalContact.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/ExternalContact.java
index 5b7f9e67b1..f19584ed90 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/ExternalContact.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/contact/ExternalContact.java
@@ -51,10 +51,30 @@ public class ExternalContact implements Serializable {
public static class ExternalProfile implements Serializable {
private static final long serialVersionUID = -2899906589789022765L;
+ @SerializedName("external_corp_name")
+ private String externalCorpName;
+
+ @SerializedName("wechat_channels")
+ private WechatChannel wechatChannels;
+
@SerializedName("external_attr")
private List externalAttrs;
}
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class WechatChannel implements Serializable {
+
+ @SerializedName("nickname")
+ private String nickname;
+
+ @SerializedName("status")
+ private Integer status;
+
+ }
+
@Data
@Builder
@NoArgsConstructor
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
new file mode 100644
index 0000000000..cfcb688c2d
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
@@ -0,0 +1,31 @@
+package me.chanjar.weixin.cp.bean.external.product;
+
+import java.io.Serializable;
+import lombok.Data;
+import me.chanjar.weixin.cp.constant.WxCpConsts;
+
+/**
+ * 商品画册附件
+ *
+ * @author Lo_ading
+ */
+@Data
+public class Attachment implements Serializable {
+
+ private static final long serialVersionUID = -4545283630169056262L;
+
+ /**
+ * NOTE: 20211110 字段接口未返回
+ */
+ private String type;
+
+ /**
+ * 附件类型，目前仅支持image
+ */
+ private Image image;
+
+ public void setImage(Image image) {
+ this.image = image;
+ this.type = WxCpConsts.ProductAttachmentType.IMAGE;
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
new file mode 100644
index 0000000000..d56f0b2705
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
@@ -0,0 +1,20 @@
+package me.chanjar.weixin.cp.bean.external.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 商品画册图片
+ *
+ * @author Lo_ading
+ */
+@Data
+public class Image implements Serializable {
+
+ private static final long serialVersionUID = -2737415903252627814L;
+
+ @SerializedName("media_id")
+ private String mediaId;
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index ddc56d133e..71eadb63aa 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -219,6 +219,9 @@ interface ExternalContact {
String GET_GROUP_MSG_TASK = "/cgi-bin/externalcontact/get_groupmsg_task";
String GET_GROUP_MSG_LIST_V2 = "/cgi-bin/externalcontact/get_groupmsg_list_v2";
+ String GET_PRODUCT_ALBUM = "/cgi-bin/externalcontact/get_product_album";
+ String GET_PRODUCT_ALBUM_LIST = "/cgi-bin/externalcontact/get_product_album_list";
+
String GROUP_WELCOME_TEMPLATE_ADD = "/cgi-bin/externalcontact/group_welcome_template/add";
String GROUP_WELCOME_TEMPLATE_EDIT = "/cgi-bin/externalcontact/group_welcome_template/edit";
String GROUP_WELCOME_TEMPLATE_GET = "/cgi-bin/externalcontact/group_welcome_template/get";
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java
index 601c7dbb30..f706c18991 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java
@@ -359,4 +359,15 @@ public static class WelcomeMsgType {
*/
public static final String FILE = "file";
}
+
+ @UtilityClass
+ public static class ProductAttachmentType {
+
+ /**
+ * 图片消息.
+ */
+ public static final String IMAGE = "image";
+
+ }
+
}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
index 60fdeb9b2e..f9f90192d8 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import org.testng.collections.CollectionUtils;
import static org.testng.Assert.assertNotNull;
@@ -111,7 +112,7 @@ public void testListExternalWithPermission() throws WxErrorException {
@Test
public void testGetContactDetail() throws WxErrorException {
String externalUserId = this.configStorage.getExternalUserId();
- WxCpExternalContactInfo result = this.wxCpService.getExternalContactService().getContactDetail(externalUserId);
+ WxCpExternalContactInfo result = this.wxCpService.getExternalContactService().getContactDetail(externalUserId, null);
System.out.println(result);
assertNotNull(result);
}
@@ -314,4 +315,18 @@ public void testUpdateRemark() throws WxErrorException {
.remarkPicMediaId("aaa")
.build());
}
+
+ @Test
+ public void testGetProductListAlbum() throws WxErrorException {
+ WxCpProductAlbumListResult result = this.wxCpService.getExternalContactService()
+ .getProductAlbumList(100, null);
+ System.out.println(result);
+ assertNotNull(result);
+ if(CollectionUtils.hasElements(result.getProductList())){
+ WxCpProductAlbumResult result1 = this.wxCpService.getExternalContactService().getProductAlbum(result.getProductList().get(0).getProductId());
+ System.out.println(result1);
+ assertNotNull(result1);
+ }
+ }
+
}
From f7ab9f8f292099c696c03e0dbef756a751e7e17a Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 15 Nov 2021 09:58:44 +0800
Subject: [PATCH 0035/1079] =?UTF-8?q?:art:=20auditId=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E6=94=B9=E4=B8=BALong?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java
index 7d880ecc89..dfb7b1e48f 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java
@@ -20,7 +20,7 @@
public class WxMaLiveResult implements Serializable {
private static final long serialVersionUID = 1L;
private Integer total;
- private Integer auditId;
+ private Long auditId;
private Integer goodsId;
private List goods;
From 421fbd49934c1d3f8ebec790ab69750f6d4a2388 Mon Sep 17 00:00:00 2001
From: Binary Wang
Date: Mon, 15 Nov 2021 10:34:07 +0800
Subject: [PATCH 0036/1079] add ccflow banner
---
README.md | 11 +++++++++--
images/banners/ccflow.png | Bin 0 -> 104340 bytes
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 images/banners/ccflow.png
diff --git a/README.md b/README.md
index cecfc0215d..5c4963f591 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## WxJava - 微信开发 Java SDK（开发工具包） [](https://github.com/996icu/996.ICU/blob/master/LICENSE) [](https://996.icu/#/zh_CN)
+## WxJava - 微信开发 Java SDK [](https://github.com/996icu/996.ICU/blob/master/LICENSE) [](https://996.icu/#/zh_CN)
[](https://gitee.com/binary/weixin-java-tools)
[](https://github.com/Wechat-Group/WxJava)
@@ -8,7 +8,7 @@
[](https://www.jetbrains.com/?from=WxJava-weixin-java-tools)
[](https://opensource.org/licenses/Apache-2.0)
-#### 支持包括微信支付、开放平台、公众号、企业微信/企业号、小程序等微信功能的后端开发。
+#### 微信`Java`开发工具包，支持包括微信支付、开放平台、公众号、企业微信/企业号、小程序等微信功能模块的后端开发。
特别赞助
@@ -16,6 +16,13 @@
+