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:
@@ -67,6 +67,47 @@ func GetUserByUsername(db *sql.DB, username string) (*User, error) {
|
||||
return &u, nil
|
||||
}
|
||||
|
||||
// ListUsers 列出所有用户
|
||||
func ListUsers(db *sql.DB) ([]User, error) {
|
||||
rows, err := db.Query(
|
||||
`SELECT id, username, password_hash, is_admin, created_at, updated_at
|
||||
FROM users ORDER BY id`,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询用户列表失败: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var users []User
|
||||
for rows.Next() {
|
||||
var u User
|
||||
if err := rows.Scan(&u.ID, &u.Username, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||
return nil, fmt.Errorf("扫描用户行失败: %w", err)
|
||||
}
|
||||
users = append(users, u)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("遍历用户行出错: %w", err)
|
||||
}
|
||||
if users == nil {
|
||||
users = []User{}
|
||||
}
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// DeleteUser 按 ID 删除用户
|
||||
func DeleteUser(db *sql.DB, userID int) error {
|
||||
result, err := db.Exec(`DELETE FROM users WHERE id = $1`, userID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("删除用户失败: %w", err)
|
||||
}
|
||||
affected, _ := result.RowsAffected()
|
||||
if affected == 0 {
|
||||
return fmt.Errorf("用户不存在 (id=%d)", userID)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreateUser 创建新用户
|
||||
func CreateUser(db *sql.DB, username, passwordHash string, isAdmin bool) (*User, error) {
|
||||
now := time.Now()
|
||||
|
||||
Reference in New Issue
Block a user