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

优化管理员密码密码

pull/144/MERGE
Karson 2019-09-30 13:37:51 +08:00
parent b388289dba
commit 2f9732e905
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use app\admin\model\AuthGroupAccess;
use app\common\controller\Backend; use app\common\controller\Backend;
use fast\Random; use fast\Random;
use fast\Tree; use fast\Tree;
use think\Validate;
/** /**
* 管理员管理 * 管理员管理
@ -122,6 +123,9 @@ class Admin extends Backend
$this->token(); $this->token();
$params = $this->request->post("row/a"); $params = $this->request->post("row/a");
if ($params) { if ($params) {
if(!Validate::is($params['password'], '\S{6,16}')){
$this->error(__("Please input correct password"));
}
$params['salt'] = Random::alnum(); $params['salt'] = Random::alnum();
$params['password'] = md5(md5($params['password']) . $params['salt']); $params['password'] = md5(md5($params['password']) . $params['salt']);
$params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。 $params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
@ -159,6 +163,9 @@ class Admin extends Backend
$params = $this->request->post("row/a"); $params = $this->request->post("row/a");
if ($params) { if ($params) {
if ($params['password']) { if ($params['password']) {
if(!Validate::is($params['password'], '\S{6,16}')){
$this->error(__("Please input correct password"));
}
$params['salt'] = Random::alnum(); $params['salt'] = Random::alnum();
$params['password'] = md5(md5($params['password']) . $params['salt']); $params['password'] = md5(md5($params['password']) . $params['salt']);
} else { } else {
@ -167,8 +174,9 @@ class Admin extends Backend
//这里需要针对username和email做唯一验证 //这里需要针对username和email做唯一验证
$adminValidate = \think\Loader::validate('Admin'); $adminValidate = \think\Loader::validate('Admin');
$adminValidate->rule([ $adminValidate->rule([
'username' => 'require|max:50|unique:admin,username,' . $row->id, 'username' => 'require|regex:\w{3,12}|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}',
]); ]);
$result = $row->validate('Admin.edit')->save($params); $result = $row->validate('Admin.edit')->save($params);
if ($result === false) { if ($result === false) {

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

@ -1,7 +1,9 @@
<?php <?php
return [ return [
'Group' => '所属组别', 'Group' => '所属组别',
'Loginfailure' => '登录失败次数', 'Loginfailure' => '登录失败次数',
'Login time' => '最后登录', 'Login time' => '最后登录',
'Please input correct username' => '用户名只能由3-12位数字、字母、下划线组合',
'Please input correct password' => '密码长度必须在6-16位之间，不能包含空格',
]; ];

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

@ -11,9 +11,9 @@ class Admin extends Validate
* 验证规则 * 验证规则
*/ */
protected $rule = [ protected $rule = [
'username' => 'require|max:50|unique:admin', 'username' => 'require|regex:\w{3,12}|unique:admin',
'nickname' => 'require', 'nickname' => 'require',
'password' => 'require', 'password' => 'require|regex:\S{32}',
'email' => 'require|email|unique:admin,email', 'email' => 'require|email|unique:admin,email',
]; ];
@ -34,7 +34,7 @@ class Admin extends Validate
*/ */
protected $scene = [ protected $scene = [
'add' => ['username', 'email', 'nickname', 'password'], 'add' => ['username', 'email', 'nickname', 'password'],
'edit' => ['username', 'email', 'nickname'], 'edit' => ['username', 'email', 'nickname', 'password'],
]; ];
public function __construct(array $rules = [], $message = [], $field = []) public function __construct(array $rules = [], $message = [], $field = [])
@ -45,6 +45,10 @@ class Admin extends Validate
'password' => __('Password'), 'password' => __('Password'),
'email' => __('Email'), 'email' => __('Email'),
]; ];
$this->message = array_merge($this->message, [
'username.regex' => __('Please input correct username'),
'password.regex' => __('Please input correct password')
]);
parent::__construct($rules, $message, $field); parent::__construct($rules, $message, $field);
} }