Merge remote-tracking branch 'origin/feature/xxxd'

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -90,12 +90,6 @@
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.0.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc.shibei</groupId>
-            <artifactId>epdc-oss-client</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

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")
+	@GetMapping(value="oss/file/uploadXxxdImg")
-	Result<UploadDTO> saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl);
+	Result<String> 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<UploadDTO> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl);
+	Result<String> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl);
 }

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<UploadDTO> saveWeChatFaceImg(String avatarUrl) {
+	public Result<String> uploadXxxdImg(String imgUrl) {
-		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl);
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdImg", imgUrl);
 	}
 
 	@Override
-	public Result<UploadDTO> uploadXxxdVoice(String itemVoiceUrl) {
+	public Result<String> uploadXxxdVoice(String itemVoiceUrl) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdVoice", itemVoiceUrl);
 	}
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -5669,9 +5669,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @return 返回示例：
      */
     private String getVoiceUrl(String itemVoiceUrl) {
-        Result<UploadDTO> ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl);
+        Result<String> ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl);
-        if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) {
+        if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) {
-            return ossRes.getData().getUrl();
+            return ossRes.getData();
         }else{
             log.error("新新向党随手拍语音上传oss失败,语音url："+itemVoiceUrl);
         }
@@ -5686,9 +5686,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     private List<String> getEpdcImgUrl(List<String> images) {
         List<String> urlList = new ArrayList<>();
         for (String url : images) {
-            Result<UploadDTO> ossRes = ossFeignClient.saveWeChatFaceImg(url);
+            Result<String> ossRes = ossFeignClient.uploadXxxdImg(url);
-            if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) {
+            if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) {
-                urlList.add(ossRes.getData().getUrl());
+                urlList.add(ossRes.getData());
             }else{
                 log.error("新新向党随手拍图片上传oss失败，图片url："+url);
             }

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<UploadDTO> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl){
+    public Result<String> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl){
         if(StringUtils.isBlank(itemVoiceUrl)){
             return null;
         }
-        return new Result<UploadDTO>().ok(ossService.uploadXxxdVoice(itemVoiceUrl));
+        return new Result<String>().ok(ossService.uploadXxxdVoice(itemVoiceUrl));
     }
 
 
+    @GetMapping(value = "uploadXxxdImg")
+    public Result<String> uploadXxxdImg(@RequestParam("imgUrl") String imgUrl) {
+        Result<UploadDTO> result = ossService.saveWeChatFaceImg(imgUrl);
+        if (result.success() && null != result.getData()) {
+            return new Result<String>().ok(result.getData().getUrl());
+        }
+        return new Result<String>().ok("");
+    }
 }

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<OssEntity> {
      */
     Result<List<String>> compressImg(List<String> imgUrlList);
 
-    UploadDTO uploadXxxdVoice(String itemVoiceUrl);
+    String uploadXxxdVoice(String itemVoiceUrl);
 }

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<OssDao, OssEntity> 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<OssDao, OssEntity> implement
         } catch (IOException e) {
             e.printStackTrace();
         }
-        UploadDTO uploadDTO=new UploadDTO();
+        return resultUr;
-        uploadDTO.setUrl(resultUr);
-        return uploadDTO;
     }
 }