diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMaterialService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMaterialService.java
deleted file mode 100644
index 7c9b9e21a..000000000
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMaterialService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.binarywang.wx.miniapp.api;
-
-import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
-import me.chanjar.weixin.common.error.WxErrorException;
-
-import java.io.File;
-
-/**
- *
- * 素材管理的相关接口
- * 文档地址：https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html
- * Created by lipengjun on 2020/6/29.
- *
- *
- * @author lipengjun (939961241@qq.com)
- */
-public interface WxMaMaterialService {
- String MEDIA_UPLOAD_URL = "https://api.weixin.qq.com/cgi-bin/media/upload?type=%s";
- /**
- *
- * 新增临时素材
- * 小程序获取临时素材，用于直播间商品
- * 素材管理接口对所有认证的订阅号和服务号开放。通过本接口，小程序可以新增临时素材（即上传临时多媒体文件），返回的mediaId用于直播间商品使用。
- * 请注意：
- * 1、对于临时素材，每个素材（media_id）会在开发者上传或粉丝发送到微信服务器3天后自动删除（所以用户发送给开发者的素材，若开发者需要，应尽快下载到本地），以节省服务器资源。
- * 2、media_id是可复用的。
- * 3、素材的格式大小等要求与公众平台官网一致。具体是，图片大小不超过2M，支持png/jpeg/jpg/gif格式，语音大小不超过5M，长度不超过60秒，支持mp3/amr格式
- * 4、需使用https调用本接口。
- * 本接口即为原“上传多媒体文件”接口。
- * 注意事项：
- * 上传的临时多媒体文件有格式和大小限制，如下：
- * 图片（image）: 2M，支持PNG\JPEG\JPG\GIF格式
- * 语音（voice）：2M，播放长度不超过60s，支持AMR\MP3格式
- * 视频（video）：10MB，支持MP4格式
- * 缩略图（thumb）：64KB，支持JPG格式
- * 媒体文件在后台保存时间为3天，即3天后media_id失效。
- * 详情请见: 新增临时素材
- * 接口url格式：https://api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE
- *
- *
- * @param mediaType 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts}
- * @param file 文件对象
- * @throws WxErrorException
- */
- WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException;
-}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java
index d2c57ca5e..48ebb8a10 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java
@@ -28,7 +28,9 @@ public interface WxMaMediaService {
*
* @param mediaType 媒体类型,
* @param file 文件对象
- * @see #uploadMedia(String, String, InputStream)
+ * @return the wx media upload result
+ * @throws WxErrorException the wx error exception
+ * @see #uploadMedia(String, String, InputStream) #uploadMedia(String, String, InputStream)
*/
WxMediaUploadResult uploadMedia(String mediaType, File file) throws WxErrorException;
@@ -44,7 +46,9 @@ public interface WxMaMediaService {
* @param mediaType 媒体类型
* @param fileType 文件类型
* @param inputStream 输入流
- * @see #uploadMedia(java.lang.String, java.io.File)
+ * @return the wx media upload result
+ * @throws WxErrorException the wx error exception
+ * @see #uploadMedia(java.lang.String, java.io.File) #uploadMedia(java.lang.String, java.io.File)
*/
WxMediaUploadResult uploadMedia(String mediaType, String fileType, InputStream inputStream) throws WxErrorException;
@@ -58,7 +62,8 @@ public interface WxMaMediaService {
*
*
* @param mediaId 媒体Id
- * @return 保存到本地的临时文件
+ * @return 保存到本地的临时文件 media
+ * @throws WxErrorException the wx error exception
*/
File getMedia(String mediaId) throws WxErrorException;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
index caac54388..f419bfea1 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
@@ -288,10 +288,4 @@ public interface WxMaService extends WxService {
*/
WxMaLiveGoodsService getLiveGoodsService();
- /**
- * 获取小程序素材管理服务对象
- *
- * @return .
- */
- WxMaMaterialService getMaterialService();
}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
index 34581ad80..5a2fa22b4 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
@@ -57,7 +57,6 @@ public abstract class BaseWxMaServiceImpl implements WxMaService, RequestH
private final WxMaCloudService cloudService = new WxMaCloudServiceImpl(this);
private final WxMaLiveService liveService = new WxMaLiveServiceImpl(this);
private final WxMaLiveGoodsService liveGoodsService = new WxMaLiveGoodsServiceImpl(this);
- private final WxMaMaterialService maMaterialService = new WxMaMaterialServiceImpl(this);
private int retrySleepMillis = 1000;
private int maxRetryTimes = 5;
@@ -402,8 +401,4 @@ public abstract class BaseWxMaServiceImpl implements WxMaService, RequestH
return this.liveGoodsService;
}
- @Override
- public WxMaMaterialService getMaterialService() {
- return this.maMaterialService;
- }
}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMaterialServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMaterialServiceImpl.java
deleted file mode 100644
index 286afdadd..000000000
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMaterialServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.binarywang.wx.miniapp.api.impl;
-
-import cn.binarywang.wx.miniapp.api.WxMaMaterialService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import lombok.RequiredArgsConstructor;
-import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
-
-import java.io.File;
-
-/**
- *
- * Created by lipengjun on 2020/6/29.
- *
- *
- * @author lipengjun (939961241@qq.com)
- */
-@RequiredArgsConstructor
-public class WxMaMaterialServiceImpl implements WxMaMaterialService {
- private final WxMaService wxMaService;
-
- @Override
- public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException {
- String url = String.format(MEDIA_UPLOAD_URL, mediaType);
- return this.wxMaService.execute(MediaUploadRequestExecutor.create(this.wxMaService.getRequestHttp()), url, file);
- }
-}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMediaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMediaServiceImpl.java
index 06a453cae..b39f50cb4 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMediaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMediaServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.UUID;
*/
@AllArgsConstructor
public class WxMaMediaServiceImpl implements WxMaMediaService {
- private WxMaService wxMaService;
+ private final WxMaService wxMaService;
@Override
public WxMediaUploadResult uploadMedia(String mediaType, String fileType, InputStream inputStream) throws WxErrorException {
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImplTest.java
index 25e92efdc..769d82919 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImplTest.java
@@ -29,7 +29,7 @@ public class WxMaLiveGoodsServiceImplTest {
@Test
public void addGoods() throws Exception {
//上传临时素材
- WxMediaUploadResult mediaUpload = this.wxService.getMaterialService().mediaUpload("image", new File("E:\\1.png"));
+ WxMediaUploadResult mediaUpload = this.wxService.getMediaService().uploadMedia("image", new File("E:\\1.png"));
WxMaLiveInfo.Goods goods = new WxMaLiveInfo.Goods();
goods.setCoverImgUrl(mediaUpload.getMediaId());
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java
index 39d107a34..e92913366 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java
@@ -31,7 +31,7 @@ public class WxMaLiveServiceImplTest {
@Test
public void createRoom() throws Exception {
//上传临时素材
- WxMediaUploadResult mediaUpload = this.wxService.getMaterialService().mediaUpload("image", new File("E:\\1.png"));
+ WxMediaUploadResult mediaUpload = this.wxService.getMediaService().uploadMedia("image", new File("E:\\1.png"));
WxMaLiveInfo.RoomInfo roomInfo = new WxMaLiveInfo.RoomInfo();
roomInfo.setName("订阅通知直播间");