bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
登录用户：
- 模型删除 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
Download Patch File Download Diff File Expand all files Collapse all files
applications/models/admin_cookie.py
+4 -5
View File
@@ -4,7 +4,7 @@ from applications.extensions import db
class CookieUser(db.Model):
"""登录用户 - 保存已登录用户的Cookie信息"""
"""登录用户 - 记录在各网站上的登录账号"""
__tablename__ = 'admin_cookie_user'
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
@@ -12,8 +12,6 @@ class CookieUser(db.Model):
nickname = db.Column(db.String(100), default='', comment='昵称')
website_url = db.Column(db.String(255), nullable=False, comment='网站URL')
website_name = db.Column(db.String(100), default='', comment='网站名称')
cookie_value = db.Column(db.Text, nullable=False, comment='Cookie值')
domain = db.Column(db.String(255), default='', comment='Cookie域名')
expiry = db.Column(db.DateTime, comment='过期时间')
enable = db.Column(db.Integer, default=1, comment='状态(1启用,0禁用)')
create_by = db.Column(db.String(50), default='admin', comment='创建者')
@@ -27,8 +25,6 @@ class CookieUser(db.Model):
'nickname': self.nickname,
'website_url': self.website_url,
'website_name': self.website_name,
'cookie_value': self.cookie_value,
'domain': self.domain,
'expiry': self.expiry.strftime('%Y-%m-%d %H:%M:%S') if self.expiry else '',
'enable': self.enable,
'create_by': self.create_by,
@@ -42,6 +38,8 @@ class CookieSite(db.Model):
__tablename__ = 'admin_cookie_site'
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# 关联的登录用户（admin_cookie_user.id），用于把网站归入某个登录账号
cookie_user_id = db.Column(db.Integer, nullable=True, comment='关联登录用户ID')
name = db.Column(db.String(100), nullable=False, comment='网站名称')
url = db.Column(db.String(255), nullable=False, comment='网站URL')
cookie_value = db.Column(db.Text, nullable=False, comment='Cookie值')
@@ -58,6 +56,7 @@ class CookieSite(db.Model):
def to_dict(self):
return {
'id': self.id,
'cookie_user_id': self.cookie_user_id,
'name': self.name,
'url': self.url,
'cookie_value': self.cookie_value,
applications/schemas/admin_cookie.py
+7
View File
@@ -1,5 +1,6 @@
"""Cookie管理Schema"""
from flask_marshmallow.sqla import SQLAlchemyAutoSchema
from marshmallow import fields
from applications.extensions import ma
from applications.models import CookieUser, CookieSite
@@ -15,7 +16,13 @@ class CookieUserManageSchema(SQLAlchemyAutoSchema):
class CookieSiteManageSchema(SQLAlchemyAutoSchema):
"""登录网站管理用：序列化为表格数据 / 表单回填"""
# 关联登录用户的显示名（视图层预先挂到对象上的 _cookie_username）
cookie_username = fields.Method('get_cookie_username')
class Meta:
model = CookieSite
include_fk = True
load_instance = True
def get_cookie_username(self, obj):
return getattr(obj, '_cookie_username', '') or ''
migrations/versions/e5f6a7b8c9d0_cookie_user_drop_cookie_fields.py
+71
View File
@@ -0,0 +1,71 @@
"""登录用户去掉 Cookie 明细字段；登录网站增加关联登录用户
1. admin_cookie_user：删除 cookie_value、domain 两列
登录用户只登记「账号归属」（用户名/昵称/网站/有效期），
Cookie 明细由「登录网站」承载，故这两列不再需要。
2. admin_cookie_site：新增 cookie_user_id（关联 admin_cookie_user.id）
用于把网站挂到某个登录用户下，列表/新增/编辑用下拉框选择。
SQLite 不支持直接 DROP COLUMN，统一用 batch_alter_table 重建表；
每一步都先判断列是否存在，便于重复执行与跨环境差异。
Revision ID: e5f6a7b8c9d0
Revises: d4e5f6a7b8c9
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'e5f6a7b8c9d0'
down_revision = 'd4e5f6a7b8c9'
branch_labels = None
depends_on = None
def _columns(conn, table):
insp = sa.inspect(conn)
return {c['name'] for c in insp.get_columns(table)}
def upgrade():
conn = op.get_bind()
user_cols = _columns(conn, 'admin_cookie_user')
if 'cookie_value' in user_cols:
with op.batch_alter_table('admin_cookie_user', schema=None) as batch_op:
batch_op.drop_column('cookie_value')
if 'domain' in user_cols:
with op.batch_alter_table('admin_cookie_user', schema=None) as batch_op:
batch_op.drop_column('domain')
site_cols = _columns(conn, 'admin_cookie_site')
if 'cookie_user_id' not in site_cols:
with op.batch_alter_table('admin_cookie_site', schema=None) as batch_op:
batch_op.add_column(
sa.Column('cookie_user_id', sa.Integer(), nullable=True,
comment='关联登录用户ID')
)
def downgrade():
conn = op.get_bind()
site_cols = _columns(conn, 'admin_cookie_site')
if 'cookie_user_id' in site_cols:
with op.batch_alter_table('admin_cookie_site', schema=None) as batch_op:
batch_op.drop_column('cookie_user_id')
user_cols = _columns(conn, 'admin_cookie_user')
if 'domain' not in user_cols:
with op.batch_alter_table('admin_cookie_user', schema=None) as batch_op:
batch_op.add_column(
sa.Column('domain', sa.String(length=255), nullable=True,
server_default='', comment='Cookie域名')
)
if 'cookie_value' not in user_cols:
with op.batch_alter_table('admin_cookie_user', schema=None) as batch_op:
batch_op.add_column(
sa.Column('cookie_value', sa.Text(), nullable=True,
comment='Cookie值')
)
plugins/cookieManager/templates/system/cookie_site/add.html
+12
View File
@@ -7,6 +7,17 @@
</head>
<body>
<form class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;">
<div class="layui-form-item">
<label class="layui-form-label">关联用户</label>
<div class="layui-input-block">
<select name="cookie_user_id" lay-search>
<option value="">请选择登录用户</option>
{% for u in users %}
<option value="{{ u.id }}">{{ u.label }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">网站名称</label>
<div class="layui-input-block">
@@ -107,6 +118,7 @@ layui.use(['form', 'layer', 'laydate'], function(){
type: 'POST',
contentType: 'application/json',
data: JSON.stringify({
cookie_user_id: data.cookie_user_id,
name: data.name,
url: data.url,
cookie_value: data.cookie_value,
plugins/cookieManager/templates/system/cookie_site/edit.html
+12
View File
@@ -8,6 +8,17 @@
<body>
<form class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;">
<input type="hidden" name="cookieSiteId" value="{{ obj.id }}">
<div class="layui-form-item">
<label class="layui-form-label">关联用户</label>
<div class="layui-input-block">
<select name="cookie_user_id" lay-search>
<option value="">请选择登录用户</option>
{% for u in users %}
<option value="{{ u.id }}" {{ 'selected' if obj.cookie_user_id == u.id }}>{{ u.label }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">网站名称</label>
<div class="layui-input-block">
@@ -110,6 +121,7 @@ layui.use(['form', 'layer', 'laydate'], function(){
contentType: 'application/json',
data: JSON.stringify({
cookieSiteId: data.cookieSiteId,
cookie_user_id: data.cookie_user_id,
name: data.name,
url: data.url,
cookie_value: data.cookie_value,
plugins/cookieManager/templates/system/cookie_site/main.html
+12
View File
@@ -10,6 +10,15 @@
<div class="layui-card-body">
<form class="layui-form" action="" lay-filter="cookie-site-query-form">
<div class="layui-form-item" style="margin-bottom: unset;">
<label class="layui-form-label">关联用户</label>
<div class="layui-input-inline">
<select name="cookie_user_id">
<option value="">全部</option>
{% for u in users %}
<option value="{{ u.id }}">{{ u.label }}</option>
{% endfor %}
</select>
</div>
<label class="layui-form-label">网站名称</label>
<div class="layui-input-inline">
<input type="text" name="name" placeholder="" class="layui-input">
@@ -97,6 +106,9 @@
let cols = [
[
{title: '编号', field: 'id', align: 'center', width: 80},
{title: '关联用户', field: 'cookie_username', align: 'center', templet: function (d) {
return d.cookie_username ? d.cookie_username : '<span class="layui-badge layui-bg-gray">未关联</span>';
}},
{title: '网站名称', field: 'name', align: 'center'},
{title: '网站URL', field: 'url', align: 'center', minWidth: 200},
{title: 'Cookie值', field: 'cookie_value', align: 'center', minWidth: 200, templet: '#col-cookie-site-value'},
plugins/cookieManager/templates/system/cookie_user/add.html
-16
View File
@@ -35,20 +35,6 @@
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">Cookie值</label>
<div class="layui-input-block">
<textarea name="cookie_value" required lay-verify="required"
style="width:100%;height:100px;resize:none;" class="layui-textarea" placeholder="Cookie内容"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">域名</label>
<div class="layui-input-block">
<input type="text" name="domain" placeholder="例如：.example.com（可留空）"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">过期时间</label>
<div class="layui-input-block">
@@ -105,8 +91,6 @@ layui.use(['form', 'layer', 'laydate'], function(){
nickname: data.nickname,
website_name: data.website_name,
website_url: data.website_url,
cookie_value: data.cookie_value,
domain: data.domain,
expiry: data.expiry,
enable: data.enable
}),
plugins/cookieManager/templates/system/cookie_user/edit.html
-16
View File
@@ -36,20 +36,6 @@
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">Cookie值</label>
<div class="layui-input-block">
<textarea name="cookie_value" lay-verify="required"
style="width:100%;height:100px;resize:none;" class="layui-textarea">{{ obj.cookie_value }}</textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">域名</label>
<div class="layui-input-block">
<input type="text" name="domain" value="{{ obj.domain }}"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">过期时间</label>
<div class="layui-input-block">
@@ -107,8 +93,6 @@ layui.use(['form', 'layer', 'laydate'], function(){
nickname: data.nickname,
website_name: data.website_name,
website_url: data.website_url,
cookie_value: data.cookie_value,
domain: data.domain,
expiry: data.expiry,
enable: data.enable
}),
plugins/cookieManager/templates/system/cookie_user/main.html
-11
View File
@@ -74,15 +74,6 @@
<input type="checkbox" name="enable" value="{{ d.id }}" lay-skin="switch" lay-text="启用|禁用"
lay-filter="cookie-user-enable" {{# if(d.enable==1){ }} checked {{# } }} />
</script>
<script type="text/html" id="col-cookie-user-value">
{{# var v = d.cookie_value || ''; }}
{{# if(v.length > 30){ }}
<span title="{{ v }}">{{ v.slice(0, 30) }}...</span>
{{# } else { }}
<span>{{ v }}</span>
{{# } }}
</script>
{% endraw %}
<script>
@@ -101,8 +92,6 @@
{title: '昵称', field: 'nickname', align: 'center'},
{title: '网站名称', field: 'website_name', align: 'center'},
{title: '网站链接', field: 'website_url', align: 'center', minWidth: 200},
{title: 'Cookie值', field: 'cookie_value', align: 'center', minWidth: 200, templet: '#col-cookie-user-value'},
{title: '域名', field: 'domain', align: 'center'},
{title: '过期时间', field: 'expiry', align: 'center'},
{title: '状态', field: 'enable', align: 'center', templet: '#cookie-user-enable', width: 100},
{title: '创建时间', field: 'create_at', align: 'center'},
plugins/cookieManager/view/cookie_site.py
+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
plugins/cookieManager/view/cookie_user.py
+4 -10
View File
@@ -87,17 +87,14 @@ def save():
req_json = request.get_json(force=True, silent=True) or {}
username = str_escape(req_json.get('username'))
website_url = str_escape(req_json.get('website_url'))
cookie_value = str_escape(req_json.get('cookie_value'))
if not all([username, website_url, cookie_value]):
return fail_api(msg="用户名/网站URL/Cookie值不得为空")
if not all([username, website_url]):
return fail_api(msg="用户名/网站URL不得为空")
try:
obj = CookieUser(
username=username,
nickname=str_escape(req_json.get('nickname')),
website_url=_normalize_url(website_url),
website_name=str_escape(req_json.get('website_name')),
cookie_value=cookie_value,
domain=str_escape(req_json.get('domain')),
expiry=_parse_expiry(req_json.get('expiry')),
enable=int(req_json.get('enable') or 1),
create_by=current_user.username if current_user.is_authenticated else 'admin',
@@ -130,16 +127,13 @@ def update():
return fail_api(msg="记录不存在")
username = str_escape(req_json.get('username'))
website_url = str_escape(req_json.get('website_url'))
cookie_value = str_escape(req_json.get('cookie_value'))
if not all([username, website_url, cookie_value]):
return fail_api(msg="用户名/网站URL/Cookie值不得为空")
if not all([username, website_url]):
return fail_api(msg="用户名/网站URL不得为空")
try:
obj.username = username
obj.nickname = str_escape(req_json.get('nickname'))
obj.website_url = _normalize_url(website_url)
obj.website_name = str_escape(req_json.get('website_name'))
obj.cookie_value = cookie_value
obj.domain = str_escape(req_json.get('domain'))
obj.expiry = _parse_expiry(req_json.get('expiry'))
obj.enable = int(req_json.get('enable') or 1)
db.session.commit()