新增用户管理/角色管理/菜单管理功能，修复创作流水线研究脚本
- 用户管理：新增编辑弹窗（修改用户名/角色/密码），增加组织/创建时间/最后登录列 - 角色管理：新增 Role 模型 + CRUD API，admin.html 新增角色管理 tab - 菜单管理：新增 Menu 模型 + CRUD API，导航栏从 API 动态加载菜单项 - 个人中心：右上角下拉菜单（个人信息/修改密码/退出），新增修改密码 API - 种子数据：initial_data.py 自动创建默认角色（admin/editor）和默认菜单（7项） - 修复 research.py 缺少 enrich_topic_research 函数导致导入失败 - 修复 db_helper.py 中 generated_at 条件导致重创作不更新时间戳 - admin.html 操作列加宽防止按钮换行，平台配置增加删除按钮 - articles.html 预览弹窗加 lock-scroll=false 防止页面尺寸跳动
This commit is contained in:
Yuzhiran Dev
@@ -7,8 +7,8 @@ import os
|
||||
from dotenv import load_dotenv
|
||||
|
||||
from ..database import get_db
|
||||
from ..models import User
|
||||
from ..schemas import LoginRequest, TokenResponse, UserResponse
|
||||
from ..models import User, Role
|
||||
from ..schemas import LoginRequest, TokenResponse, UserResponse, ChangePasswordRequest
|
||||
from ..core.audit_logger import audit_log
|
||||
|
||||
# 加载环境变量
|
||||
@@ -169,3 +169,26 @@ def get_me(
|
||||
"""获取当前登录用户信息"""
|
||||
return {"user": UserResponse.model_validate(current_user)}
|
||||
|
||||
@router.put("/password")
|
||||
def change_password(
|
||||
data: ChangePasswordRequest,
|
||||
request: Request,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""修改当前用户密码"""
|
||||
if not bcrypt.checkpw(data.old_password.encode('utf-8'), current_user.password_hash.encode('utf-8')):
|
||||
raise HTTPException(status_code=400, detail="原密码错误")
|
||||
if len(data.new_password) < 6:
|
||||
raise HTTPException(status_code=400, detail="新密码至少6位")
|
||||
current_user.password_hash = bcrypt.hashpw(data.new_password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
|
||||
db.commit()
|
||||
audit_log(
|
||||
action="change_password",
|
||||
user=current_user,
|
||||
ip_address=request.client.host if request.client else None,
|
||||
user_agent=request.headers.get("user-agent", ""),
|
||||
db=db
|
||||
)
|
||||
return {"message": "密码修改成功"}
|
||||
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
from sqlalchemy.orm import Session
|
||||
from typing import List
|
||||
|
||||
from ..database import get_db
|
||||
from ..models import Menu, User
|
||||
from ..schemas import MenuCreate, MenuUpdate, MenuResponse
|
||||
from .auth import get_current_admin, get_current_user
|
||||
|
||||
router = APIRouter(prefix="/api/admin/menus", tags=["admin"])
|
||||
public_router = APIRouter(prefix="/api/menus", tags=["menus"])
|
||||
|
||||
@router.get("", response_model=List[MenuResponse])
|
||||
def list_menus(db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
menus = db.query(Menu).order_by(Menu.sort_order).all()
|
||||
return [MenuResponse.model_validate(m) for m in menus]
|
||||
|
||||
@public_router.get("/active", response_model=List[MenuResponse])
|
||||
def get_active_menus(request: Request, db: Session = Depends(get_db)):
|
||||
try:
|
||||
user = get_current_user(request, db)
|
||||
role = user.role
|
||||
except Exception:
|
||||
role = None
|
||||
menus = db.query(Menu).filter(Menu.is_active == True).order_by(Menu.sort_order).all()
|
||||
result = []
|
||||
for m in menus:
|
||||
allowed_roles = m.roles or []
|
||||
if not allowed_roles or (role and role in allowed_roles):
|
||||
result.append(MenuResponse.model_validate(m))
|
||||
return result
|
||||
|
||||
@router.post("", response_model=MenuResponse)
|
||||
def create_menu(data: MenuCreate, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
menu = Menu(**data.model_dump())
|
||||
db.add(menu)
|
||||
db.commit()
|
||||
db.refresh(menu)
|
||||
return MenuResponse.model_validate(menu)
|
||||
|
||||
@router.put("/{menu_id}", response_model=MenuResponse)
|
||||
def update_menu(menu_id: int, data: MenuUpdate, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
menu = db.query(Menu).filter(Menu.id == menu_id).first()
|
||||
if not menu:
|
||||
raise HTTPException(status_code=404, detail="菜单不存在")
|
||||
update_data = data.model_dump(exclude_unset=True)
|
||||
for key, val in update_data.items():
|
||||
setattr(menu, key, val)
|
||||
db.commit()
|
||||
db.refresh(menu)
|
||||
return MenuResponse.model_validate(menu)
|
||||
|
||||
@router.delete("/{menu_id}")
|
||||
def delete_menu(menu_id: int, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
menu = db.query(Menu).filter(Menu.id == menu_id).first()
|
||||
if not menu:
|
||||
raise HTTPException(status_code=404, detail="菜单不存在")
|
||||
if menu.children:
|
||||
raise HTTPException(status_code=400, detail="请先删除子菜单")
|
||||
db.delete(menu)
|
||||
db.commit()
|
||||
return {"message": "删除成功"}
|
||||
@@ -0,0 +1,52 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
from sqlalchemy.orm import Session
|
||||
from typing import List
|
||||
|
||||
from ..database import get_db
|
||||
from ..models import Role, User
|
||||
from ..schemas import RoleCreate, RoleUpdate, RoleResponse
|
||||
from .auth import get_current_admin
|
||||
|
||||
router = APIRouter(prefix="/api/admin/roles", tags=["admin"])
|
||||
|
||||
@router.get("", response_model=List[RoleResponse])
|
||||
def list_roles(db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
roles = db.query(Role).order_by(Role.name).all()
|
||||
return [RoleResponse.model_validate(r) for r in roles]
|
||||
|
||||
@router.post("", response_model=RoleResponse)
|
||||
def create_role(data: RoleCreate, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
existing = db.query(Role).filter(Role.name == data.name).first()
|
||||
if existing:
|
||||
raise HTTPException(status_code=400, detail="角色已存在")
|
||||
role = Role(name=data.name, description=data.description, is_system=False)
|
||||
db.add(role)
|
||||
db.commit()
|
||||
db.refresh(role)
|
||||
return RoleResponse.model_validate(role)
|
||||
|
||||
@router.put("/{role_id}", response_model=RoleResponse)
|
||||
def update_role(role_id: int, data: RoleUpdate, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
role = db.query(Role).filter(Role.id == role_id).first()
|
||||
if not role:
|
||||
raise HTTPException(status_code=404, detail="角色不存在")
|
||||
if role.is_system:
|
||||
raise HTTPException(status_code=400, detail="系统角色不可编辑")
|
||||
if data.name is not None:
|
||||
role.name = data.name
|
||||
if data.description is not None:
|
||||
role.description = data.description
|
||||
db.commit()
|
||||
db.refresh(role)
|
||||
return RoleResponse.model_validate(role)
|
||||
|
||||
@router.delete("/{role_id}")
|
||||
def delete_role(role_id: int, request: Request, db: Session = Depends(get_db), admin_user: User = Depends(get_current_admin)):
|
||||
role = db.query(Role).filter(Role.id == role_id).first()
|
||||
if not role:
|
||||
raise HTTPException(status_code=404, detail="角色不存在")
|
||||
if role.is_system:
|
||||
raise HTTPException(status_code=400, detail="系统角色不可删除")
|
||||
db.delete(role)
|
||||
db.commit()
|
||||
return {"message": "删除成功"}
|
||||
@@ -104,6 +104,18 @@ def init_db():
|
||||
("trend_field_mappings", "field_name", "VARCHAR"),
|
||||
("trend_field_mappings", "sort_order", "INTEGER DEFAULT 0"),
|
||||
("trend_field_mappings", "is_active", "BOOLEAN DEFAULT TRUE"),
|
||||
("roles", "id", "INTEGER PRIMARY KEY"),
|
||||
("roles", "name", "VARCHAR UNIQUE"),
|
||||
("roles", "description", "VARCHAR DEFAULT ''"),
|
||||
("roles", "is_system", "BOOLEAN DEFAULT FALSE"),
|
||||
("menus", "id", "INTEGER PRIMARY KEY"),
|
||||
("menus", "parent_id", "INTEGER REFERENCES menus(id)"),
|
||||
("menus", "name", "VARCHAR"),
|
||||
("menus", "path", "VARCHAR"),
|
||||
("menus", "icon", "VARCHAR DEFAULT ''"),
|
||||
("menus", "sort_order", "INTEGER DEFAULT 0"),
|
||||
("menus", "roles", "JSON DEFAULT '[]'::json"),
|
||||
("menus", "is_active", "BOOLEAN DEFAULT TRUE"),
|
||||
]:
|
||||
try:
|
||||
conn.execute(text(f"ALTER TABLE {table} ADD COLUMN IF NOT EXISTS {col} {typ}"))
|
||||
@@ -112,6 +124,15 @@ def init_db():
|
||||
conn.execute(text(f"ALTER TABLE {table} ADD COLUMN {col} {typ}"))
|
||||
except Exception:
|
||||
pass
|
||||
# Create roles and menus tables if they don't exist
|
||||
for tbl_sql in [
|
||||
"CREATE TABLE IF NOT EXISTS roles (id SERIAL PRIMARY KEY, name VARCHAR UNIQUE NOT NULL, description VARCHAR DEFAULT '', is_system BOOLEAN DEFAULT FALSE, created_at TIMESTAMP WITH TIME ZONE DEFAULT now())",
|
||||
"CREATE TABLE IF NOT EXISTS menus (id SERIAL PRIMARY KEY, parent_id INTEGER REFERENCES menus(id), name VARCHAR NOT NULL, path VARCHAR NOT NULL, icon VARCHAR DEFAULT '', sort_order INTEGER DEFAULT 0, roles JSON DEFAULT '[]'::json, is_active BOOLEAN DEFAULT TRUE, created_at TIMESTAMP WITH TIME ZONE DEFAULT now())",
|
||||
]:
|
||||
try:
|
||||
conn.execute(text(tbl_sql))
|
||||
except Exception:
|
||||
pass
|
||||
conn.commit()
|
||||
except Exception:
|
||||
pass # SQLite 不支持 IF NOT EXISTS，但 create_all 对 SQLite 够用，这里仅为 PostgreSQL 迁移
|
||||
|
||||
@@ -6,7 +6,7 @@ from .database import SessionLocal, init_db
|
||||
from .models import (
|
||||
Topic, TopicField, TopicConfigField, TopicStatusConfig,
|
||||
User, Case, LLMConfig, SystemConfig, PlatformConfig,
|
||||
CollectorCategory, CollectorSource
|
||||
CollectorCategory, CollectorSource, Role, Menu
|
||||
)
|
||||
import bcrypt
|
||||
|
||||
@@ -252,6 +252,29 @@ def import_initial_data():
|
||||
db.commit()
|
||||
print(f"✅ 导入 {len(cases_data)} 条案例")
|
||||
|
||||
# 初始化默认角色
|
||||
if db.query(Role).count() == 0:
|
||||
db.add(Role(name="admin", description="系统管理员", is_system=True))
|
||||
db.add(Role(name="editor", description="编辑人员", is_system=True))
|
||||
db.commit()
|
||||
print("✅ 插入默认角色")
|
||||
|
||||
# 初始化默认菜单（与 uni-nav.js 对齐）
|
||||
if db.query(Menu).count() == 0:
|
||||
default_menus = [
|
||||
{"name": "仪表盘", "path": "/", "icon": "IconHome", "sort_order": 0, "roles": ["admin", "editor"]},
|
||||
{"name": "选题", "path": "topics.html", "icon": "IconTopic", "sort_order": 1, "roles": ["admin", "editor"]},
|
||||
{"name": "数据", "path": "metrics.html", "icon": "IconData", "sort_order": 2, "roles": ["admin", "editor"]},
|
||||
{"name": "日历", "path": "calendar.html", "icon": "IconCalendar", "sort_order": 3, "roles": ["admin", "editor"]},
|
||||
{"name": "素材", "path": "assets.html", "icon": "IconFolder", "sort_order": 4, "roles": ["admin", "editor"]},
|
||||
{"name": "任务", "path": "tasks.html", "icon": "IconMenu", "sort_order": 5, "roles": ["admin", "editor"]},
|
||||
{"name": "系统", "path": "admin.html", "icon": "IconSetting", "sort_order": 6, "roles": ["admin"]},
|
||||
]
|
||||
for m in default_menus:
|
||||
db.add(Menu(**m))
|
||||
db.commit()
|
||||
print("✅ 插入默认菜单")
|
||||
|
||||
# 同步 PostgreSQL 自增序列
|
||||
if os.getenv('USE_POSTGRES', 'true').lower() == 'true':
|
||||
try:
|
||||
|
||||
@@ -9,7 +9,7 @@ from pathlib import Path
|
||||
|
||||
from .database import engine, get_db, init_db
|
||||
from .models import Base
|
||||
from .api import topics, system, articles, publishing, auth, admin, audit, optimizer_logs, cases, task_logs, task_configs, prompt_configs, llm_configs, system_configs, topic_config, calendar, metrics, assets, tasks, platform_config, collector_mgmt, assistant, config_items
|
||||
from .api import topics, system, articles, publishing, auth, admin, audit, optimizer_logs, cases, task_logs, task_configs, prompt_configs, llm_configs, system_configs, topic_config, calendar, metrics, assets, tasks, platform_config, collector_mgmt, assistant, config_items, role_configs, menu_configs
|
||||
from .initial_data import import_initial_data
|
||||
from .core.scheduler import scheduler
|
||||
|
||||
@@ -44,7 +44,10 @@ app.add_middleware(
|
||||
)
|
||||
|
||||
# 初始化数据库
|
||||
Base.metadata.create_all(bind=engine)
|
||||
try:
|
||||
Base.metadata.create_all(bind=engine)
|
||||
except Exception:
|
||||
pass
|
||||
init_db()
|
||||
import_initial_data()
|
||||
|
||||
@@ -97,6 +100,9 @@ app.include_router(platform_config.router)
|
||||
app.include_router(collector_mgmt.router)
|
||||
app.include_router(assistant.router)
|
||||
app.include_router(config_items.router)
|
||||
app.include_router(role_configs.router)
|
||||
app.include_router(menu_configs.router)
|
||||
app.include_router(menu_configs.public_router)
|
||||
|
||||
# 挂载自动生成的图片（必须先于前端根挂载）
|
||||
PROJECT_ROOT_DIR = Path(__file__).parent.parent.parent.parent
|
||||
|
||||
@@ -57,6 +57,54 @@ class User(Base):
|
||||
}
|
||||
|
||||
|
||||
class Role(Base):
|
||||
__tablename__ = "roles"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
|
||||
name = Column(String, unique=True, nullable=False)
|
||||
description = Column(String, default="")
|
||||
is_system = Column(Boolean, default=False)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
"id": self.id,
|
||||
"name": self.name,
|
||||
"description": self.description,
|
||||
"is_system": self.is_system,
|
||||
"created_at": self.created_at.isoformat() if self.created_at else None
|
||||
}
|
||||
|
||||
|
||||
class Menu(Base):
|
||||
__tablename__ = "menus"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
|
||||
parent_id = Column(Integer, ForeignKey("menus.id"), nullable=True)
|
||||
name = Column(String, nullable=False)
|
||||
path = Column(String, nullable=False)
|
||||
icon = Column(String, default="")
|
||||
sort_order = Column(Integer, default=0)
|
||||
roles = Column(JSON, default=list)
|
||||
is_active = Column(Boolean, default=True)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
parent = relationship("Menu", remote_side=[id], backref="children")
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
"id": self.id,
|
||||
"parent_id": self.parent_id,
|
||||
"name": self.name,
|
||||
"path": self.path,
|
||||
"icon": self.icon,
|
||||
"sort_order": self.sort_order,
|
||||
"roles": self.roles or [],
|
||||
"is_active": self.is_active,
|
||||
"created_at": self.created_at.isoformat() if self.created_at else None
|
||||
}
|
||||
|
||||
|
||||
class TopicField(Base):
|
||||
__tablename__ = "topic_fields"
|
||||
|
||||
|
||||
@@ -389,11 +389,18 @@ class UserUpdate(BaseModel):
|
||||
class UserResponse(UserBase):
|
||||
id: int
|
||||
org_id: Optional[str] = None
|
||||
last_login: Optional[datetime] = None
|
||||
created_at: Optional[datetime] = None
|
||||
updated_at: Optional[datetime] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class ChangePasswordRequest(BaseModel):
|
||||
old_password: str
|
||||
new_password: str
|
||||
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
username: str
|
||||
password: str
|
||||
@@ -545,3 +552,56 @@ class SystemStatus(BaseModel):
|
||||
execution_time: Optional[float] = None
|
||||
|
||||
|
||||
class RoleBase(BaseModel):
|
||||
name: str
|
||||
description: str = ""
|
||||
is_system: bool = False
|
||||
|
||||
|
||||
class RoleCreate(RoleBase):
|
||||
pass
|
||||
|
||||
|
||||
class RoleUpdate(BaseModel):
|
||||
name: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
|
||||
|
||||
class RoleResponse(RoleBase):
|
||||
id: int
|
||||
created_at: Optional[datetime] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class MenuBase(BaseModel):
|
||||
parent_id: Optional[int] = None
|
||||
name: str
|
||||
path: str
|
||||
icon: str = ""
|
||||
sort_order: int = 0
|
||||
roles: List[str] = []
|
||||
is_active: bool = True
|
||||
|
||||
|
||||
class MenuCreate(MenuBase):
|
||||
pass
|
||||
|
||||
|
||||
class MenuUpdate(BaseModel):
|
||||
parent_id: Optional[int] = None
|
||||
name: Optional[str] = None
|
||||
path: Optional[str] = None
|
||||
icon: Optional[str] = None
|
||||
sort_order: Optional[int] = None
|
||||
roles: Optional[List[str]] = None
|
||||
is_active: Optional[bool] = None
|
||||
|
||||
|
||||
class MenuResponse(MenuBase):
|
||||
id: int
|
||||
created_at: Optional[datetime] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user