From b1be47f0a03b52b8df7971fc8174364aa1cc32a0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 15:06:54 +0800
Subject: [PATCH] !114 接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG Merge pull request !114 from dawn9117/N/A
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 3557bc3..a901e0a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -3,16 +3,16 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.service.IUserService;
+import com.ruoyi.common.core.service.UserService;
import java.util.List;
/**
* 鐢ㄦ埛 涓氬姟灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface ISysUserService extends IService<SysUser>, IUserService {
+public interface ISysUserService extends IService<SysUser>, UserService {
TableDataInfo<SysUser> selectPageUserList(SysUser user);
@@ -23,7 +23,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public List<SysUser> selectUserList(SysUser user);
+ List<SysUser> selectUserList(SysUser user);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
@@ -31,7 +31,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public TableDataInfo<SysUser> selectAllocatedList(SysUser user);
+ TableDataInfo<SysUser> selectAllocatedList(SysUser user);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
@@ -39,7 +39,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public TableDataInfo<SysUser> selectUnallocatedList(SysUser user);
+ TableDataInfo<SysUser> selectUnallocatedList(SysUser user);
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -47,7 +47,8 @@
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserByUserName(String userName);
+ @Override
+ SysUser selectUserByUserName(String userName);
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
@@ -55,7 +56,8 @@
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserById(Long userId);
+ @Override
+ SysUser selectUserById(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
@@ -63,7 +65,7 @@
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
- public String selectUserRoleGroup(String userName);
+ String selectUserRoleGroup(String userName);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
@@ -71,7 +73,7 @@
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
- public String selectUserPostGroup(String userName);
+ String selectUserPostGroup(String userName);
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
@@ -79,7 +81,7 @@
* @param userName 鐢ㄦ埛鍚嶇О
* @return 缁撴灉
*/
- public String checkUserNameUnique(String userName);
+ String checkUserNameUnique(String userName);
/**
* 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
@@ -87,7 +89,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public String checkPhoneUnique(SysUser user);
+ String checkPhoneUnique(SysUser user);
/**
* 鏍￠獙email鏄惁鍞竴
@@ -95,21 +97,21 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public String checkEmailUnique(SysUser user);
+ String checkEmailUnique(SysUser user);
/**
* 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
*
* @param user 鐢ㄦ埛淇℃伅
*/
- public void checkUserAllowed(SysUser user);
+ void checkUserAllowed(SysUser user);
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
*
* @param userId 鐢ㄦ埛id
*/
- public void checkUserDataScope(Long userId);
+ void checkUserDataScope(Long userId);
/**
* 鏂板鐢ㄦ埛淇℃伅
@@ -117,7 +119,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int insertUser(SysUser user);
+ int insertUser(SysUser user);
/**
* 娉ㄥ唽鐢ㄦ埛淇℃伅
@@ -125,7 +127,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public boolean registerUser(SysUser user);
+ boolean registerUser(SysUser user);
/**
* 淇敼鐢ㄦ埛淇℃伅
@@ -133,15 +135,15 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUser(SysUser user);
+ int updateUser(SysUser user);
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
*
- * @param userId 鐢ㄦ埛ID
+ * @param userId 鐢ㄦ埛ID
* @param roleIds 瑙掕壊缁�
*/
- public void insertUserAuth(Long userId, Long[] roleIds);
+ void insertUserAuth(Long userId, Long[] roleIds);
/**
* 淇敼鐢ㄦ埛鐘舵��
@@ -149,7 +151,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUserStatus(SysUser user);
+ int updateUserStatus(SysUser user);
/**
* 淇敼鐢ㄦ埛鍩烘湰淇℃伅
@@ -157,16 +159,16 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUserProfile(SysUser user);
+ int updateUserProfile(SysUser user);
/**
* 淇敼鐢ㄦ埛澶村儚
*
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
- public boolean updateUserAvatar(String userName, String avatar);
+ boolean updateUserAvatar(String userName, String avatar);
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -174,7 +176,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int resetPwd(SysUser user);
+ int resetPwd(SysUser user);
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -183,7 +185,7 @@
* @param password 瀵嗙爜
* @return 缁撴灉
*/
- public int resetUserPwd(String userName, String password);
+ int resetUserPwd(String userName, String password);
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
@@ -191,7 +193,7 @@
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
- public int deleteUserById(Long userId);
+ int deleteUserById(Long userId);
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
@@ -199,15 +201,15 @@
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
- public int deleteUserByIds(Long[] userIds);
+ int deleteUserByIds(Long[] userIds);
/**
* 瀵煎叆鐢ㄦ埛鏁版嵁
*
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+ * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
* @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
+ * @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+ String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
}
--
Gitblit v1.9.3