fix: 将管理员 user_id 从动态 admin_{username} 改为固定 admin
根因:admin user_id 由 admin_ + req.Username 动态拼接, 当 .env 中 ADMIN_USERNAME 更改时,新登录会生成不同的 user_id, 导致旧会话成为孤儿且消息历史不可见。 修复方案 (Plan A): - auth_handler.go: Login 时 userID 固定为 admin - auth.go: IsAdminKey 从 HasPrefix(admin_) 改为 == admin - chat_handler.go: 主对话管理员检查改为 userID == admin - memory_handler.go: 3处 admin_ 前缀检查改为 == admin - briefing_handler.go: 3处 admin_ 前缀检查改为 != admin - sessionStore.ts: isAdminUser 从 startsWith 改为 === - MessageBubble.tsx: UserAvatar 管理员判断改为 === - main.go: 添加旧管理员用户清理逻辑 (ListUsers+DeleteUser) - user_store.go: 新增 ListUsers 和 DeleteUser 函数 - ai-core/main.go: adminUserID 从 admin_admin 改为 admin - memory-service/store.go: 默认 user_id 改为 admin - memory-service/memory_service.go: 默认 UserID 改为 admin - devtools/src/index.js: URL 参数 user_id=admin 验证: Go build 通过 (gateway/ai-core/memory-service), tsc --noEmit 通过, vite build 通过
This commit is contained in:
@@ -146,7 +146,7 @@ func (h *AuthHandler) Login(c *gin.Context) {
|
||||
if authenticated {
|
||||
// 用户存在于 users 表中且密码验证通过
|
||||
if req.Username == h.cfg.AdminUsername {
|
||||
userID = "admin_" + req.Username
|
||||
userID = "admin"
|
||||
} else {
|
||||
userID = "user_" + req.Username
|
||||
}
|
||||
@@ -167,14 +167,14 @@ func (h *AuthHandler) Login(c *gin.Context) {
|
||||
log.Println("✅ 管理员已迁移到 users 表")
|
||||
}
|
||||
}
|
||||
userID = "admin_" + req.Username
|
||||
userID = "admin"
|
||||
} else if req.Username == h.cfg.AdminUsername {
|
||||
// 数据库不可用时的回退:使用配置中的管理员密码
|
||||
if req.Password != h.cfg.AdminPassword {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "管理员密码错误"})
|
||||
return
|
||||
}
|
||||
userID = "admin_" + req.Username
|
||||
userID = "admin"
|
||||
} else {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"})
|
||||
return
|
||||
|
||||
@@ -52,7 +52,7 @@ func (h *BriefingHandler) GetBriefing(c *gin.Context) {
|
||||
userID := c.Query("user_id")
|
||||
date := c.Query("date")
|
||||
|
||||
if !strings.HasPrefix(authUserID, "admin_") || userID == "" {
|
||||
if authUserID != "admin" || userID == "" {
|
||||
userID = authUserID
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ func (h *BriefingHandler) GetLatestBriefings(c *gin.Context) {
|
||||
authUserID := middleware.GetUserID(c)
|
||||
userID := c.Query("user_id")
|
||||
|
||||
if !strings.HasPrefix(authUserID, "admin_") || userID == "" {
|
||||
if authUserID != "admin" || userID == "" {
|
||||
userID = authUserID
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ func (h *BriefingHandler) Generate(c *gin.Context) {
|
||||
}
|
||||
|
||||
// 非管理员只能为自己生成
|
||||
if !strings.HasPrefix(authUserID, "admin_") {
|
||||
if authUserID != "admin" {
|
||||
req.UserID = authUserID
|
||||
}
|
||||
|
||||
|
||||
@@ -69,11 +69,11 @@ func (h *ChatHandler) HandleWebSocket(c *gin.Context) {
|
||||
}
|
||||
|
||||
// 主对话仅限管理员访问
|
||||
if !strings.HasPrefix(userID, "admin_") {
|
||||
if userID != "admin" {
|
||||
c.JSON(http.StatusForbidden, gin.H{
|
||||
"error": "主对话仅限管理员使用",
|
||||
"errorType": "admin_only",
|
||||
"hint": "请使用管理员账号 (admin_ 前缀) 登录以访问主对话功能",
|
||||
"hint": "请使用管理员账号登录以访问主对话功能",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ import (
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -39,7 +38,7 @@ func (h *MemoryHandler) Query(c *gin.Context) {
|
||||
userID := c.Query("user_id")
|
||||
|
||||
// 非管理员只能查询自己的记忆;管理员可通过查询参数指定目标用户
|
||||
if !strings.HasPrefix(authUserID, "admin_") || userID == "" {
|
||||
if authUserID != "admin" || userID == "" {
|
||||
userID = authUserID
|
||||
}
|
||||
|
||||
@@ -90,7 +89,7 @@ func (h *MemoryHandler) List(c *gin.Context) {
|
||||
userID := c.Query("user_id")
|
||||
|
||||
// 非管理员只能查询自己的记忆;管理员可通过查询参数指定目标用户
|
||||
if !strings.HasPrefix(authUserID, "admin_") || userID == "" {
|
||||
if authUserID != "admin" || userID == "" {
|
||||
userID = authUserID
|
||||
}
|
||||
|
||||
@@ -141,7 +140,7 @@ func (h *MemoryHandler) Add(c *gin.Context) {
|
||||
|
||||
// 管理员可通过请求体指定目标用户,否则使用认证用户
|
||||
userID := authUserID
|
||||
if strings.HasPrefix(authUserID, "admin_") && req.UserID != "" {
|
||||
if authUserID == "admin" && req.UserID != "" {
|
||||
userID = req.UserID
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user