From 9ed5b521d613edb51b160cca931ee680019e2896 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 三月 2023 22:26:13 +0800
Subject: [PATCH] fix 修复 用户密码暴露问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
index edeb7a6..d03bfcd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
@@ -6,12 +6,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.bo.SysOssBo;
+import com.ruoyi.system.domain.vo.SysOssUploadVo;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import jakarta.servlet.http.HttpServletResponse;
@@ -25,7 +26,6 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
* 鏂囦欢涓婁紶 鎺у埗灞�
@@ -38,7 +38,7 @@
@RequestMapping("/system/oss")
public class SysOssController extends BaseController {
- private final ISysOssService iSysOssService;
+ private final ISysOssService sysOssService;
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
@@ -46,7 +46,7 @@
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
- return iSysOssService.queryPageList(bo, pageQuery);
+ return sysOssService.queryPageList(bo, pageQuery);
}
/**
@@ -58,7 +58,7 @@
@GetMapping("/listByIds/{ossIds}")
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
- List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
+ List<SysOssVo> list = sysOssService.listByIds(Arrays.asList(ossIds));
return R.ok(list);
}
@@ -70,16 +70,16 @@
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+ public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) {
throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- SysOssVo oss = iSysOssService.upload(file);
- return R.ok(Map.of(
- "url", oss.getUrl(),
- "fileName", oss.getOriginalName(),
- "ossId", oss.getOssId().toString()
- ));
+ SysOssVo oss = sysOssService.upload(file);
+ SysOssUploadVo uploadVo = new SysOssUploadVo();
+ uploadVo.setUrl(oss.getUrl());
+ uploadVo.setFileName(oss.getOriginalName());
+ uploadVo.setOssId(oss.getOssId().toString());
+ return R.ok(uploadVo);
}
/**
@@ -90,7 +90,7 @@
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
- iSysOssService.download(ossId, response);
+ sysOssService.download(ossId, response);
}
/**
@@ -103,7 +103,7 @@
@DeleteMapping("/{ossIds}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
- return toAjax(iSysOssService.deleteWithValidByIds(List.of(ossIds), true));
+ return toAjax(sysOssService.deleteWithValidByIds(List.of(ossIds), true));
}
}
--
Gitblit v1.9.3