From 8a2f988be665d1b7379859d846d42e8ee8a5a55a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 二月 2022 17:46:36 +0800
Subject: [PATCH] update 返回体 统一
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 32 ++------------------------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 2 +-
6 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 8cbea8e..2dcb843 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -121,7 +121,7 @@
@DeleteMapping("/{configIds}")
public R<Void> remove(@ApiParam("鍙傛暟ID涓�") @PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
- return success();
+ return R.ok();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index cf23f86..060e980 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -108,6 +108,6 @@
@DeleteMapping("/{dictCodes}")
public R<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
- return success();
+ return R.ok();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index 54e31e4..c8ebd49 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -98,7 +98,7 @@
@DeleteMapping("/{dictIds}")
public R<Void> remove(@ApiParam("瀛楀吀ID涓�") @PathVariable Long[] dictIds) {
dictTypeService.deleteDictTypeByIds(dictIds);
- return success();
+ return R.ok();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index c1c7950..6595f06 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -31,9 +31,9 @@
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
- return error("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
}
registerService.register(user);
- return success();
+ return R.ok();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 18ba4a3..0c2e9e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -170,7 +170,7 @@
@DeleteMapping("/{userIds}")
public R<Void> remove(@ApiParam("瑙掕壊ID涓�") @PathVariable Long[] userIds) {
if (ArrayUtil.contains(userIds, getUserId())) {
- return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
+ return R.fail("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
return toAjax(userService.deleteUserByIds(userIds));
}
@@ -231,6 +231,6 @@
public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
userService.checkUserDataScope(userId);
userService.insertUserAuth(userId, roleIds);
- return success();
+ return R.ok();
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 611cb15..1e0a5d5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -8,37 +8,9 @@
/**
* web灞傞�氱敤鏁版嵁澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
public class BaseController {
-
- /**
- * 杩斿洖鎴愬姛
- */
- 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);
- }
/**
* 鍝嶅簲杩斿洖缁撴灉
@@ -57,7 +29,7 @@
* @return 鎿嶄綔缁撴灉
*/
protected R<Void> toAjax(boolean result) {
- return result ? success() : error();
+ return result ? R.ok() : R.fail();
}
/**
--
Gitblit v1.9.3