|
|
@@ -51,8 +51,8 @@ class Login extends Base
|
|
|
try {
|
|
|
$check_code = $this->checkPhoneCode($account,$code,$phone_pre);
|
|
|
if(!in_array($account,config('power.phone'))) {
|
|
|
- //if(!$check_code) $this->exception('验证码错误');
|
|
|
- //$this->updatePhoneCode($check_code);
|
|
|
+ // if(!$check_code) $this->exception('验证码错误');
|
|
|
+ // $this->updatePhoneCode($check_code);
|
|
|
}
|
|
|
$where = [];
|
|
|
$where[] = $account_type == 1 ? ['email','=',$account] : ['phone','=',$account];
|
|
|
@@ -104,11 +104,9 @@ class Login extends Base
|
|
|
$user_info = $user_info->toArray();
|
|
|
// 已设置登录设备号
|
|
|
if($user_info['status'] != 1) $this->exception('用户被禁用');
|
|
|
- //if($user_info['facility_'.$facility_type] != '' && $facility_code != $user_info['facility_'.$facility_type]) $this->exception('设备号错误');
|
|
|
- //if(!$user_info['facility_'.$facility_type]) User::where('id',$user_info['id'])->update(['facility_'.$facility_type=>$facility_code] );
|
|
|
}
|
|
|
// 设备号验证
|
|
|
- //if(!UserFacility::checkFacility($user_info['id'],$facility_type,$facility_code,$account)) $this->exception('设备号错误');
|
|
|
+ if(!UserFacility::checkFacility($user_info['id'],$facility_type,$facility_code,$account)) $this->exception('设备号错误');
|
|
|
if(empty($user_info['hx_username']) || !$user_info['hx_username']) hx_register($user_info['id']);
|
|
|
$ret_data['token'] = $this->createJwt($user_info['id'],$facility_code,$facility_type);
|
|
|
if($user_info['account_type'] == 1) {
|
