diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeMaterial.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeMaterial.java index a4687185580cad7e3501626c45008c5bb899ee62..1c3e9d6eafeabca116dacdc4de7e5a6531199c6c 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeMaterial.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeMaterial.java @@ -41,26 +41,6 @@ public class WeMaterial extends BaseEntity { */ private String digest; - /** - * 媒体id - */ - private String materialMediaId; - - /** - * 媒体文件上传时间戳 - */ - private String materialCreatedAt; - - /** - * 视频封面媒体id - */ - private String coverMediaId; - - /** - * 视频封面媒体文件上传时间戳 - */ - private String coverCreatedAt; - /** * 封面本地资源文件 */ diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMaterialFileVO.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMaterialFileVO.java index 9d6362736b302ecd7c16a7fcdc64dc259c9eb239..80f4fe99e556563d9cbfb01c2735564f39fa5d62 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMaterialFileVO.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMaterialFileVO.java @@ -20,14 +20,4 @@ public class WeMaterialFileVO { */ private String materialUrl; - /** - * 媒体id - */ - private String materialMediaId; - - /** - * 媒体文件上传时间戳 - */ - private Long materialCreatedAt; - } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeMaterialServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeMaterialServiceImpl.java index 7539948cfa256d326e99320789912e6f41163119..7e1bb9fad1e9aa3774f353a51d02be14cb1eb422 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeMaterialServiceImpl.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeMaterialServiceImpl.java @@ -30,9 +30,6 @@ import java.util.Optional; @Service public class WeMaterialServiceImpl implements IWeMaterialService { - @Autowired - private WeMediaClient weMediaClient; - @Autowired private WeMaterialMapper weMaterialMapper; @Autowired @@ -56,15 +53,8 @@ public class WeMaterialServiceImpl implements IWeMaterialService { if (!mediaType.isPresent()) { throw new WeComException("媒体类型出错!"); } - WeMediaDto mediaDto = weMediaClient.upload(file, mediaType.get().getMediaType()); - if (!WeConstans.WE_SUCCESS_CODE.equals(mediaDto.getErrcode())) { - throw new WeComException("临时素材上传失败!"); - } //构造返回结果 - WeMaterialFileVO weMaterialFileVO - = WeMaterialFileVO.builder().materialUrl(url).materialMediaId(mediaDto.getMedia_id()) - .materialCreatedAt(mediaDto.getCreated_at()).materialName(file.getOriginalFilename()).build(); - return weMaterialFileVO; + return WeMaterialFileVO.builder().materialUrl(url).materialName(file.getOriginalFilename()).build(); } catch (Exception e) { throw new WeComException("临时素材上传失败!"); } diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeMaterialMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeMaterialMapper.xml index 39f998fd768607f5bab31646d0467f72452d46b7..ddbe28283f510f3f1f49272b953e459b67e5371e 100644 --- a/linkwe-wecom/src/main/resources/mapper/wecom/WeMaterialMapper.xml +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeMaterialMapper.xml @@ -11,10 +11,6 @@ - - - - @@ -44,18 +40,6 @@ digest, - - material_media_id, - - - material_created_at, - - - cover_media_id, - - - cover_created_at, - cover_url, @@ -92,18 +76,6 @@ #{digest}, - - #{materialMediaId}, - - - #{materialCreatedAt}, - - - #{coverMediaId}, - - - #{coverCreatedAt}, - #{coverUrl}, @@ -142,18 +114,6 @@ digest=#{digest}, - - material_media_id=#{materialMediaId}, - - - material_created_at=#{materialCreatedAt}, - - - cover_media_id=#{coverMediaId}, - - - cover_created_at=#{coverCreatedAt}, - cover_url=#{coverUrl}, @@ -215,7 +175,7 @@ - id,category_id,material_url,content,material_name,digest,material_media_id,material_created_at,cover_media_id,cover_created_at,cover_url,create_by,create_time,update_by,update_time + id,category_id,material_url,content,material_name,digest,cover_url,create_by,create_time,update_by,update_time \ No newline at end of file