refactor: 认证系统重构 + DevTools CLI 重写 + 文档全面更新
- auth: Login 简化为管理员始终通过 .env 验证,GetProfile 修正 admin DB 查询 - devtools: .sh/.bat 同步重写为完整 CLI (start/stop/status/logs/build/db:*) - docs: 新增 devtools.md,重写 Deploy.md (三种方式+Windows说明),更新 README/gateway-api - voice-service: DashScope 实时流式 STT 支持 - gateway: Phase 6 多模型配置 + 多端客户端管理 + WebSocket 增强 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
type User struct {
|
||||
ID int `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Nickname string `json:"nickname"`
|
||||
PasswordHash string `json:"-"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
@@ -23,6 +24,7 @@ func CreateUsersTable(db *sql.DB) error {
|
||||
query := `CREATE TABLE IF NOT EXISTS users (
|
||||
id SERIAL PRIMARY KEY,
|
||||
username VARCHAR(255) UNIQUE NOT NULL,
|
||||
nickname VARCHAR(255) DEFAULT '',
|
||||
password_hash VARCHAR(255) NOT NULL,
|
||||
is_admin BOOLEAN DEFAULT FALSE,
|
||||
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
@@ -33,6 +35,9 @@ func CreateUsersTable(db *sql.DB) error {
|
||||
return fmt.Errorf("创建 users 表失败: %w", err)
|
||||
}
|
||||
|
||||
// 迁移:为已有 users 表添加 nickname 列
|
||||
db.Exec(`ALTER TABLE users ADD COLUMN IF NOT EXISTS nickname VARCHAR(255) DEFAULT ''`)
|
||||
|
||||
// 创建索引
|
||||
indexQueries := []string{
|
||||
`CREATE INDEX IF NOT EXISTS idx_users_username ON users(username)`,
|
||||
@@ -52,10 +57,10 @@ func CreateUsersTable(db *sql.DB) error {
|
||||
func GetUserByUsername(db *sql.DB, username string) (*User, error) {
|
||||
var u User
|
||||
err := db.QueryRow(
|
||||
`SELECT id, username, password_hash, is_admin, created_at, updated_at
|
||||
`SELECT id, username, COALESCE(nickname, '') as nickname, password_hash, is_admin, created_at, updated_at
|
||||
FROM users WHERE username = $1`,
|
||||
username,
|
||||
).Scan(&u.ID, &u.Username, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt)
|
||||
).Scan(&u.ID, &u.Username, &u.Nickname, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt)
|
||||
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, nil
|
||||
@@ -70,7 +75,7 @@ func GetUserByUsername(db *sql.DB, username string) (*User, error) {
|
||||
// ListUsers 列出所有用户
|
||||
func ListUsers(db *sql.DB) ([]User, error) {
|
||||
rows, err := db.Query(
|
||||
`SELECT id, username, password_hash, is_admin, created_at, updated_at
|
||||
`SELECT id, username, COALESCE(nickname, '') as nickname, password_hash, is_admin, created_at, updated_at
|
||||
FROM users ORDER BY id`,
|
||||
)
|
||||
if err != nil {
|
||||
@@ -81,7 +86,7 @@ func ListUsers(db *sql.DB) ([]User, error) {
|
||||
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 {
|
||||
if err := rows.Scan(&u.ID, &u.Username, &u.Nickname, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt); err != nil {
|
||||
return nil, fmt.Errorf("扫描用户行失败: %w", err)
|
||||
}
|
||||
users = append(users, u)
|
||||
@@ -109,16 +114,16 @@ func DeleteUser(db *sql.DB, userID int) error {
|
||||
}
|
||||
|
||||
// CreateUser 创建新用户
|
||||
func CreateUser(db *sql.DB, username, passwordHash string, isAdmin bool) (*User, error) {
|
||||
func CreateUser(db *sql.DB, username, nickname, passwordHash string, isAdmin bool) (*User, error) {
|
||||
now := time.Now()
|
||||
var u User
|
||||
err := db.QueryRow(
|
||||
`INSERT INTO users (username, password_hash, is_admin, created_at, updated_at)
|
||||
VALUES ($1, $2, $3, $4, $4)
|
||||
ON CONFLICT (username) DO UPDATE SET updated_at = $4
|
||||
RETURNING id, username, password_hash, is_admin, created_at, updated_at`,
|
||||
username, passwordHash, isAdmin, now,
|
||||
).Scan(&u.ID, &u.Username, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt)
|
||||
`INSERT INTO users (username, nickname, password_hash, is_admin, created_at, updated_at)
|
||||
VALUES ($1, $2, $3, $4, $5, $5)
|
||||
ON CONFLICT (username) DO UPDATE SET nickname = $2, updated_at = $5
|
||||
RETURNING id, username, COALESCE(nickname, '') as nickname, password_hash, is_admin, created_at, updated_at`,
|
||||
username, nickname, passwordHash, isAdmin, now,
|
||||
).Scan(&u.ID, &u.Username, &u.Nickname, &u.PasswordHash, &u.IsAdmin, &u.CreatedAt, &u.UpdatedAt)
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建用户失败: %w", err)
|
||||
|
||||
Reference in New Issue
Block a user