gx

@@ -132,9 +132,13 @@ class LoginLogic extends BaseLogic
         //账号密码没通过时，验证验证码
         $smsModel = new SmsLog();
         $smsInfo = $smsModel->formatQuery(['mobile'=>$mobile,'type'=>$smsModel::TYPE_MANAGER_LOGIN])->orderBy('id','desc')->first();
+        if(!empty($smsInfo)){
             if(($password != $smsInfo['code']) || ($smsInfo['created_at']  < date('Y-m-d H:i:s',time() - 300))){
                 $this->fail('账号密码错误/验证码错误',Code::USER_REGISTER_ERROE);
             }
+        }else{
+            $this->fail('账号密码错误/验证码错误',Code::USER_REGISTER_ERROE);
+        }
         return true;
     }
 }

@@ -98,12 +98,17 @@ class UserLoginLogic
      * @time   :2023/6/12 15:31
      */
     public function verifyAccount(){
+        $info = $this->model->read(['mobile'=>$this->param['mobile']],['id','mobile','status','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);
+        }
         //密码加密
         $password = base64_encode(md5($this->param['password']));
-        $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>$this::USER_STATUS],
-            ['id','mobile','role_id','token','name','project_id']);
-        if($info === false){
-            $info = $this->verifyCode($this->param['mobile'],$this->param['password']);
+        if($password != $info['password']){
+            $this->verifyCode($this->param['mobile'],$this->param['password']);
         }
         return $this->success($info);
     }
@@ -119,17 +124,14 @@ class UserLoginLogic
         //账号密码没通过时，验证验证码
         $smsModel = new SmsLog();
         $smsInfo = $smsModel->formatQuery(['mobile'=>$mobile,'type'=>$smsModel::TYPE_LOGIN])->orderBy('id','desc')->first();
+        if(!empty($smsInfo)){
             if(($password != $smsInfo['code']) || ($smsInfo['created_at']  < date('Y-m-d H:i:s',time() - 300))){
                 $this->fail('账号密码错误/验证码错误',Code::USER_REGISTER_ERROE);
             }
-        $info = $this->model->read(['mobile'=>$this->param['mobile']],['id','mobile','status','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);
+        }else{
+            $this->fail('账号密码错误/验证码错误',Code::USER_REGISTER_ERROE);
         }
-        return $info;
+        return true;
     }
     /**
      * @name   :(验证角色是否禁用)verifyRole