From 1b7cde73f31b8a508efaee4d43a2af781223e193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 11 Feb 2022 17:53:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=94=E5=9B=9E=E4=BD=93=20?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/web/controller/BaseController.java   | 31 ++-----------------
 .../controller/SysConfigController.java       |  2 +-
 .../controller/SysDictDataController.java     |  2 +-
 .../controller/SysDictTypeController.java     |  2 +-
 .../system/controller/SysUserController.java  |  2 +-
 5 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
index b64c8250..72b5d557 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * web层通用数据处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Slf4j
 public class BaseController {
@@ -28,34 +28,7 @@ public class BaseController {
      * @return 操作结果
      */
     protected R<Void> toAjax(boolean result) {
-        return result ? success() : error();
+        return result ? R.ok() : R.fail();
     }
 
-    /**
-     * 返回成功
-     */
-    public R<Void> success() {
-        return R.ok();
-    }
-
-    /**
-     * 返回失败消息
-     */
-    public R<Void> error() {
-        return R.fail();
-    }
-
-    /**
-     * 返回成功消息
-     */
-    public R<Void> success(String message) {
-        return R.ok(message);
-    }
-
-    /**
-     * 返回失败消息
-     */
-    public R<Void> error(String message) {
-        return R.fail(message);
-    }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
index a1e0105d..da1e21a3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
@@ -119,7 +119,7 @@ public class SysConfigController extends BaseController {
     @DeleteMapping("/{configIds}")
     public R<Void> remove(@PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
-        return success();
+        return R.ok();
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
index 84d039cd..62673c63 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
@@ -107,6 +107,6 @@ public class SysDictDataController extends BaseController {
     @DeleteMapping("/{dictCodes}")
     public R<Void> remove(@PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
-        return success();
+        return R.ok();
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
index 62e515c0..0da03347 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
@@ -97,7 +97,7 @@ public class SysDictTypeController extends BaseController {
     @DeleteMapping("/{dictIds}")
     public R<Void> remove(@PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
-        return success();
+        return R.ok();
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 5ab1d2b5..7adc8060 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -255,6 +255,6 @@ public class SysUserController extends BaseController {
     public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
-        return success();
+        return R.ok();
     }
 }