🎨 清理部分冗余代码

This commit is contained in:
Binary Wang 2020-06-30 17:21:55 +08:00
parent a00d67a58a
commit 7d20aa1743
8 changed files with 11 additions and 91 deletions

View File

@ -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;
/**
* <pre>
* 素材管理的相关接口
* 文档地址https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html
* Created by lipengjun on 2020/6/29.
* </pre>
*
* @author <a href="https://github.com/lipengjun92">lipengjun (939961241@qq.com)</a>
*/
public interface WxMaMaterialService {
String MEDIA_UPLOAD_URL = "https://api.weixin.qq.com/cgi-bin/media/upload?type=%s";
/**
* <pre>
* 新增临时素材
* 小程序获取临时素材用于直播间商品
* 素材管理接口对所有认证的订阅号和服务号开放通过本接口小程序可以新增临时素材即上传临时多媒体文件返回的mediaId用于直播间商品使用
* 请注意
* 1对于临时素材每个素材media_id会在开发者上传或粉丝发送到微信服务器3天后自动删除所以用户发送给开发者的素材若开发者需要应尽快下载到本地以节省服务器资源
* 2media_id是可复用的
* 3素材的格式大小等要求与公众平台官网一致具体是图片大小不超过2M支持png/jpeg/jpg/gif格式语音大小不超过5M长度不超过60秒支持mp3/amr格式
* 4需使用https调用本接口
* 本接口即为原上传多媒体文件接口
* 注意事项
* 上传的临时多媒体文件有格式和大小限制如下
* 图片image: 2M支持PNG\JPEG\JPG\GIF格式
* 语音voice2M播放长度不超过60s支持AMR\MP3格式
* 视频video10MB支持MP4格式
* 缩略图thumb64KB支持JPG格式
* 媒体文件在后台保存时间为3天即3天后media_id失效
* 详情请见: <a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738726&token=&lang=zh_CN">新增临时素材</a>
* 接口url格式https://api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE
* </pre>
*
* @param mediaType 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts}
* @param file 文件对象
* @throws WxErrorException
*/
WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException;
}

View File

@ -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 {
* </pre>
*
* @param mediaId 媒体Id
* @return 保存到本地的临时文件
* @return 保存到本地的临时文件 media
* @throws WxErrorException the wx error exception
*/
File getMedia(String mediaId) throws WxErrorException;

View File

@ -288,10 +288,4 @@ public interface WxMaService extends WxService {
*/
WxMaLiveGoodsService getLiveGoodsService();
/**
* 获取小程序素材管理服务对象
*
* @return .
*/
WxMaMaterialService getMaterialService();
}

View File

@ -57,7 +57,6 @@ public abstract class BaseWxMaServiceImpl<H, P> 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<H, P> implements WxMaService, RequestH
return this.liveGoodsService;
}
@Override
public WxMaMaterialService getMaterialService() {
return this.maMaterialService;
}
}

View File

@ -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;
/**
* <pre>
* Created by lipengjun on 2020/6/29.
* </pre>
*
* @author <a href="https://github.com/lipengjun92">lipengjun (939961241@qq.com)</a>
*/
@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);
}
}

View File

@ -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 {

View File

@ -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());

View File

@ -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("订阅通知直播间");