From 431bf5d86508b6d3fc0cb6ceeb400dbe672273c4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 31 May 2023 09:40:48 +0800 Subject: [PATCH] =?UTF-8?q?events=E4=B8=8D=E8=83=BD=E5=BC=95=E7=94=A8oss,?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4feign=E9=87=8D=E5=90=8D=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E4=BE=9D=E8=B5=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-events/epdc-events-server/pom.xml | 6 ------ .../esua/epdc/modules/feign/OssFeignClient.java | 9 ++++----- .../feign/fallback/OssFeignClientFallback.java | 8 ++++---- .../modules/item/service/impl/ItemServiceImpl.java | 12 ++++++------ .../elink/esua/epdc/controller/OssController.java | 13 +++++++++++-- .../com/elink/esua/epdc/service/OssService.java | 2 +- .../esua/epdc/service/impl/OssServiceImpl.java | 6 ++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 99e045b03..d5971b8c5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -90,12 +90,6 @@ rocketmq-spring-boot-starter 2.0.3 - - com.esua.epdc.shibei - epdc-oss-client - 1.0.0 - compile - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java index de0d72ac0..93db676e0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.modules.feign.fallback.OssFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -33,16 +32,16 @@ public interface OssFeignClient { /** * 下载url的图片，上传到oss - * @param avatarUrl 图片url，入参示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg + * @param imgUrl 图片url，入参示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg * @return 下载avatarUrl图片，返参示例：https://epdc-shibei.elinkservice.cn/files-pro/20230530/8ed41af545e04e0cae0d4398d80c704e.jpg */ - @GetMapping(value="oss/file/saveWeChatFaceImg") - Result saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl); + @GetMapping(value="oss/file/uploadXxxdImg") + Result uploadXxxdImg(@RequestParam("imgUrl")String imgUrl); /** * @param itemVoiceUrl:新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3 * @return 上传到oss */ @GetMapping(value = "oss/file/uploadXxxdVoice") - Result uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl); + Result uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java index 0f885be98..1250eb45d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.modules.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.modules.feign.OssFeignClient; import org.springframework.stereotype.Component; @@ -22,12 +21,13 @@ public class OssFeignClientFallback implements OssFeignClient { } @Override - public Result saveWeChatFaceImg(String avatarUrl) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl); + public Result uploadXxxdImg(String imgUrl) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdImg", imgUrl); } @Override - public Result uploadXxxdVoice(String itemVoiceUrl) { + public Result uploadXxxdVoice(String itemVoiceUrl) { return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdVoice", itemVoiceUrl); } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 25b15c32c..fd2b07509 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -5664,9 +5664,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @return 返回示例： */ private String getVoiceUrl(String itemVoiceUrl) { - Result ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl); - if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) { - return ossRes.getData().getUrl(); + Result ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl); + if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) { + return ossRes.getData(); }else{ log.error("新新向党随手拍语音上传oss失败,语音url："+itemVoiceUrl); } @@ -5681,9 +5681,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem private List getEpdcImgUrl(List images) { List urlList = new ArrayList<>(); for (String url : images) { - Result ossRes = ossFeignClient.saveWeChatFaceImg(url); - if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) { - urlList.add(ossRes.getData().getUrl()); + Result ossRes = ossFeignClient.uploadXxxdImg(url); + if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) { + urlList.add(ossRes.getData()); }else{ log.error("新新向党随手拍图片上传oss失败，图片url："+url); } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java index b997e2e36..2b4e591ee 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java @@ -8,6 +8,7 @@ package com.elink.esua.epdc.controller; +import com.baomidou.mybatisplus.extension.api.R; import com.elink.esua.epdc.UploadImgAllDTO; import com.elink.esua.epdc.cloud.AbstractCloudStorageService; import com.elink.esua.epdc.cloud.AliyunCloudStorageService; @@ -340,12 +341,20 @@ public class OssController { * @return 上传到oss */ @GetMapping(value = "uploadXxxdVoice") - public Result uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl){ + public Result uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl){ if(StringUtils.isBlank(itemVoiceUrl)){ return null; } - return new Result().ok(ossService.uploadXxxdVoice(itemVoiceUrl)); + return new Result().ok(ossService.uploadXxxdVoice(itemVoiceUrl)); } + @GetMapping(value = "uploadXxxdImg") + public Result uploadXxxdImg(@RequestParam("imgUrl") String imgUrl) { + Result result = ossService.saveWeChatFaceImg(imgUrl); + if (result.success() && null != result.getData()) { + return new Result().ok(result.getData().getUrl()); + } + return new Result().ok(""); + } } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java index 3d2f4fb02..06c243eaa 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java @@ -68,5 +68,5 @@ public interface OssService extends BaseService { */ Result> compressImg(List imgUrlList); - UploadDTO uploadXxxdVoice(String itemVoiceUrl); + String uploadXxxdVoice(String itemVoiceUrl); } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/impl/OssServiceImpl.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/impl/OssServiceImpl.java index 8ba983f1e..e17b69083 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/impl/OssServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/impl/OssServiceImpl.java @@ -153,7 +153,7 @@ public class OssServiceImpl extends BaseServiceImpl implement @Override - public UploadDTO uploadXxxdVoice(String itemVoiceUrl) { + public String uploadXxxdVoice(String itemVoiceUrl) { String resultUr=""; try { //实例化url @@ -167,8 +167,6 @@ public class OssServiceImpl extends BaseServiceImpl implement } catch (IOException e) { e.printStackTrace(); } - UploadDTO uploadDTO=new UploadDTO(); - uploadDTO.setUrl(resultUr); - return uploadDTO; + return resultUr; } }