diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Filter.java b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Filter.java index dfe4267e..59d7e09e 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Filter.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Filter.java @@ -104,18 +104,6 @@ public class Oauth2Filter extends AuthenticatingFilter { if (StringUtils.isNotBlank(authorization) && authorization.startsWith("Bearer ")) { token = authorization.replace("Bearer ", ""); } - - // 开发环境:如果知识库接口没有 token,返回一个开发专用的 dummy token - if (StringUtils.isBlank(token)) { - String path = httpRequest.getRequestURI(); - String contextPath = httpRequest.getContextPath(); - if (StringUtils.isNotBlank(contextPath) && path.startsWith(contextPath)) { - path = path.substring(contextPath.length()); - } - if (path.equals("/datasets") || path.startsWith("/datasets/") || path.startsWith("/api/v1/")) { - token = "DEV_TEST_TOKEN"; - } - } return token; } } \ No newline at end of file diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java index cad275fd..27c3bc49 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java @@ -76,17 +76,6 @@ public class Oauth2Realm extends AuthorizingRealm { protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { String accessToken = (String) token.getPrincipal(); - // 开发环境:处理 dummy token - if ("DEV_TEST_TOKEN".equals(accessToken)) { - UserDetail userDetail = new UserDetail(); - userDetail.setId(1L); - userDetail.setUsername("test"); - userDetail.setSuperAdmin(SuperAdminEnum.YES.value()); // 赋予超级管理员权限以绕过所有权限检查 - userDetail.setToken(accessToken); - userDetail.setStatus(1); - return new SimpleAuthenticationInfo(userDetail, accessToken, getName()); - } - // 根据accessToken,查询用户信息 SysUserTokenEntity tokenEntity = shiroService.getByToken(accessToken); // token失效 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/user/SecurityUser.java b/main/manager-api/src/main/java/xiaozhi/modules/security/user/SecurityUser.java index 71d13554..0581f95c 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/user/SecurityUser.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/user/SecurityUser.java @@ -25,16 +25,13 @@ public class SecurityUser { */ public static UserDetail getUser() { Subject subject = getSubject(); - UserDetail user = null; - if (subject != null) { - user = (UserDetail) subject.getPrincipal(); + if (subject == null) { + return new UserDetail(); } + UserDetail user = (UserDetail) subject.getPrincipal(); if (user == null) { - user = new UserDetail(); - user.setId(1L); - user.setUsername("test"); - user.setSuperAdmin(1); + return new UserDetail(); } return user;