Skip to content

Commit ba6b7da

Browse files
binarywangbinarywang
committed
素材相关代码补充完善javadoc注释，并重构包结构
1 parent cb1249f commit ba6b7da

29 files changed

+187
-135
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpKefuService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public interface WxMpKefuService {
2222
* <pre>
2323
* 发送客服消息
2424
* 详情请见: <a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140547&token=&lang=zh_CN">发送客服消息</a>
25+
* 接口url格式：https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=ACCESS_TOKEN
2526
* </pre>
2627
*/
2728
boolean sendKefuMessage(WxMpKefuMessage message) throws WxErrorException;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java

Lines changed: 116 additions & 65 deletions
Large diffs are not rendered by default.

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1111
import me.chanjar.weixin.mp.api.WxMpMaterialService;
1212
import me.chanjar.weixin.mp.api.WxMpService;
13-
import me.chanjar.weixin.mp.bean.WxMpMaterial;
14-
import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate;
15-
import me.chanjar.weixin.mp.bean.WxMpMaterialNews;
16-
import me.chanjar.weixin.mp.bean.result.*;
13+
import me.chanjar.weixin.mp.bean.material.WxMpMaterial;
14+
import me.chanjar.weixin.mp.bean.material.WxMpMaterialArticleUpdate;
15+
import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
16+
import me.chanjar.weixin.mp.bean.material.*;
1717
import me.chanjar.weixin.mp.util.http.*;
1818
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1919

@@ -37,8 +37,13 @@ public WxMpMaterialServiceImpl(WxMpService wxMpService) {
3737
}
3838

3939
@Override
40-
public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException {
41-
return this.mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType));
40+
public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException {
41+
try {
42+
return this.mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType));
43+
} catch (IOException e) {
44+
e.printStackTrace();
45+
throw new WxErrorException(WxError.newBuilder().setErrorMsg(e.getMessage()).build());
46+
}
4247
}
4348

4449
@Override

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaImgUploadResult.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.result;
1+
package me.chanjar.weixin.mp.bean.material;
22

33
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
44

@@ -9,7 +9,7 @@
99
*/
1010
public class WxMediaImgUploadResult implements Serializable {
1111
/**
12-
*
12+
*
1313
*/
1414
private static final long serialVersionUID = 1996392453428768829L;
1515
private String url;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterial.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean;
1+
package me.chanjar.weixin.mp.bean.material;
22

33
import java.io.File;
44
import java.util.HashMap;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialArticleUpdate.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean;
1+
package me.chanjar.weixin.mp.bean.material;
22

33
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
44

@@ -7,7 +7,7 @@
77
public class WxMpMaterialArticleUpdate implements Serializable {
88

99
/**
10-
*
10+
*
1111
*/
1212
private static final long serialVersionUID = -7611963949517780270L;
1313
private String mediaId;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialCountResult.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package me.chanjar.weixin.mp.bean.result;
1+
package me.chanjar.weixin.mp.bean.material;
2+
3+
import org.apache.commons.lang3.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringStyle;
25

36
import java.io.Serializable;
47

58
public class WxMpMaterialCountResult implements Serializable {
6-
7-
/**
8-
*
9-
*/
109
private static final long serialVersionUID = -5568772662085874138L;
1110
private int voiceCount;
1211
private int videoCount;
@@ -47,8 +46,7 @@ public void setNewsCount(int newsCount) {
4746

4847
@Override
4948
public String toString() {
50-
return "WxMpMaterialCountResult [" + "voiceCount=" + this.voiceCount + ", videoCount=" + this.videoCount
51-
+ ", imageCount=" + this.imageCount + ", newsCount=" + this.newsCount + "]";
49+
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
5250
}
5351
}
5452

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialFileBatchGetResult.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package me.chanjar.weixin.mp.bean.result;
1+
package me.chanjar.weixin.mp.bean.material;
2+
3+
import org.apache.commons.lang3.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringStyle;
25

36
import java.io.Serializable;
47
import java.util.Date;
58
import java.util.List;
69

710
public class WxMpMaterialFileBatchGetResult implements Serializable {
8-
9-
/**
10-
*
11-
*/
1211
private static final long serialVersionUID = -560388368297267884L;
1312
private int totalCount;
1413
private int itemCount;
@@ -40,7 +39,7 @@ public void setItems(List<WxMaterialFileBatchGetNewsItem> items) {
4039

4140
@Override
4241
public String toString() {
43-
return "WxMpMaterialFileBatchGetResult [" + "totalCount=" + this.totalCount + ", itemCount=" + this.itemCount + ", items=" + this.items + "]";
42+
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
4443
}
4544

4645
public static class WxMaterialFileBatchGetNewsItem {
@@ -83,7 +82,7 @@ public void setUrl(String url) {
8382

8483
@Override
8584
public String toString() {
86-
return "WxMaterialFileBatchGetNewsItem [" + "mediaId=" + this.mediaId + ", updateTime=" + this.updateTime + ", name=" + this.name + ", url=" + this.url + "]";
85+
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
8786
}
8887
}
8988
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMaterialNews.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean;
1+
package me.chanjar.weixin.mp.bean.material;
22

33
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
44
import org.apache.commons.lang3.builder.ToStringBuilder;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMaterialNewsBatchGetResult.java renamed to ‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNewsBatchGetResult.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
package me.chanjar.weixin.mp.bean.result;
1+
package me.chanjar.weixin.mp.bean.material;
22

3-
import me.chanjar.weixin.mp.bean.WxMpMaterialNews;
3+
import org.apache.commons.lang3.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringStyle;
45

56
import java.io.Serializable;
67
import java.util.Date;
78
import java.util.List;
89

910
public class WxMpMaterialNewsBatchGetResult implements Serializable {
10-
11-
/**
12-
*
13-
*/
1411
private static final long serialVersionUID = -1617952797921001666L;
12+
1513
private int totalCount;
1614
private int itemCount;
1715
private List<WxMaterialNewsBatchGetNewsItem> items;
@@ -42,7 +40,7 @@ public void setItems(List<WxMaterialNewsBatchGetNewsItem> items) {
4240

4341
@Override
4442
public String toString() {
45-
return "WxMpMaterialNewsBatchGetResult [" + "totalCount=" + this.totalCount + ", itemCount=" + this.itemCount + ", items=" + this.items + "]";
43+
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
4644
}
4745

4846
public static class WxMaterialNewsBatchGetNewsItem {
@@ -76,7 +74,7 @@ public void setContent(WxMpMaterialNews content) {
7674

7775
@Override
7876
public String toString() {
79-
return "WxMaterialNewsBatchGetNewsItem [" + "mediaId=" + this.mediaId + ", updateTime=" + this.updateTime + ", content=" + this.content + "]";
77+
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
8078
}
8179
}
8280
}

0 commit comments

Comments
 (0)