Skip to content

Commit a7ad46b

Browse files
chanjarsterchanjarster
committed
删除音乐消息的东西（企业号没有这个东西）
1 parent 40430a7 commit a7ad46b

28 files changed

+84
-461
lines changed

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/XmlTransformer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ private static JAXBContext initJAXBContext() {
8080
WxCpXmlOutMessage.class,
8181
WxCpXmlOutImageMessage.class,
8282
WxCpXmlOutMewsMessage.class,
83-
WxCpXmlOutMusicMessage.class,
8483
WxCpXmlOutTextMessage.class,
8584
WxCpXmlOutVideoMessage.class,
8685
WxCpXmlOutVoiceMessage.class,

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxConsts.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConsts.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
public class WxConsts {
6+
public class WxCpConsts {
77

88
///////////////////////
99
// 微信推送过来的消息的类型，和发送给微信xml格式消息的消息类型
@@ -13,7 +13,6 @@ public class WxConsts {
1313
public static final String XML_MSG_VOICE = "voice";
1414
public static final String XML_MSG_VIDEO = "video";
1515
public static final String XML_MSG_NEWS = "news";
16-
public static final String XML_MSG_MUSIC = "music";
1716
public static final String XML_MSG_LOCATION = "location";
1817
public static final String XML_MSG_LINK = "link";
1918
public static final String XML_MSG_EVENT = "event";
@@ -25,7 +24,6 @@ public class WxConsts {
2524
public static final String CUSTOM_MSG_IMAGE = "image";
2625
public static final String CUSTOM_MSG_VOICE = "voice";
2726
public static final String CUSTOM_MSG_VIDEO = "video";
28-
public static final String CUSTOM_MSG_MUSIC = "music";
2927
public static final String CUSTOM_MSG_NEWS = "news";
3028
public static final String CUSTOM_MSG_FILE = "file";
3129

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public interface WxCpService {
6565
*
6666
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=上传下载多媒体文件
6767
* </pre>
68-
* @param mediaType 媒体类型, 请看{@link WxConsts}
69-
* @param fileType 文件类型，请看{@link WxConsts}
68+
* @param mediaType 媒体类型, 请看{@link WxCpConsts}
69+
* @param fileType 文件类型，请看{@link WxCpConsts}
7070
* @param inputStream 输入流
7171
* @throws WxErrorException
7272
*/

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpMessage.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import me.chanjar.weixin.enterprise.api.WxConsts;
76
import me.chanjar.weixin.enterprise.bean.messagebuilder.*;
87
import me.chanjar.weixin.enterprise.util.json.WxCpGsonBuilder;
98

@@ -66,12 +65,12 @@ public String getMsgType() {
6665
/**
6766
* <pre>
6867
* 请使用
69-
* {@link WxConsts#CUSTOM_MSG_TEXT}
70-
* {@link WxConsts#CUSTOM_MSG_IMAGE}
71-
* {@link WxConsts#CUSTOM_MSG_VOICE}
72-
* {@link WxConsts#CUSTOM_MSG_MUSIC}
73-
* {@link WxConsts#CUSTOM_MSG_VIDEO}
74-
* {@link WxConsts#CUSTOM_MSG_NEWS}
68+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_TEXT}
69+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_IMAGE}
70+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_VOICE}
71+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_MUSIC}
72+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_VIDEO}
73+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#CUSTOM_MSG_NEWS}
7574
* </pre>
7675
* @param msgType
7776
*/
@@ -197,14 +196,6 @@ public static VideoBuilder VIDEO() {
197196
return new VideoBuilder();
198197
}
199198

200-
/**
201-
* 获得音乐消息builder
202-
* @return
203-
*/
204-
public static MusicBuilder MUSIC() {
205-
return new MusicBuilder();
206-
}
207-
208199
/**
209200
* 获得图文消息builder
210201
* @return

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.chanjar.weixin.enterprise.bean;
22

33
import me.chanjar.weixin.enterprise.api.WxCpConfigStorage;
4-
import me.chanjar.weixin.enterprise.api.WxConsts;
54
import me.chanjar.weixin.common.AdapterCDATA;
65
import me.chanjar.weixin.common.XmlTransformer;
76
import me.chanjar.weixin.enterprise.util.crypto.WxCryptUtil;
@@ -191,13 +190,13 @@ public void setCreateTime(Long createTime) {
191190
/**
192191
* <pre>
193192
* 当接受用户消息时，可能会获得以下值：
194-
* {@link WxConsts#XML_MSG_TEXT}
195-
* {@link WxConsts#XML_MSG_IMAGE}
196-
* {@link WxConsts#XML_MSG_VOICE}
197-
* {@link WxConsts#XML_MSG_VIDEO}
198-
* {@link WxConsts#XML_MSG_LOCATION}
199-
* {@link WxConsts#XML_MSG_LINK}
200-
* {@link WxConsts#XML_MSG_EVENT}
193+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_TEXT}
194+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_IMAGE}
195+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_VOICE}
196+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_VIDEO}
197+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_LOCATION}
198+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_LINK}
199+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_EVENT}
201200
* </pre>
202201
*
203202
* @return
@@ -209,12 +208,12 @@ public String getMsgType() {
209208
/**
210209
* <pre>
211210
* 当发送消息的时候使用：
212-
* {@link WxConsts#XML_MSG_TEXT}
213-
* {@link WxConsts#XML_MSG_IMAGE}
214-
* {@link WxConsts#XML_MSG_VOICE}
215-
* {@link WxConsts#XML_MSG_VIDEO}
216-
* {@link WxConsts#XML_MSG_NEWS}
217-
* {@link WxConsts#XML_MSG_MUSIC}
211+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_TEXT}
212+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_IMAGE}
213+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_VOICE}
214+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_VIDEO}
215+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_NEWS}
216+
* {@link me.chanjar.weixin.enterprise.api.WxCpConsts#XML_MSG_MUSIC}
218217
* </pre>
219218
*
220219
* @param msgType

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javax.xml.bind.annotation.XmlRootElement;
77
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
88

9-
import me.chanjar.weixin.enterprise.api.WxConsts;
9+
import me.chanjar.weixin.enterprise.api.WxCpConsts;
1010
import me.chanjar.weixin.common.MediaIdMarshaller;
1111

1212
@XmlRootElement(name = "xml")
@@ -18,7 +18,7 @@ public class WxCpXmlOutImageMessage extends WxCpXmlOutMessage {
1818
private String mediaId;
1919

2020
public WxCpXmlOutImageMessage() {
21-
this.msgType = WxConsts.XML_MSG_IMAGE;
21+
this.msgType = WxCpConsts.XML_MSG_IMAGE;
2222
}
2323

2424
public String getMediaId() {

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import me.chanjar.weixin.enterprise.api.WxCpConfigStorage;
1111
import me.chanjar.weixin.enterprise.bean.outxmlbuilder.ImageBuilder;
12-
import me.chanjar.weixin.enterprise.bean.outxmlbuilder.MusicBuilder;
1312
import me.chanjar.weixin.enterprise.bean.outxmlbuilder.NewsBuilder;
1413
import me.chanjar.weixin.enterprise.bean.outxmlbuilder.TextBuilder;
1514
import me.chanjar.weixin.enterprise.bean.outxmlbuilder.VideoBuilder;
@@ -119,14 +118,6 @@ public static VideoBuilder VIDEO() {
119118
return new VideoBuilder();
120119
}
121120

122-
/**
123-
* 获得音乐消息builder
124-
* @return
125-
*/
126-
public static MusicBuilder MUSIC() {
127-
return new MusicBuilder();
128-
}
129-
130121
/**
131122
* 获得图文消息builder
132123
* @return

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import javax.xml.bind.annotation.XmlRootElement;
1111
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
1212

13-
import me.chanjar.weixin.enterprise.api.WxConsts;
13+
import me.chanjar.weixin.enterprise.api.WxCpConsts;
1414
import me.chanjar.weixin.common.AdapterCDATA;
1515

1616
@XmlRootElement(name = "xml")
@@ -25,7 +25,7 @@ public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage {
2525
protected final List<Item> articles = new ArrayList<Item>();
2626

2727
public WxCpXmlOutMewsMessage() {
28-
this.msgType = WxConsts.XML_MSG_NEWS;
28+
this.msgType = WxCpConsts.XML_MSG_NEWS;
2929
}
3030

3131
public int getArticleCount() {

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMusicMessage.java‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javax.xml.bind.annotation.XmlRootElement;
77
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
88

9-
import me.chanjar.weixin.enterprise.api.WxConsts;
9+
import me.chanjar.weixin.enterprise.api.WxCpConsts;
1010
import me.chanjar.weixin.common.AdapterCDATA;
1111

1212
@XmlRootElement(name = "xml")
@@ -18,7 +18,7 @@ public class WxCpXmlOutTextMessage extends WxCpXmlOutMessage {
1818
private String content;
1919

2020
public WxCpXmlOutTextMessage() {
21-
this.msgType = WxConsts.XML_MSG_TEXT;
21+
this.msgType = WxCpConsts.XML_MSG_TEXT;
2222
}
2323

2424
public String getContent() {

0 commit comments

Comments
 (0)