Merge branch 'ji' into master

# Conflicts:
#	offline-backend-20260512/backend/scripts/sql/column_additions_mysql.sql
This commit is contained in:
吉鑫升 committed 2026-06-25 21:49:12 +08:00
commit 38f98cdf5c
11 files changed
+80 -40

No files matched your search

@@ -1,8 +1,10 @@
"""Add users.approved (登录白名单放行标记).
Backs the login-whitelist feature: when system setting ``login_whitelist.enabled``
is on, only ``approved=True`` users (or admins) may log in; self-registered
regular users default to ``approved=False`` (待审批) until an admin approves them.
Backs the login-whitelist feature (黑名单模式): when system setting
``login_whitelist.enabled`` is on, only users an admin has explicitly
「取消放行」 (``approved=False``) are blocked; everyone else — including brand-new
accounts that have never logged in (which default to ``approved=True``) — may log
in. Admins always pass.
Existing rows are backfilled to TRUE (``server_default="1"``) so flipping the
switch on for the first time never locks out users who already had accounts.