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

!475 会员登录次数无效，旧的冗余代码删除 

Merge pull request !475 from 御宅男(YznCMS官方)/1.x
pull/476/MERGE
Karson 2024-11-18 08:03:49 +00:00 committed by Gitee
parent 77300998fc 04af4aa1c0
commit cfd8a6a295
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/controller/auth/Adminlog.php
View File

@ -18,21 +18,13 @@ class Adminlog extends Backend
* @var \app\admin\model\AdminLog * @var \app\admin\model\AdminLog
*/ */
protected $model = null; protected $model = null;
protected $childrenGroupIds = [];
protected $childrenAdminIds = []; protected $childrenAdminIds = [];
public function _initialize() public function _initialize()
{ {
parent::_initialize(); parent::_initialize();
$this->model = model('AdminLog'); $this->model = model('AdminLog');
$this->childrenAdminIds = $this->auth->getChildrenAdminIds(true); $this->childrenAdminIds = $this->auth->getChildrenAdminIds(true);
$this->childrenGroupIds = $this->auth->getChildrenGroupIds(true);
$groupName = AuthGroup::where('id', 'in', $this->childrenGroupIds)
->column('id,name');
$this->view->assign('groupdata', $groupName);
} }
/** /**

1
application/common/library/Auth.php
View File

@ -224,6 +224,7 @@ class Auth
if ($user->loginfailure >= 10 && time() - $user->loginfailuretime < 86400) { if ($user->loginfailure >= 10 && time() - $user->loginfailuretime < 86400) {
$this->setError('Please try again after 1 day'); $this->setError('Please try again after 1 day');
return false;
} }
if ($user->password != $this->getEncryptPassword($password, $user->salt)) { if ($user->password != $this->getEncryptPassword($password, $user->salt)) {

2
application/common/view/tpl/dispatch_jump.tpl
View File

@ -60,4 +60,4 @@
</script> </script>
{/if} {/if}
</body> </body>
</html> </html>

3
application/index/lang/zh-cn/user.php
View File

@ -57,11 +57,12 @@ return [
'Change password successful' => '修改密码成功', 'Change password successful' => '修改密码成功',
'Password and confirm password don\'t match' => '两次输入的密码不一致', 'Password and confirm password don\'t match' => '两次输入的密码不一致',
'Captcha is incorrect' => '验证码不正确', 'Captcha is incorrect' => '验证码不正确',
'Please try again after 1 day' => '请于1天后再尝试登录',
'Logged in successful' => '登录成功', 'Logged in successful' => '登录成功',
'Logout successful' => '退出成功', 'Logout successful' => '退出成功',
'User center already closed' => '会员中心已经关闭', 'User center already closed' => '会员中心已经关闭',
'Don\'t have an account? Sign up' => '还没有账号？点击注册', 'Don\'t have an account? Sign up' => '还没有账号？点击注册',
'Already have an account? Sign in' => '已经有账号？点击登录', 'Already have an account? Sign in' => '已经有账号？点击登录',
'Operation failed' => '操作失败', 'Operation failed' => '操作失败',
'Invalid parameters' => '参数不正确', 'Invalid parameters' => '参数不正确',
'Change password failure' => '修改密码失败', 'Change password failure' => '修改密码失败',