Skip to content

fix：【企业微信】增加"模板卡片事件推送"事件的相关属性 #3395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2024
Merged

fix：【企业微信】增加"模板卡片事件推送"事件的相关属性 #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c884198
fix：【企业微信】增加"模板卡片事件推送"事件的相关属性
Oct 28, 2024
e633f42
Merge branch 'develop' into templateCard
llw5181 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ public class WxCpXmlMessage implements Serializable {
@XStreamConverter(value = XStreamCDataConverter.class)
private String taskId;

@XStreamAlias("CardType")
@XStreamConverter(value = XStreamCDataConverter.class)
private String cardType;

@XStreamAlias("ResponseCode")
@XStreamConverter(value = XStreamCDataConverter.class)
private String responseCode;

@XStreamAlias("SelectedItems")
private List<SelectedItem> selectedItems;

/**
* 微信客服
* 调用拉取消息接口时，需要传此token，用于校验请求的合法性
Expand Down Expand Up @@ -750,4 +761,21 @@ public static class SendLocationInfo implements Serializable {

}


/**
* The type selected Items.
*/
@Data
@XStreamAlias("SelectedItem")
public static class SelectedItem implements Serializable {
private static final long serialVersionUID = 6319921121637597406L;

@XStreamAlias("QuestionKey")
@XStreamConverter(value = XStreamCDataConverter.class)
private String questionKey;

@XStreamAlias(value = "OptionIds")
private List<String> optionIds;
}

}
5 changes: 5 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public static class EventType {
*/
public static final String CHANGE_CONTACT = "change_contact";

/**
* 企业微信模板卡片事件推送
*/
public static final String TEMPLATE_CARD_EVENT = "template_card_event";

/**
* 点击菜单拉取消息的事件推送.
*/
Expand Down
5 changes: 5 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ private static XStream configWxCpXmlMessage() {
xstream.processAnnotations(WxCpXmlMessage.SendPicsInfo.class);
xstream.processAnnotations(WxCpXmlMessage.SendPicsInfo.Item.class);
xstream.processAnnotations(WxCpXmlMessage.SendLocationInfo.class);
xstream.processAnnotations(WxCpXmlMessage.SelectedItem.class);
// 显式允许 String 类
xstream.allowTypes(new Class[]{String.class});
// 模板卡片事件推送独属
xstream.alias("OptionId",String.class);
return xstream;
}

Expand Down
40 changes: 40 additions & 0 deletions weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,46 @@ public void testChangeContact() {
System.out.println(XStreamTransformer.toXml(WxCpXmlMessage.class, wxCpXmlMessage));
}

/**
* Test template card event.
*/
public void testTemplateCardEvent() {
String xml = "<xml>\n" +
"<ToUserName><![CDATA[toUser]]></ToUserName>\n" +
"<FromUserName><![CDATA[FromUser]]></FromUserName>\n" +
"<CreateTime>123456789</CreateTime>\n" +
"<MsgType><![CDATA[event]]></MsgType>\n" +
"<Event><![CDATA[template_card_event]]></Event>\n" +
"<EventKey><![CDATA[key111]]></EventKey>\n" +
"<TaskId><![CDATA[taskid111]]></TaskId>\n" +
"<CardType><![CDATA[text_notice]]></CardType>\n" +
"<ResponseCode><![CDATA[ResponseCode]]></ResponseCode>\n" +
"<AgentID>1</AgentID>\n" +
"<SelectedItems>\n" +
" <SelectedItem>\n" +
" <QuestionKey><![CDATA[QuestionKey1]]></QuestionKey>\n" +
" <OptionIds>\n" +
" <OptionId><![CDATA[OptionId1]]></OptionId>\n" +
" <OptionId><![CDATA[OptionId2]]></OptionId>\n" +
" </OptionIds>\n" +
" </SelectedItem>\n" +
" <SelectedItem>\n" +
" <QuestionKey><![CDATA[QuestionKey2]]></QuestionKey>\n" +
" <OptionIds>\n" +
" <OptionId><![CDATA[OptionId3]]></OptionId>\n" +
" <OptionId><![CDATA[OptionId4]]></OptionId>\n" +
" </OptionIds>\n" +
" </SelectedItem>\n" +
"</SelectedItems>\n" +
"</xml>";

WxCpXmlMessage wxCpXmlMessage = WxCpXmlMessage.fromXml(xml);
assertThat(wxCpXmlMessage).isNotNull();
assertThat(wxCpXmlMessage.getSelectedItems()).isNotEmpty();
assertThat(wxCpXmlMessage.getSelectedItems().get(0).getQuestionKey()).isNotEmpty();
assertThat(wxCpXmlMessage.getSelectedItems().get(0).getOptionIds().get(0)).isNotEmpty();
}

/**
* Test open approval change.
*/
Expand Down