feat(phase4): 全部业务模块迁移到 modules/(结构迁移)

- 21 个模块目录(auth/system/dictionary/configuration/cms/member/region/link/notice/job/log/upload/index)
- 每个模块 router.py(合并模块导出多个 router)/schemas.py/service.py/repository.py/models.py
- routers/v1.py 与 routers/__init__.py 改为直接引用 modules,前缀与权限串原样保留
- core/middleware.py 懒加载指向 modules.system.menu / modules.log;core/redis_client.py 指向 modules.job.scheduler
- apps/views|services|forms 全部改为 re-export 垫片
- 迁移后 grep 守门通过:modules/core 无 apps/extensions 残留引用
- 实测登录、27+ 模块接口、写操作 commit、操作日志落库均正常

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
2026-08-07 10:13:30 +08:00
co-authored by Claude
parent b2c7b93786
commit 64a5504396
156 changed files with 7977 additions and 7533 deletions
+14
View File
@@ -0,0 +1,14 @@
# +========== 迁移新增:本模块 Repository 层
"""modules/configuration 数据访问层。"""
from modules.configuration.models import Config, ConfigItem
from shared.base_repository import BaseRepository
class ConfigRepository(BaseRepository[Config]):
pass
config_repo = ConfigRepository(Config)
class ConfigItemRepository(BaseRepository[ConfigItem]):
pass
configitem_repo = ConfigItemRepository(ConfigItem)
+200
View File
@@ -0,0 +1,200 @@
import asyncio
from fastapi import APIRouter, Request
from modules.configuration.schemas import ConfigForm
from core.middleware import check_demo
from core.middleware import permission_required
from modules.configuration import service as config
from core import R
from utils.request import parse_batch_ids
# 创建路由
config_router = APIRouter()
# 查询分页数据
@config_router.get('/page', summary='查询分页数据')
@permission_required("sys:config:page")
def page(request: Request):
# 调用查询分页数据服务方法
result = config.get_config_page(request)
# 返回结果
return result
# 查询配置详情
@config_router.get('/detail/{id}', summary='查询配置详情')
@permission_required("sys:config:detail")
def detail(request: Request, id):
# 调用查询配置详情服务方法
data = config.get_config_detail(id)
# 返回结果
return R.ok(data=data)
# 添加配置
@config_router.post('/add', summary='添加配置')
@permission_required("sys:config:add")
@check_demo
def add(request: Request, data: ConfigForm):
# 调用添加配置服务
result = config.add_config(request, data)
# 返回结果
return result
# 更新配置
@config_router.put('/update', summary='更新配置')
@permission_required("sys:config:update")
@check_demo
def update(request: Request, data: ConfigForm):
# 调用更新配置服务方法
result = config.update_config(request, data)
# 返回结果
return result
# 删除配置
@config_router.delete('/delete/{id}', summary='删除配置')
@permission_required("sys:config:delete")
@check_demo
def delete(request: Request, id):
# 调用删除配置服务方法
result = config.delete_config(id)
# 返回结果
return result
# 批量删除配置
@config_router.delete('/batchDelete', summary='批量删除配置')
@permission_required("sys:config:batch_delete")
@check_demo
async def batch_delete(request: Request):
"""
批量删除配置
Request Body:
[1, 2, 3] # 配置ID数组
"""
id_str, err = await parse_batch_ids(request)
if err:
return err
return await asyncio.to_thread(config.delete_config, id_str)
# 获取网站配置数据
@config_router.get('/web', summary='获取网站配置数据')
@permission_required("sys:config:page")
def web(request: Request):
# 调用获取网站配置信息方法
data = config.get_config_info(request)
return R.ok(data=data)
# 保存网站配置数据
@config_router.put('/webSave', summary='保存网站配置数据')
@permission_required("sys:config:update")
@check_demo
async def web_save(request: Request):
# 调用保存网站配置信息方法
result = await config.save_config_info(request)
return result
import asyncio
from fastapi import APIRouter, Request
from modules.configuration.schemas import ConfigItemForm, ConfigItemStatusForm
from core.middleware import permission_required
from modules.configuration import service as config_item
from core.middleware import check_demo
from core import R
from utils.request import parse_batch_ids
# 创建路由
config_item_router = APIRouter()
# 查询分页数据
@config_item_router.get('/page', summary='查询分页数据')
@permission_required("sys:configitem:page")
def page(request: Request):
# 调用查询分页数据服务方法
result = config_item.get_config_item_page(request)
# 返回结果
return result
# 查询配置项详情
@config_item_router.get('/detail/{id}', summary='查询配置项详情')
@permission_required("sys:configitem:detail")
def detail(request: Request, id):
# 调用查询配置项详情服务方法
data = config_item.get_config_item_detail(id)
# 返回结果
return R.ok(data=data)
# 添加配置项
@config_item_router.post('/add', summary='添加配置项')
@permission_required("sys:configitem:add")
@check_demo
def add(request: Request, data: ConfigItemForm):
# 调用添加配置项服务
result = config_item.add_config_item(request, data)
# 返回结果
return result
# 更新配置项
@config_item_router.put('/update', summary='更新配置项')
@permission_required("sys:configitem:update")
@check_demo
def update(request: Request, data: ConfigItemForm):
# 调用更新配置项服务方法
result = config_item.update_config_item(request, data)
# 返回结果
return result
# 删除配置项
@config_item_router.delete('/delete/{id}', summary='删除配置项')
@permission_required("sys:configitem:delete")
@check_demo
def delete(request: Request, id):
# 调用删除配置项服务方法
result = config_item.delete_config_item(id)
# 返回结果
return result
# 设置配置项状态
@config_item_router.put('/status', summary='设置配置项状态')
@permission_required("sys:configitem:status")
@check_demo
def status(request: Request, data: ConfigItemStatusForm):
# 调用设置配置项状态服务方法
result = config_item.update_config_item_status(request, data)
# 返回结果
return result
# 批量删除配置项
@config_item_router.delete('/batchDelete', summary='批量删除配置项')
@permission_required("sys:configitem:batch_delete")
@check_demo
async def batch_delete(request: Request):
"""
批量删除配置项
Request Body:
[1, 2, 3] # 配置项ID数组
"""
id_str, err = await parse_batch_ids(request)
if err:
return err
return await asyncio.to_thread(config_item.delete_config_item, id_str)
+35
View File
@@ -0,0 +1,35 @@
from typing import Optional
from pydantic import BaseModel, Field
# 配置表单验证
class ConfigForm(BaseModel):
id: Optional[int] = Field(None, description="配置ID")
name: str = Field(..., min_length=1, max_length=150, description="配置名称")
sort: int = Field(..., ge=0, le=99999, description="配置排序")
note: Optional[str] = Field(None, max_length=255, description="配置备注")
from typing import Optional
from pydantic import BaseModel, Field
# 配置项表单验证
class ConfigItemForm(BaseModel):
id: Optional[int] = Field(None, description="配置项ID")
title: str = Field(..., min_length=1, max_length=150, description="配置项标题")
code: str = Field(..., min_length=1, max_length=150, description="配置项编码")
value: str = Field(..., min_length=1, max_length=1000, description="配置项值")
options: Optional[str] = Field(None, max_length=1000, description="配置选项")
config_id: int = Field(..., ge=0, description="配置ID")
type: str = Field(..., min_length=1, max_length=150, description="配置类型")
sort: int = Field(..., ge=0, le=99999, description="配置项排序")
note: Optional[str] = Field(None, max_length=255, description="配置项备注")
# 设置状态表单
class ConfigItemStatusForm(BaseModel):
id: int = Field(..., gt=0, description="配置项ID")
status: int = Field(..., ge=1, le=2, description="配置项状态")
+361
View File
@@ -0,0 +1,361 @@
import asyncio
from datetime import datetime, timezone
from fastapi.logger import logger
from sqlalchemy import and_
from shared.constants import PAGE_SIZE
from modules.configuration.schemas import ConfigForm
from modules.configuration.models import Config
from modules.configuration.models import ConfigItem
from config import FASTAPI_IMAGE_URL
from core.database import get_db_session
from core import R
from utils.rich_text import get_file_url, save_file
from utils.request import like_contains
from core.security import get_user_id
# 配置表单验证
def get_config_page(request):
db = get_db_session()
# 页码
page = int(request.query_params.get("pageNo", 1))
# 每页数
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
# 实例化查询对象
query = db.query(Config).filter(Config.is_delete == 0)
# 配置名称
name = request.query_params.get('name')
if name:
query = query.filter(Config.name.like(like_contains(name), escape='\\'))
# 排序
query = query.order_by(Config.sort.asc())
# 记录总数
count = query.count()
# 分页查询
config_list = query.limit(limit).offset((page - 1) * limit).all()
# 若当前页超出末页(数据被并发删除),自动回退到第一页
if page > 1 and not config_list:
page = 1
count = query.count()
config_list = query.limit(limit).offset(0).all()
# 实例化结果
result = []
# 遍历数据源
if len(config_list) > 0:
for item in config_list:
# 对象转字典
data = item.to_dict()
# 加入列表
result.append(data)
# 返回结果
return R.ok(data=result, count=count)
# 根据ID获取配置详情
def get_config_detail(config_id):
db = get_db_session()
# 根据ID查询配置
config = db.query(Config).filter(and_(Config.id == config_id, Config.is_delete == 0)).first()
# 查询结果判空
if not config:
return None
# 对象转字典
data = config.to_dict()
# 返回结果
return data
# 添加配置
def add_config(request, data: ConfigForm):
db = get_db_session()
# 唯一性校验
if db.query(Config).filter(and_(Config.name == data.name, Config.is_delete == 0)).first():
return R.failed("配置名称不能重复")
# 表单数据赋值给对象
config = Config(**data.model_dump(exclude={'id'}))
config.create_user = get_user_id(request)
# 插入数据
config.save()
# 返回结果
return R.ok(msg="添加成功")
# 更新配置
def update_config(request, data: ConfigForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 唯一性校验(排除自身)
if db.query(Config).filter(and_(Config.name == data.name, Config.id != data.id, Config.is_delete == 0)).first():
return R.failed("配置名称不能重复")
# 根据ID查询记录
config = db.query(Config).filter(and_(Config.id == data.id, Config.is_delete == 0)).first()
# 查询结果判空
if not config:
return R.failed("记录不存在")
# 构造更新数据(排除 id)
updData = data.model_dump(exclude={'id'})
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
result = db.query(Config).filter_by(id=data.id).update(updData)
# 提交数据
if not result:
return R.failed("更新失败")
# 返回结果
return R.ok(msg="更新成功")
# 删除配置
def delete_config(config_id):
return Config.batch_delete_r(config_id)
# 解析配置项选项字符串为字典
def _parse_options(options_str):
"""将 'k1=v1,k2=v2' 格式的选项字符串解析为字典"""
if not options_str:
return {}
result = {}
for part in options_str.split(','):
parts = part.split('=', 1)
if len(parts) == 2:
result[parts[0]] = parts[1]
return result
# 获取网站配置信息
def get_config_info(request):
db = get_db_session()
# 一次性查询所有配置组
configList = db.query(Config).filter(Config.is_delete == 0).order_by(Config.sort.asc()).all()
if not configList:
return []
# 一次性查询所有活跃配置项,按config_id分组
config_ids = [c.id for c in configList]
all_items = db.query(ConfigItem).filter(
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1, ConfigItem.config_id.in_(config_ids))
).order_by(ConfigItem.sort.asc()).all()
items_map = {}
for item in all_items:
items_map.setdefault(item.config_id, []).append(item)
config_list = []
for val in configList:
config = {
'config_id': val.id,
'config_name': val.name
}
data_list = []
for v in items_map.get(val.id, []):
data = {
"id": v.id,
"title": v.title,
"code": v.code,
"value": v.value,
"type": v.type,
}
item_type = v.type
if item_type == "checkbox":
data['optionsList'] = _parse_options(v.options)
data["value"] = v.value.split(',') if v.value else []
elif item_type in ("radio", "select"):
data['optionsList'] = _parse_options(v.options)
elif item_type == "image":
if v.value:
data["value"] = get_file_url(v.value)
elif item_type == "images":
if v.value:
data["value"] = [get_file_url(img) for img in v.value.split(',')]
data_list.append(data)
config['data_list'] = data_list
config_list.append(config)
return config_list
# 保存网站配置信息
async def save_config_info(request):
# 获取请求参数
req_data = await request.json()
if not req_data or not isinstance(req_data, dict):
return R.failed("请求参数异常")
def _save():
db = get_db_session()
# 预加载所有活跃配置项,仅允许修改这些项
valid_items = db.query(ConfigItem).filter(
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1)
).all()
item_map = {item.code: item for item in valid_items}
# 数据源处理
for key, val in req_data.items():
# 仅允许修改已存在的活跃配置项,忽略非法key
config_item = item_map.get(key)
if not config_item:
continue
# 图片数据
item = []
if isinstance(val, list):
for v in val:
if isinstance(v, str) and (v.startswith("http://") or v.startswith("https://")):
url = save_file(v, "config")
item.append(url)
else:
item.append(v)
val = ','.join(item)
else:
if isinstance(val, str) and (val.startswith("http://") or val.startswith("https://")):
val = save_file(val, "config")
# 设置
config_item.value = val
# 同步DB操作与网络下载放入线程池,避免阻塞事件循环
await asyncio.to_thread(_save)
# 返回结果
return R.ok()
from datetime import datetime, timezone
from fastapi.logger import logger
from sqlalchemy import and_
from shared.enums import CONFIG_DATA_TYPE_LIST
from shared.constants import PAGE_SIZE
from modules.configuration.schemas import ConfigItemForm, ConfigItemStatusForm
from modules.configuration.models import ConfigItem
from core.database import get_db_session
from core import R
from core.security import get_user_id
from utils.request import like_contains
# 查询配置项分页数据
def get_config_item_page(request):
db = get_db_session()
# 页码
page = int(request.query_params.get("pageNo", 1))
# 每页数
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
# 实例化查询对象
query = db.query(ConfigItem).filter(ConfigItem.is_delete == 0)
# 配置ID
config_id = request.query_params.get('config_id', 0)
query = query.filter(ConfigItem.config_id == config_id)
# 配置项项名称模糊筛选
title = request.query_params.get('title')
if title:
query = query.filter(ConfigItem.title.like(like_contains(title), escape='\\'))
# 排序
query = query.order_by(ConfigItem.sort.asc())
# 记录总数
count = query.count()
# 分页查询
config_list = query.limit(limit).offset((page - 1) * limit).all()
# 若当前页超出末页(数据被并发删除),自动回退到第一页
if page > 1 and not config_list:
page = 1
count = query.count()
config_list = query.limit(limit).offset(0).all()
# 实例化结果
result = []
# 遍历数据源
if len(config_list) > 0:
for item in config_list:
# 对象转字典
data = item.to_dict()
# 配置项类型
data['type_name'] = CONFIG_DATA_TYPE_LIST.get(item.type)
# 加入列表
result.append(data)
# 返回结果
return R.ok(data=result, count=count)
# 根据ID查询配置项详情
def get_config_item_detail(config_id):
db = get_db_session()
# 根据ID查询配置项
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == config_id, ConfigItem.is_delete == 0)).first()
# 查询结果判空
if not config_data:
return None
# 对象转字典
data = config_data.to_dict()
# 返回结果
return data
# 添加配置项
def add_config_item(request, data: ConfigItemForm):
db = get_db_session()
# 表单数据赋值给对象
config_data = ConfigItem(**data.model_dump(exclude={'id'}))
config_data.create_user = get_user_id(request)
# 插入数据
config_data.save()
# 返回结果
return R.ok(msg="添加成功")
# 更新配置项
def update_config_item(request, data: ConfigItemForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 根据ID查询记录
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
# 查询结果判空
if not config_data:
return R.failed("记录不存在")
# 构造更新数据(排除 id)
updData = data.model_dump(exclude={'id'})
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
result = db.query(ConfigItem).filter_by(id=data.id).update(updData)
# 提交数据
if not result:
return R.failed("更新失败")
# 返回结果
return R.ok(msg="更新成功")
# 删除配置项
def delete_config_item(config_id):
return ConfigItem.batch_delete_r(config_id)
# 设置状态
def update_config_item_status(request, data: ConfigItemStatusForm):
db = get_db_session()
# 根据ID查询记录
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
# 查询结果判空
if not config_data:
return R.failed("记录不存在")
# 更新记录
result = db.query(ConfigItem).filter_by(id=data.id).update({
"status": data.status,
"update_user": get_user_id(request),
"update_time": datetime.now(tz=timezone.utc)
})
# 提交数据
if not result:
return R.failed("设置失败")
# 返回结果
return R.ok(msg="设置成功")