feat(cookieManager): 登录用户去掉Cookie值/域名,登录网站增加关联用户下拉

登录用户:
- 模型删除 cookie_value / domain 两列(连同 to_dict)
- 列表表头、新增/编辑表单移除对应控件;保存/更新不再校验 Cookie 值
  (改为只校验 用户名 + 网站URL)

登录网站:
- CookieSite 新增 cookie_user_id(关联 admin_cookie_user.id,可空)
- 列表新增「关联用户」列,未关联显示灰色「未关联」标签;查询栏支持按用户筛选
- 新增/编辑页用 layui 下拉框选择登录用户(lay-search 可搜索,显示
  “昵称(用户名)· 网站名”),编辑时自动回显已关联项
- Schema 增加 cookie_username 输出字段,视图一次性查用户表做映射,避免逐行查库

迁移 e5f6a7b8c9d0:
- admin_cookie_user 删 cookie_value、domain(SQLite 用 batch 重建表)
- admin_cookie_site 加 cookie_user_id
- 每步先判断列是否存在,可重复执行;downgrade 可还原

注意:升级会丢弃 admin_cookie_user.cookie_value / domain 的历史数据。

已 Playwright 真机验证(本机 :5000):
列表无 Cookie值/域名列、新增页无对应控件、保存成功;
网站新增选中用户后落库 cookie_user_id=1、列表显示“验证用户”、编辑页正确回显。
This commit is contained in:
bwstudio
2026-09-10 20:19:25 +08:00
parent 1b68363bfd
commit 6f4af8664e
11 changed files with 155 additions and 62 deletions
+33 -4
View File
@@ -15,7 +15,7 @@ from applications.common.utils.rights import authorize
from applications.common.utils.validate import str_escape
from applications.extensions import db
from applications.extensions.init_limit import limiter
from applications.models import CookieSite
from applications.models import CookieSite, CookieUser
from applications.schemas import CookieSiteManageSchema
dir_path = os.path.dirname(os.path.abspath(__file__))
@@ -47,10 +47,33 @@ def _parse_expiry(raw):
return None
def _user_options():
"""下拉框用的登录用户列表:id + 显示名(昵称优先,附用户名与网站)。"""
users = CookieUser.query.order_by(CookieUser.id.desc()).all()
opts = []
for u in users:
nick = (u.nickname or '').strip()
base = ('%s%s' % (nick, u.username)) if nick and nick != u.username else (nick or u.username)
site = (u.website_name or u.website_url or '').strip()
opts.append({'id': u.id, 'label': ('%s · %s' % (base, site)) if site else base})
return opts
def _set_cookie_username(items):
"""为每行补上关联登录用户的显示名,避免逐行查库。"""
ids = {i.cookie_user_id for i in items if i.cookie_user_id}
mapping = {}
if ids:
for u in CookieUser.query.filter(CookieUser.id.in_(ids)).all():
mapping[u.id] = u.nickname or u.username or ''
for i in items:
setattr(i, '_cookie_username', mapping.get(i.cookie_user_id, '') if i.cookie_user_id else '')
@bp.get('/')
@authorize("system:cookie-site:main")
def main():
return render_template('system/cookie_site/main.html')
return render_template('system/cookie_site/main.html', users=_user_options())
@bp.get('/data')
@@ -59,15 +82,19 @@ def main():
def data():
name = str_escape(request.args.get('name', type=str))
domain = str_escape(request.args.get('domain', type=str))
cookie_user_id = request.args.get('cookie_user_id', type=int)
enable = request.args.get('enable', type=int)
query = CookieSite.query.filter()
if name:
query = query.filter(CookieSite.name.contains(name))
if domain:
query = query.filter(CookieSite.domain.contains(domain))
if cookie_user_id:
query = query.filter(CookieSite.cookie_user_id == cookie_user_id)
if enable is not None:
query = query.filter(CookieSite.enable == enable)
items = query.order_by(CookieSite.id.desc()).layui_paginate()
_set_cookie_username(items.items)
return table_api(
msg="请求成功",
data=curd.model_to_dicts(schema=CookieSiteManageSchema, data=items.items),
@@ -78,7 +105,7 @@ def data():
@bp.get('/add')
@authorize("system:cookie-site:add", log=True)
def add():
return render_template('system/cookie_site/add.html')
return render_template('system/cookie_site/add.html', users=_user_options())
@bp.post('/save')
@@ -92,6 +119,7 @@ def save():
return fail_api(msg="名称/网址/Cookie值不得为空")
try:
obj = CookieSite(
cookie_user_id=int(req_json.get('cookie_user_id') or 0) or None,
name=name,
url=_normalize_url(url),
cookie_value=cookie_value,
@@ -118,7 +146,7 @@ def edit():
obj = curd.get_one_by_id(CookieSite, sid)
if not obj:
return fail_api(msg="记录不存在")
return render_template('system/cookie_site/edit.html', obj=obj)
return render_template('system/cookie_site/edit.html', obj=obj, users=_user_options())
@bp.put('/update')
@@ -135,6 +163,7 @@ def update():
if not all([name, url, cookie_value]):
return fail_api(msg="名称/网址/Cookie值不得为空")
try:
obj.cookie_user_id = int(req_json.get('cookie_user_id') or 0) or None
obj.name = name
obj.url = _normalize_url(url)
obj.cookie_value = cookie_value