From 53da7140c2683e4d80c0b2536b7972d9c516729a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 29 一月 2022 11:48:41 +0800
Subject: [PATCH] update 调整返回类型为 R

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 e432107..15b3075 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
@@ -9,7 +9,7 @@
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -75,7 +75,7 @@
     @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping("/upload")
-    public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+    public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
         }
@@ -83,7 +83,7 @@
         Map<String, String> map = new HashMap<>(2);
         map.put("url", oss.getUrl());
         map.put("fileName", oss.getFileName());
-        return AjaxResult.success(map);
+        return R.ok(map);
     }
 
     @ApiOperation("涓嬭浇OSS瀵硅薄瀛樺偍")
@@ -117,7 +117,7 @@
     @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
-    public AjaxResult<Void> remove(@ApiParam("OSS瀵硅薄ID涓�")
+    public R<Void> remove(@ApiParam("OSS瀵硅薄ID涓�")
                                    @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
                                    @PathVariable Long[] ossIds) {
         return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
@@ -130,7 +130,7 @@
     @SaCheckPermission("system:oss:edit")
     @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.UPDATE)
     @PutMapping("/changePreviewListResource")
-    public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
+    public R<Void> changePreviewListResource(@RequestBody String body) {
         Map<String, Boolean> map = JsonUtils.parseMap(body);
         SysConfig sysConfig = new SysConfig();
         sysConfig.setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY);

--
Gitblit v1.9.3