修改登陆

app/Controller/LoginController.php

@@ -57,9 +57,7 @@ class LoginController extends AbstractController
         if (empty($code)) {
             return Result::error("验证码已过期");
         }
-        var_dump("验证码：", $code);
-
-        var_dump((strtolower($code) . strtolower($reqData['captcha'])));
+//        var_dump("验证码：", $code);
         if (strtolower($code) != strtolower($reqData['captcha'])) {
             return Result::error("验证码错误");
         }
@@ -73,12 +71,16 @@ class LoginController extends AbstractController
 //        $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
         if ($userInfos['code'] == 0) {
-            return Result::error("用户名或密码错误");
+            return Result::error("用户不存在");
+        }
+//        var_dump("数据：",$userInfos);
+        if($userInfos['data']['status']==0){
+            return Result::error("用户已经冻结");
         }
-        var_dump("用户信息：", $userInfos);
+//        var_dump("用户信息：", $userInfos);
 //        $this->logger->info("验证用户返回值：", $userInfos);
         if (md5(md5($reqData['password']) . $userInfos['data']['salt']) != $userInfos['data']['password']) {
-            return Result::error("用户名或密码错误");
+            return Result::error("登陆密码错误");
         }
         $userData = [
             'uid' => $userInfos['data']['id'], // 如果使用单点登录，必须存在配置文件中的sso_key的值，一般设置为用户的id
@@ -89,7 +91,7 @@ class LoginController extends AbstractController
             'level_id' => $userInfos['data']['level_id'],
             'type_id' => $userInfos['data']['type_id'],
         ];
-        var_dump($userData);
+//        var_dump($userData);
         // 使用默认场景登录
         $token = $jwt->getToken('default', $userData);
         $data = [

app/Controller/UserController.php

@@ -37,13 +37,13 @@ class UserController extends AbstractController
                 'password' => 'required|min:6',//密码
                 'confirm_password' => 'required',
                 'real_name' => 'required',
-                'mobile' =>'required'
+//                'mobile' =>'required'
             ],
             [
                 'user_name.required' => '用户名不能为空',
                 'password.required' => '密码不能为空',
 //                'email.email' => '请填写一个有效的邮箱',
-                'mobile.required' => '手机号码必填',
+//                'mobile.required' => '手机号码必填',
 //                'mobile.telephone_number' => '请填写一个有效的手机号',
                 'confirm_password.required' =>"确认密码不能为空",
                 'type_id.required' =>"用户类型不能为空",
@@ -119,12 +119,12 @@ class UserController extends AbstractController
                 'user_name' => 'required',//登陆账号
                 'type_id'=> 'required',//用户类型
                 'real_name' => 'required',
-                'mobile' =>'required',
+//                'mobile' =>'required',
                 'id'=>'required'
             ],
             [
                 'user_name.required' => '用户名不能为空',
-                'mobile.required' => '手机号码必填',
+//                'mobile.required' => '手机号码必填',
                 'type_id.required' =>"用户类型不能为空",
                 'real_name.required' =>"姓名不能为空",
                 'id.required' =>"id不能为空",
@@ -134,6 +134,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
 
@@ -287,6 +288,7 @@ class UserController extends AbstractController
     public function  verifyUserInfo()
     {
         $requireData = $this->request->all();
+        var_dump($requireData);
         $result =  $this->userServiceClient->verifyUserInfo($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);