作者 Karson

修复后台修改会员密码的BUG

修复命令行创建插件名称的BUG
1 name = {%name%} 1 name = {%name%}
2 -title = 插件名称({%name%}) 2 +title = 插件名称{%name%}
3 intro = FastAdmin插件 3 intro = FastAdmin插件
4 author = yourname 4 author = yourname
5 website = http://www.fastadmin.net 5 website = http://www.fastadmin.net
@@ -28,5 +28,6 @@ return [ @@ -28,5 +28,6 @@ return [
28 'Createtime' => '创建时间', 28 'Createtime' => '创建时间',
29 'Updatetime' => '更新时间', 29 'Updatetime' => '更新时间',
30 'Token' => 'Token', 30 'Token' => 'Token',
31 - 'Status' => '状态' 31 + 'Status' => '状态',
  32 + 'Leave password blank if dont want to change' => '不修改密码请留空',
32 ]; 33 ];
@@ -26,11 +26,14 @@ class User extends Model @@ -26,11 +26,14 @@ class User extends Model
26 self::beforeUpdate(function ($row) { 26 self::beforeUpdate(function ($row) {
27 $changed = $row->getChangedData(); 27 $changed = $row->getChangedData();
28 //如果有修改密码 28 //如果有修改密码
29 - if (isset($changed['password']))  
30 - {  
31 - $salt = \fast\Random::alnum();  
32 - $row->password = \app\common\library\Auth::instance()->getEncryptPassword($changed['password'], $salt);  
33 - $row->salt = $salt; 29 + if (isset($changed['password'])) {
  30 + if ($changed['password']) {
  31 + $salt = \fast\Random::alnum();
  32 + $row->password = \app\common\library\Auth::instance()->getEncryptPassword($changed['password'], $salt);
  33 + $row->salt = $salt;
  34 + } else {
  35 + unset($row->password);
  36 + }
34 } 37 }
35 }); 38 });
36 } 39 }
@@ -36,6 +36,7 @@ return [ @@ -36,6 +36,7 @@ return [
36 'Reset password' => '修改密码', 36 'Reset password' => '修改密码',
37 'Reset password by email' => '通过邮箱', 37 'Reset password by email' => '通过邮箱',
38 'Reset password by mobile' => '通过手机重置', 38 'Reset password by mobile' => '通过手机重置',
  39 + 'Reset password successful' => '修改密码成功',
39 'Account is locked' => '账户已经被锁定', 40 'Account is locked' => '账户已经被锁定',
40 'Password is incorrect' => '密码不正确', 41 'Password is incorrect' => '密码不正确',
41 'Account is incorrect' => '账户不正确', 42 'Account is incorrect' => '账户不正确',