mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复新版本密码长度导致无法添加管理员的BUG 

优化错误提示
pull/347/MERGE
Karson 2022-01-13 09:38:44 +08:00
parent c65e3b23e2
commit ff85bb3b21
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/auth/Admin.php
View File

@ -125,7 +125,7 @@ class Admin extends Backend
if ($params) { if ($params) {
Db::startTrans(); Db::startTrans();
try { try {
if (!Validate::is($params['password'], '\S{6,16}')) { if (!Validate::is($params['password'], '\S{6,30}')) {
exception(__("Please input correct password")); exception(__("Please input correct password"));
} }
$params['salt'] = Random::alnum(); $params['salt'] = Random::alnum();
@ -179,7 +179,7 @@ class Admin extends Backend
Db::startTrans(); Db::startTrans();
try { try {
if ($params['password']) { if ($params['password']) {
if (!Validate::is($params['password'], '\S{6,16}')) { if (!Validate::is($params['password'], '\S{6,30}')) {
exception(__("Please input correct password")); exception(__("Please input correct password"));
} }
$params['salt'] = Random::alnum(); $params['salt'] = Random::alnum();
@ -190,7 +190,7 @@ class Admin extends Backend
//这里需要针对username和email做唯一验证 //这里需要针对username和email做唯一验证
$adminValidate = \think\Loader::validate('Admin'); $adminValidate = \think\Loader::validate('Admin');
$adminValidate->rule([ $adminValidate->rule([
'username' => 'require|regex:\w{3,12}|unique:admin,username,' . $row->id, 'username' => 'require|regex:\w{3,30}|unique:admin,username,' . $row->id,
'email' => 'require|email|unique:admin,email,' . $row->id, 'email' => 'require|email|unique:admin,email,' . $row->id,
'password' => 'regex:\S{32}', 'password' => 'regex:\S{32}',
]); ]);

2
application/admin/lang/zh-cn/auth/admin.php
View File

@ -6,5 +6,7 @@ return [
'Login time' => '最后登录', 'Login time' => '最后登录',
'The parent group exceeds permission limit' => '父组别超出权限范围', 'The parent group exceeds permission limit' => '父组别超出权限范围',
'Please input correct username' => '用户名只能由3-30位数字、字母、下划线组合', 'Please input correct username' => '用户名只能由3-30位数字、字母、下划线组合',
'Username must be 3 to 30 characters' => '用户名只能由3-30位数字、字母、下划线组合',
'Please input correct password' => '密码长度必须在6-30位之间，不能包含空格', 'Please input correct password' => '密码长度必须在6-30位之间，不能包含空格',
'Password must be 6 to 30 characters' => '密码长度必须在6-30位之间，不能包含空格',
]; ];

3
application/admin/lang/zh-cn/general/profile.php
View File

@ -8,6 +8,7 @@ return [
'Admin log' => '操作日志', 'Admin log' => '操作日志',
'Leave password blank if dont want to change' => '不修改密码请留空', 'Leave password blank if dont want to change' => '不修改密码请留空',
'Please input correct email' => '请输入正确的Email地址', 'Please input correct email' => '请输入正确的Email地址',
'Please input correct password' => '密码长度不正确', 'Please input correct password' => '密码长度必须在6-30位之间，不能包含空格',
'Password must be 6 to 30 characters' => '密码长度必须在6-30位之间，不能包含空格',
'Email already exists' => '邮箱已经存在', 'Email already exists' => '邮箱已经存在',
]; ];

2
application/admin/validate/Admin.php
View File

@ -13,7 +13,7 @@ class Admin extends Validate
protected $rule = [ protected $rule = [
'username' => 'require|regex:\w{3,30}|unique:admin', 'username' => 'require|regex:\w{3,30}|unique:admin',
'nickname' => 'require', 'nickname' => 'require',
'password' => 'require|regex:\S{6,30}', 'password' => 'require|regex:\S{32}',
'email' => 'require|email|unique:admin,email', 'email' => 'require|email|unique:admin,email',
]; ];