From 4d02466fed4f3ea012a80c3359cde9af0737141f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 20:01:12 +0800
Subject: [PATCH] add 增加 skywalking 集成 默认注释不开启
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index 85faa16..606895a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -15,11 +15,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.oss.core.OssClient;
+import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
@@ -40,7 +41,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name = "瀵硅薄瀛樺偍鎺у埗鍣�", description = "瀵硅薄瀛樺偍绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss")
@@ -82,7 +82,7 @@
if (ObjectUtil.isNull(file)) {
throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- SysOss oss = iSysOssService.upload(file);
+ SysOssVo oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2);
map.put("url", oss.getUrl());
map.put("fileName", oss.getOriginalName());
@@ -98,24 +98,7 @@
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
- SysOss sysOss = iSysOssService.getById(ossId);
- if (ObjectUtil.isNull(sysOss)) {
- throw new ServiceException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
- }
- response.reset();
- FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
- long data;
- try {
- data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
- } catch (HttpException e) {
- if (e.getMessage().contains("403")) {
- throw new ServiceException("鏃犺鍙栨潈闄�, 璇峰湪瀵瑰簲鐨凮SS寮�鍚�'鍏湁璇�'鏉冮檺!");
- } else {
- throw new ServiceException(e.getMessage());
- }
- }
- response.setContentLength(Convert.toInt(data));
+ iSysOssService.download(ossId,response);
}
/**
@@ -128,7 +111,7 @@
@DeleteMapping("/{ossIds}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
- return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
+ return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true));
}
}
--
Gitblit v1.9.3