Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss
This commit is contained in:
commit
68120a306c
@ -136,10 +136,10 @@ async def registerUser(ns):
|
|||||||
if not ns.get('username'):
|
if not ns.get('username'):
|
||||||
ns['username'] = ns['mobile']
|
ns['username'] = ns['mobile']
|
||||||
|
|
||||||
if ns.get('password'):
|
# if ns.get('password'):
|
||||||
# 至少8位,包含大小写字母、特殊字符、数字
|
# # 至少8位,包含大小写字母、特殊字符、数字
|
||||||
if len(ns.get('password')) < 8 or not re.search(r'[a-zA-Z]', ns.get('password')) or not re.search(r'[0-9]', ns.get('password')):
|
# if len(ns.get('password')) < 8 or not re.search(r'[a-zA-Z]', ns.get('password')) or not re.search(r'[0-9]', ns.get('password')):
|
||||||
return {'status': False, 'msg': '密码至少8位,包含大小写字母、特殊字符、数字'}
|
# return {'status': False, 'msg': '密码至少8位,包含大小写字母、特殊字符、数字'}
|
||||||
|
|
||||||
if not ns.get('codeid'):
|
if not ns.get('codeid'):
|
||||||
return {'status': False, 'msg': '验证码ID不能为空'}
|
return {'status': False, 'msg': '验证码ID不能为空'}
|
||||||
|
|||||||
@ -108,9 +108,9 @@ async def get_resource_expire_time(ns={}):
|
|||||||
'data': data,
|
'data': data,
|
||||||
# 分页
|
# 分页
|
||||||
'pagination': {
|
'pagination': {
|
||||||
'total': baidu_resource_data['data'].get('totalCount'),
|
'total': baidu_resource_data['data'].get('totalCount') if baidu_resource_data.get('data') else 0,
|
||||||
'page_size': baidu_resource_data['data'].get('pageSize'),
|
'page_size': baidu_resource_data['data'].get('pageSize') if baidu_resource_data.get('data') else 10,
|
||||||
'current_page': baidu_resource_data['data'].get('pageNo')
|
'current_page': baidu_resource_data['data'].get('pageNo') if baidu_resource_data.get('data') else 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -163,11 +163,11 @@ export default {
|
|||||||
],
|
],
|
||||||
password: [
|
password: [
|
||||||
{ required: true, message: "请输入密码", trigger: "blur" },
|
{ required: true, message: "请输入密码", trigger: "blur" },
|
||||||
{
|
// {
|
||||||
pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z\d]).{8,}$/,
|
// pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z\d]).{8,}$/,
|
||||||
message: "密码至少8位,且需包含大小写字母、数字和特殊字符",
|
// message: "密码至少8位,且需包含大小写字母、数字和特殊字符",
|
||||||
trigger: "blur"
|
// trigger: "blur"
|
||||||
}
|
// }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
// 密码显示类型(password/text)
|
// 密码显示类型(password/text)
|
||||||
|
|||||||
@ -163,11 +163,11 @@ export default {
|
|||||||
],
|
],
|
||||||
password: [
|
password: [
|
||||||
{ required: true, message: "请输入密码", trigger: "blur" },
|
{ required: true, message: "请输入密码", trigger: "blur" },
|
||||||
{
|
// {
|
||||||
pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z\d]).{8,}$/,
|
// pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z\d]).{8,}$/,
|
||||||
message: "密码至少8位,且需包含大小写字母、数字和特殊字符",
|
// message: "密码至少8位,且需包含大小写字母、数字和特殊字符",
|
||||||
trigger: "blur"
|
// trigger: "blur"
|
||||||
}
|
// }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
// 密码显示类型(password/text)
|
// 密码显示类型(password/text)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user