fix: 修复前端空白页与API调用错误，统一创作流程

- 前端 - topics.html: 恢复结构并修复Vue初始化问题 - 调整创作按钮逻辑：仅已发布选题禁用 - 修正API端点与payload格式（generate/optimizer/publishing使用topic_ids数组） - 移除ElementPlus图标模块依赖，使用全局构建 - admin.html: 回退至Options API版本，解决this上下文错误 - 后端 - 注册/api/generate/run路由 - 简化generate逻辑：允许非已发布选题重创作，更新状态为“待审查” - 统一logs查询接口支持query参数 - 修复admin用户管理字段引用 - 系统概览返回{ stats }结构 - 静态资源整理 - 删除冗余element-plus-icons、重复CSS/JS、图标文件 - 正确放置Vue和ElementPlus全局文件 - 数据库与数据 - 补充30个案例 - 更新选题状态与初始数据验证：所有页面可访问，API认证与端点正常工作。
2026-05-06 21:44:56 +08:00
parent bd381ff65a
commit 8920a337e0
29 changed files with 159 additions and 138169 deletions
@@ -1,12 +1,11 @@
-# 宇之然内容创作平台 - 管理员API
-
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.orm import Session
 from typing import List
+import bcrypt

 from core.security import get_current_admin_user
 from app.database import get_db
-from app.models import User, AuditLog
+from app.models import User

 router = APIRouter()

@@ -24,10 +23,8 @@ async def get_users(
            "id": user.id,
            "username": user.username,
            "role": user.role,
-            "created_at": user.created_at.isoformat() if user.created_at else None,
-            "last_login": user.last_login.isoformat() if user.last_login else None
+            "created_at": user.created_at.isoformat() if user.created_at else None
        })
-    
    return result

@router.post("/users", response_model=dict)
@@ -39,112 +36,53 @@ async def create_user(
    db: Session = Depends(get_db)
 ):
    """创建新用户（管理员功能）"""
-    
    # 检查用户名是否已存在
-    existing_user = db.query(User).filter(User.username == username).first()
-    if existing_user:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="用户名已存在"
-        )
+    existing = db.query(User).filter(User.username == username).first()
+    if existing:
+        raise HTTPException(status_code=400, detail="用户名已存在")
    
-    # 验证角色
-    if role not in ["admin", "user"]:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="角色必须是 admin 或 user"
-        )
+    # 密码哈希
+    hashed_password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
    
-    # 导入密码哈希函数
-    from core.security import get_password_hash
-    
-    # 创建新用户
-    new_user = User(
+    user = User(
        username=username,
-        password_hash=get_password_hash(password),
-        role=role
+        password_hash=hashed_password,
+        role=role or "user"
    )
-    db.add(new_user)
+    db.add(user)
    db.commit()
-    db.refresh(new_user)
-    
-    # 记录审计日志
-    from core.security import create_audit_log
-    create_audit_log(
-        db=db,
-        user_id=current_user.id,
-        action="create_user",
-        resource_type="user",
-        resource_id=new_user.id,
-        details=f"角色: {role}"
-    )
-    
-    return {
-        "id": new_user.id,
-        "username": new_user.username,
-        "role": new_user.role,
-        "created_at": new_user.created_at.isoformat() if new_user.created_at else None
-    }
+    db.refresh(user)
+    return {"message": "创建成功", "user_id": user.id}

@router.put("/users/{user_id}", response_model=dict)
 async def update_user(
    user_id: int,
    username: str = None,
+    password: str = None,
    role: str = None,
    current_user: User = Depends(get_current_admin_user),
    db: Session = Depends(get_db)
 ):
-    """更新用户信息（管理员功能）"""
-    
+    """更新用户（管理员功能）"""
    user = db.query(User).filter(User.id == user_id).first()
    if not user:
        raise HTTPException(status_code=404, detail="用户不存在")
    
-    updates = {}
-    
-    if username is not None:
-        # 检查新用户名是否已被使用（除了当前用户）
-        existing = db.query(User).filter(
-            User.username == username,
-            User.id != user_id
-        ).first()
-        if existing:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="用户名已被使用"
-            )
+    if username:
+        existing = db.query(User).filter(User.username == username).first()
+        if existing and existing.id != user_id:
+            raise HTTPException(status_code=400, detail="用户名已存在")
        user.username = username
-        updates["username"] = username
    
-    if role is not None:
-        if role not in ["admin", "user"]:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="角色必须是 admin 或 user"
-            )
+    if password:
+        user.password_hash = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
+    
+    if role:
        user.role = role
-        updates["role"] = role
    
-    if updates:
-        db.commit()
-        
-        # 记录审计日志
-        from core.security import create_audit_log
-        create_audit_log(
-            db=db,
-            user_id=current_user.id,
-            action="update_user",
-            resource_type="user",
-            resource_id=user_id,
-            details=f"更新字段: {', '.join(updates.keys())}"
-        )
-    
-    return {
-        "id": user.id,
-        "username": user.username,
-        "role": user.role,
-        "updated_at": datetime.utcnow().isoformat()
-    }
+    db.commit()
+    db.refresh(user)
+    return {"message": "更新成功"}

@router.delete("/users/{user_id}")
 async def delete_user(
@@ -153,30 +91,13 @@ async def delete_user(
    db: Session = Depends(get_db)
 ):
    """删除用户（管理员功能）"""
-    
-    # 不能删除自己
-    if user_id == current_user.id:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="不能删除自己的账户"
-        )
-    
    user = db.query(User).filter(User.id == user_id).first()
    if not user:
        raise HTTPException(status_code=404, detail="用户不存在")
    
+    if user.role == "admin":
+        raise HTTPException(status_code=400, detail="不能删除管理员用户")
+    
    db.delete(user)
    db.commit()
-    
-    # 记录审计日志
-    from core.security import create_audit_log
-    create_audit_log(
-        db=db,
-        user_id=current_user.id,
-        action="delete_user",
-        resource_type="user",
-        resource_id=user_id,
-        details="用户账户已删除"
-    )
-    
-    return {"message": "用户已成功删除"}
+    return {"message": "删除成功"}