账号和密码不区分大小写

application/admin/controller/user/User.php

@@ -80,7 +80,7 @@ class User extends Backend
         }
 
         if($password != $password2){
-            $this->error('重复密码错误');
+            $this->error('两次密码不一致');
         }
 
         $intro_uid = 0;
@@ -91,6 +91,9 @@ class User extends Backend
             }
         }
 
+        $username  = strtolower($username);
+        $password = strtolower($password);
+
         //注册
         if ($this->model->getByUsername($username)) {
             $this->error('用户名已存在');

application/common/library/Auth.php

@@ -145,6 +145,8 @@ class Auth
      */
     public function register($username, $password, $email = '', $mobile = '', $extend = [])
     {
+        $username  = strtolower($username);
+        $password = strtolower($password);
         // 检测用户名、昵称、邮箱、手机号是否存在
         if (User::getByUsername($username)) {
             $this->setError('Username already exist');
@@ -264,10 +266,10 @@ class Auth
         }
 
         //尽量用户名也用手机号
-        $mobile_set_username = 1;
-        if (User::getByUsername($mobile)) {
+        $mobile_set_username = 0;
+        /*if (User::getByUsername($mobile)) {
             $mobile_set_username = 0;
-        }
+        }*/
 
         $ip = request()->ip();
         $time = time();
@@ -368,6 +370,9 @@ class Auth
      */
     public function login($account, $password)
     {
+        $account  = strtolower($account);
+        $password = strtolower($password);
+
 //        $field = Validate::is($account, 'email') ? 'email' : (Validate::regex($account, '/^1\d{10}$/') ? 'mobile' : 'username');
         $field = 'username';
         $user = User::get([$field => $account]);