From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 8aed41c..26e00df 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
@@ -2,7 +2,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.LoginUtils;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
/**
@@ -70,28 +70,28 @@
/**
* 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
*/
- public LoginUser getUser() {
- return LoginUtils.getLoginUser();
+ public LoginUser getLoginUser() {
+ return LoginHelper.getLoginUser();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛id
*/
public Long getUserId() {
- return LoginUtils.getUserId();
+ return LoginHelper.getUserId();
}
/**
* 鑾峰彇鐧诲綍閮ㄩ棬id
*/
public Long getDeptId() {
- return LoginUtils.getDeptId();
+ return LoginHelper.getDeptId();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
public String getUsername() {
- return LoginUtils.getUsername();
+ return LoginHelper.getUsername();
}
}
--
Gitblit v1.9.3