gx

@@ -143,7 +143,6 @@ class ComController extends BaseController
             $this->response('发送失败， 请稍后重试！', Code::USER_LOGIN_ERROE);
             $this->response('发送失败， 请稍后重试！', Code::USER_LOGIN_ERROE);
         }
         }
         SmsLog::createLog($mobile, $code['code']);
         SmsLog::createLog($mobile, $code['code']);
-        Cache::add($mobile,$code['code'],60);
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -69,16 +69,17 @@ class UserLoginLogic
         $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>$this::USER_STATUS],
         $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>$this::USER_STATUS],
             ['id','mobile','role_id','token','name','project_id']);
             ['id','mobile','role_id','token','name','project_id']);
         if($info === false){
         if($info === false){
-            //账号密码没通过时，验证验证码
-            $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>$this::USER_STATUS],
-                ['id','mobile','role_id','token','name','project_id']);
-            if($info === false){
-                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
-            }
-            //验证验证码是否准备
+            //账号密码没通过时，验证验证码验证验证码是否准备
             $last_sms = SmsLog::getLastLog($this->param['mobile'], SmsLog::TYPE_LOGIN);
             $last_sms = SmsLog::getLastLog($this->param['mobile'], SmsLog::TYPE_LOGIN);
             if($this->param['password'] != $last_sms->code){
             if($this->param['password'] != $last_sms->code){
-                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
+                $this->fail('账号密码错误/验证码错误',Code::USER_REGISTER_ERROE);
+            }
+            $info = $this->model->read(['mobile'=>$this->param['mobile']],['id','mobile','role_id','token','name','project_id']);
+            if($info === false){
+                $this->fail('当前用户不存在',Code::USER_REGISTER_ERROE);
+            }
+            if($info['status'] != self::USER_STATUS){
+                $this->fail('当前用户被禁用',Code::USER_REGISTER_ERROE);
             }
             }
         }
         }
         return $this->success($info);
         return $this->success($info);