diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/LoginUserApi.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/LoginUserApi.java index 6a13bcf10..64831a710 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/LoginUserApi.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/LoginUserApi.java @@ -69,15 +69,6 @@ public interface LoginUserApi { */ LoginUser getLoginUserNullable(); - /** - * 获取是否是超级管理员的标识 - * - * @return true-是超级管理员,false-不是超级管理员 - * @author fengshuonan - * @since 2020/11/4 15:45 - */ - boolean getSuperAdminFlag(); - /** * 判断当前用户是否登录 * @@ -87,14 +78,4 @@ public interface LoginUserApi { */ boolean hasLogin(); - /** - * 是否包含某个按钮的权限 - * - * @param buttonCode 按钮的编码 - * @return true-有权限,false-没有权限 - * @author fengshuonan - * @since 2021/1/9 11:32 - */ - boolean haveButton(String buttonCode); - } diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java index e076dfead..1e62131b7 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginUserImpl.java @@ -31,7 +31,7 @@ import cn.stylefeng.roses.kernel.auth.api.exception.AuthException; import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum; import cn.stylefeng.roses.kernel.auth.api.loginuser.CommonLoginUserUtil; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -49,7 +49,7 @@ public class LoginUserImpl implements LoginUserApi { private SessionManagerApi sessionManagerApi; @Resource - private UserServiceApi userServiceApi; + private SysUserServiceApi sysUserServiceApi; @Override public String getToken() { @@ -101,12 +101,6 @@ public class LoginUserImpl implements LoginUserApi { } - @Override - public boolean getSuperAdminFlag() { - LoginUser loginUser = getLoginUser(); - return loginUser.getSuperAdmin(); - } - @Override public boolean hasLogin() { @@ -122,14 +116,4 @@ public class LoginUserImpl implements LoginUserApi { return sessionManagerApi.haveSession(token); } - @Override - public boolean haveButton(String buttonCode) { - LoginUser loginUser = getLoginUser(); - if (loginUser.getButtonCodes() == null) { - return false; - } else { - return loginUser.getButtonCodes().contains(buttonCode); - } - } - } diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java index 91e0a0256..b4ba07a51 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java @@ -30,20 +30,16 @@ import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.auth.api.SessionManagerApi; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; -import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander; -import cn.stylefeng.roses.kernel.rule.callback.ConfigUpdateCallback; import java.util.*; -import static cn.stylefeng.roses.kernel.message.api.constants.MessageConstants.WEB_SOCKET_WS_URL_CONFIG_CODE; - /** * 基于redis的会话管理 * * @author fengshuonan * @since 2019-09-28-14:43 */ -public class DefaultSessionManager implements SessionManagerApi, ConfigUpdateCallback { +public class DefaultSessionManager implements SessionManagerApi { /** * 登录用户缓存 @@ -188,15 +184,4 @@ public class DefaultSessionManager implements SessionManagerApi, ConfigUpdateCal return loginUsers; } - @Override - public void configUpdate(String code, String value) { - // 如果系统配置修改了websocket url,则刷新所有在线用户的配置 - if (WEB_SOCKET_WS_URL_CONFIG_CODE.equals(code)) { - Map allKeyValues = loginUserCache.getAllKeyValues(); - for (LoginUser loginUser : allKeyValues.values()) { - loginUser.setWsUrl(WebSocketConfigExpander.getWebSocketWsUrl()); - this.updateSession(loginUser.getToken(), loginUser); - } - } - } }