Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss
This commit is contained in:
commit
f57d27d1bd
@ -8,7 +8,7 @@ _CUSTOMER_MODEL_COLUMNS = """
|
|||||||
id, llmid, provider, model_name, display_name, model_type,
|
id, llmid, provider, model_name, display_name, model_type,
|
||||||
context_length, input_token_price, output_token_price,
|
context_length, input_token_price, output_token_price,
|
||||||
cache_hit_input_price, billing_method, billing_unit,
|
cache_hit_input_price, billing_method, billing_unit,
|
||||||
capabilities, limitations, highlights, description, sort_order
|
capabilities, limitations, highlights, description, sort_order,is_active, experience
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -152,7 +152,7 @@ async def loginUser(ns):
|
|||||||
type = 0
|
type = 0
|
||||||
if type1 == 1:
|
if type1 == 1:
|
||||||
# 手机号验证码登录
|
# 手机号验证码登录
|
||||||
userreacs = await sor.R('users', {'mobile': ns.get('username')})
|
userreacs = await sor.R('users', {'mobile': ns.get('mobile')})
|
||||||
|
|
||||||
if not userreacs:
|
if not userreacs:
|
||||||
userreacs = await sor.R('users', {'username': ns.get('username')})
|
userreacs = await sor.R('users', {'username': ns.get('username')})
|
||||||
|
|||||||
@ -199,7 +199,7 @@ async def logintype(ns):
|
|||||||
return {'status': False, 'msg': '验证码不正确'}
|
return {'status': False, 'msg': '验证码不正确'}
|
||||||
if type == 1:
|
if type == 1:
|
||||||
# 手机号登录
|
# 手机号登录
|
||||||
users = await sor.R('users', {'mobile': ns.get('username')})
|
users = await sor.R('users', {'mobile': ns.get('mobile')})
|
||||||
if not users:
|
if not users:
|
||||||
users = await sor.R('users', {'username': ns.get('username')})
|
users = await sor.R('users', {'username': ns.get('username')})
|
||||||
else:
|
else:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user