Pre Merge pull request !475 from 御宅男(YznCMS官方)/1.x

application/admin/controller/auth/Adminlog.php

@@ -18,21 +18,13 @@ class Adminlog extends Backend
      * @var \app\admin\model\AdminLog
      */
     protected $model = null;
-    protected $childrenGroupIds = [];
     protected $childrenAdminIds = [];
 
     public function _initialize()
     {
         parent::_initialize();
         $this->model = model('AdminLog');
-
         $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);
     }
 
     /**

application/common/library/Auth.php

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

application/common/view/tpl/dispatch_jump.tpl

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

application/index/lang/zh-cn/user.php

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