From 1273421498f5e2afdf5bfef50b9358c45458fefd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 10 二月 2022 09:32:26 +0800
Subject: [PATCH] add 增加 issue 与 pr 模板

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 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 2f1c6ed..611cb15 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,8 +1,8 @@
 package com.ruoyi.common.core.controller;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
+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;
 
 /**
@@ -15,29 +15,29 @@
     /**
      * 杩斿洖鎴愬姛
      */
-    public AjaxResult<Void> success() {
-        return AjaxResult.success();
+    public R<Void> success() {
+        return R.ok();
     }
 
     /**
      * 杩斿洖澶辫触娑堟伅
      */
-    public AjaxResult<Void> error() {
-        return AjaxResult.error();
+    public R<Void> error() {
+        return R.fail();
     }
 
     /**
      * 杩斿洖鎴愬姛娑堟伅
      */
-    public AjaxResult<Void> success(String message) {
-        return AjaxResult.success(message);
+    public R<Void> success(String message) {
+        return R.ok(message);
     }
 
     /**
      * 杩斿洖澶辫触娑堟伅
      */
-    public AjaxResult<Void> error(String message) {
-        return AjaxResult.error(message);
+    public R<Void> error(String message) {
+        return R.fail(message);
     }
 
     /**
@@ -46,8 +46,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,7 +56,7 @@
      * @param result 缁撴灉
      * @return 鎿嶄綔缁撴灉
      */
-    protected AjaxResult<Void> toAjax(boolean result) {
+    protected R<Void> toAjax(boolean result) {
         return result ? success() : error();
     }
 
@@ -70,28 +70,28 @@
     /**
      * 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
      */
-    public SysUser getUser() {
-        return SecurityUtils.getUser();
+    public LoginUser getLoginUser() {
+        return LoginHelper.getLoginUser();
     }
 
     /**
      * 鑾峰彇鐧诲綍鐢ㄦ埛id
      */
     public Long getUserId() {
-        return SecurityUtils.getUserId();
+        return LoginHelper.getUserId();
     }
 
     /**
      * 鑾峰彇鐧诲綍閮ㄩ棬id
      */
     public Long getDeptId() {
-        return SecurityUtils.getDeptId();
+        return LoginHelper.getDeptId();
     }
 
     /**
      * 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
      */
     public String getUsername() {
-        return SecurityUtils.getUsername();
+        return LoginHelper.getUsername();
     }
 }

--
Gitblit v1.9.3