From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 02 九月 2022 16:30:20 +0800 Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代 --- ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 40 ++++++---------------------------------- 1 files changed, 6 insertions(+), 34 deletions(-) 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 26e00df..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 @@ -1,6 +1,6 @@ package com.ruoyi.common.core.controller; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; @@ -8,37 +8,9 @@ /** * web灞傞�氱敤鏁版嵁澶勭悊 * - * @author ruoyi + * @author Lion Li */ public class BaseController { - - /** - * 杩斿洖鎴愬姛 - */ - public AjaxResult<Void> success() { - return AjaxResult.success(); - } - - /** - * 杩斿洖澶辫触娑堟伅 - */ - public AjaxResult<Void> error() { - return AjaxResult.error(); - } - - /** - * 杩斿洖鎴愬姛娑堟伅 - */ - public AjaxResult<Void> success(String message) { - return AjaxResult.success(message); - } - - /** - * 杩斿洖澶辫触娑堟伅 - */ - public AjaxResult<Void> error(String message) { - return AjaxResult.error(message); - } /** * 鍝嶅簲杩斿洖缁撴灉 @@ -46,8 +18,8 @@ * @param rows 褰卞搷琛屾暟 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult<Void> toAjax(int rows) { - return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + protected R<Void> toAjax(int rows) { + return rows > 0 ? R.ok() : R.fail(); } /** @@ -56,8 +28,8 @@ * @param result 缁撴灉 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult<Void> toAjax(boolean result) { - return result ? success() : error(); + protected R<Void> toAjax(boolean result) { + return result ? R.ok() : R.fail(); } /** -- Gitblit v1.9.3