Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss

This commit is contained in:
hrx 2026-05-07 15:35:55 +08:00
commit 15ddfd4996

View File

@ -140,7 +140,7 @@ async def logintype(ns):
async with db.sqlorContext('kboss') as sor: async with db.sqlorContext('kboss') as sor:
domain_name = ns.get('domain_name') domain_name = ns.get('domain_name')
if domain_name in ['www.opencomputing.cn', 'dev.opencomputing.cn', 'localhost:9527'] and ns.get('username') not in ['开元云(北京)科技有限公司', 'admin', 'kyy_root']: if domain_name in ['www.opencomputing.cn', 'dev.opencomputing.cn', 'localhost:9527'] and ns.get('username') not in ['开元云(北京)科技有限公司', 'admin', 'kyy_root', 'kyy_kaiyuan', 'kyacloud']:
# 登录失败次数限制 # 登录失败次数限制
login_allowed = await check_login_allowed(ns.get('username')) login_allowed = await check_login_allowed(ns.get('username'))
@ -199,6 +199,8 @@ async def logintype(ns):
if type == 1: if type == 1:
# 手机号登录 # 手机号登录
users = await sor.R('users', {'mobile': ns.get('username')}) users = await sor.R('users', {'mobile': ns.get('username')})
if not users:
users = await sor.R('users', {'username': ns.get('username')})
else: else:
password = password_encode(ns['password']) password = password_encode(ns['password'])
users = await sor.R('users', {'username': ns.get('username'), 'password': password}) users = await sor.R('users', {'username': ns.get('username'), 'password': password})