作者 lyh

gx

@@ -14,6 +14,8 @@ use Illuminate\Support\Facades\Cache; @@ -14,6 +14,8 @@ use Illuminate\Support\Facades\Cache;
14 14
15 class UserLoginLogic 15 class UserLoginLogic
16 { 16 {
  17 + const USER_STATUS = 0;
  18 +
17 protected $model; 19 protected $model;
18 protected $param; 20 protected $param;
19 21
@@ -22,6 +24,7 @@ class UserLoginLogic @@ -22,6 +24,7 @@ class UserLoginLogic
22 //验证账号密码 24 //验证账号密码
23 $this->param = request()->all(); 25 $this->param = request()->all();
24 $this->model = new User(); 26 $this->model = new User();
  27 +
25 } 28 }
26 29
27 /*** 30 /***
@@ -61,10 +64,10 @@ class UserLoginLogic @@ -61,10 +64,10 @@ class UserLoginLogic
61 */ 64 */
62 public function verifyAccount(){ 65 public function verifyAccount(){
63 $password = base64_encode(md5($this->param['password'])); 66 $password = base64_encode(md5($this->param['password']));
64 - $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>0], ['id','mobile','role_id','token','name','project_id']); 67 + $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>$this::USER_STATUS], ['id','mobile','role_id','token','name','project_id']);
65 if($info === false){ 68 if($info === false){
66 //账号密码没通过时,验证验证码 69 //账号密码没通过时,验证验证码
67 - $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>0], ['id','mobile','role_id','token','name','project_id']); 70 + $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>$this::USER_STATUS], ['id','mobile','role_id','token','name','project_id']);
68 if($info === false){ 71 if($info === false){
69 $this->fail('账号密码错误',Code::USER_REGISTER_ERROE); 72 $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
70 } 73 }
@@ -86,7 +89,7 @@ class UserLoginLogic @@ -86,7 +89,7 @@ class UserLoginLogic
86 public function verifyRole($info){ 89 public function verifyRole($info){
87 //当前用户角色是否被禁用 90 //当前用户角色是否被禁用
88 $projectRoleModel = new ProjectRoleModel(); 91 $projectRoleModel = new ProjectRoleModel();
89 - $role_info = $projectRoleModel->read(['id'=>$info['role_id'],'status'=>0]); 92 + $role_info = $projectRoleModel->read(['id'=>$info['role_id'],'status'=>$this::USER_STATUS]);
90 if($role_info === false){ 93 if($role_info === false){
91 $this->fail('当前用户角色被禁用',Code::USER_REGISTER_ERROE); 94 $this->fail('当前用户角色被禁用',Code::USER_REGISTER_ERROE);
92 } 95 }