From 5913dbbb7bcc1d8258151edffa3e5befcd7710f6 Mon Sep 17 00:00:00 2001 From: GZH <1206563805@qq.com> Date: Sat, 14 Feb 2026 01:58:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(knowledge):=E9=87=8D=E6=9E=84=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E6=A8=A1=E5=9D=97=E6=9E=B6=E6=9E=84=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96DTO=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将BotController暂时注释以重新设计Agent集成方案 - 在多个DTO类中添加@JsonIgnoreProperties注解提升JSON序列化兼容性- 修改ChunkDTO中positions字段类型为嵌套列表并添加token字段 -为DatasetDTO和DocumentDTO添加更多时间日期字段映射 -重构KnowledgeBaseAdapter接口参数结构使用统一的请求对象 - 实现DocumentStatusSyncTask定时任务同步文档处理状态 -优化KnowledgeBaseService统计信息更新机制 - 修复数据集删除时的级联删除逻辑防止孤儿数据 - 统一本地实体ID与RAGFlow ID避免前端调用错误 --- .../modules/security/oauth2/Oauth2Filter.java | 12 ------------ .../xiaozhi/modules/security/oauth2/Oauth2Realm.java | 11 ----------- .../xiaozhi/modules/security/user/SecurityUser.java | 11 ++++------- 3 files changed, 4 insertions(+), 30 deletions(-) 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;