From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 08d7e7e..47e9032 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
@@ -2,6 +2,7 @@
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
@@ -9,8 +10,9 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.oss.constant.CloudConstant;
@@ -47,7 +49,7 @@
* @author Lion Li
*/
@Validated
-@Api(value = "OSS浜戝瓨鍌ㄦ帶鍒跺櫒", tags = {"OSS浜戝瓨鍌ㄧ鐞�"})
+@Api(value = "OSS瀵硅薄瀛樺偍鎺у埗鍣�", tags = {"OSS瀵硅薄瀛樺偍绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/oss")
@@ -57,29 +59,29 @@
private final ISysConfigService iSysConfigService;
/**
- * 鏌ヨOSS浜戝瓨鍌ㄥ垪琛�
+ * 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
- @ApiOperation("鏌ヨOSS浜戝瓨鍌ㄥ垪琛�")
+ @ApiOperation("鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:oss:list')")
@GetMapping("/list")
- public TableDataInfo<SysOssVo> list(@Validated SysOssBo bo) {
+ public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
return iSysOssService.queryPageList(bo);
}
/**
- * 涓婁紶OSS浜戝瓨鍌�
+ * 涓婁紶OSS瀵硅薄瀛樺偍
*/
- @ApiOperation("涓婁紶OSS浜戝瓨鍌�")
+ @ApiOperation("涓婁紶OSS瀵硅薄瀛樺偍")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "鏂囦欢", dataType = "java.io.File", required = true),
})
@PreAuthorize("@ss.hasPermi('system:oss:upload')")
- @Log(title = "OSS浜戝瓨鍌�", businessType = BusinessType.INSERT)
+ @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping("/upload")
public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
- if (file.isEmpty()) {
- throw new CustomException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ if (ObjectUtil.isNull(file)) {
+ throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
SysOss oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2);
@@ -88,13 +90,13 @@
return AjaxResult.success(map);
}
- @ApiOperation("涓嬭浇OSS浜戝瓨鍌�")
+ @ApiOperation("涓嬭浇OSS瀵硅薄瀛樺偍")
@PreAuthorize("@ss.hasPermi('system:oss:download')")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
SysOss sysOss = iSysOssService.getById(ossId);
- if (sysOss == null) {
- throw new CustomException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
+ if (ObjectUtil.isNull(sysOss)) {
+ throw new ServiceException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
}
response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
@@ -106,11 +108,11 @@
}
/**
- * 鍒犻櫎OSS浜戝瓨鍌�
+ * 鍒犻櫎OSS瀵硅薄瀛樺偍
*/
- @ApiOperation("鍒犻櫎OSS浜戝瓨鍌�")
+ @ApiOperation("鍒犻櫎OSS瀵硅薄瀛樺偍")
@PreAuthorize("@ss.hasPermi('system:oss:remove')")
- @Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.DELETE)
+ @Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
@@ -122,7 +124,7 @@
*/
@ApiOperation("鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��")
@PreAuthorize("@ss.hasPermi('system:oss:edit')")
- @Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.UPDATE)
+ @Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.UPDATE)
@PutMapping("/changePreviewListResource")
public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
Map<String, Boolean> map = JsonUtils.parseMap(body);
--
Gitblit v1.9.3