更新
This commit is contained in:
parent
261a25481e
commit
9344ccd4a8
@ -116,7 +116,9 @@ class LoginLogic extends BaseLogic
|
|||||||
if ($user->isEmpty()) {
|
if ($user->isEmpty()) {
|
||||||
throw new \Exception('用户不存在');
|
throw new \Exception('用户不存在');
|
||||||
}
|
}
|
||||||
|
if (isset($params['register_id']) && $params['register_id'] != '') {
|
||||||
|
$user->register_id = $params['register_id'];
|
||||||
|
}
|
||||||
//更新登录信息
|
//更新登录信息
|
||||||
$user->login_time = time();
|
$user->login_time = time();
|
||||||
$user->login_ip = request()->ip();
|
$user->login_ip = request()->ip();
|
||||||
@ -200,7 +202,6 @@ class LoginLogic extends BaseLogic
|
|||||||
|
|
||||||
Db::commit();
|
Db::commit();
|
||||||
return $userInfo;
|
return $userInfo;
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
Db::rollback();
|
Db::rollback();
|
||||||
self::$error = $e->getMessage();
|
self::$error = $e->getMessage();
|
||||||
@ -304,7 +305,6 @@ class LoginLogic extends BaseLogic
|
|||||||
$response['terminal'] = UserTerminalEnum::WECHAT_MMP;
|
$response['terminal'] = UserTerminalEnum::WECHAT_MMP;
|
||||||
|
|
||||||
return self::createAuth($response);
|
return self::createAuth($response);
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
self::$error = $e->getMessage();
|
self::$error = $e->getMessage();
|
||||||
return false;
|
return false;
|
||||||
@ -329,7 +329,6 @@ class LoginLogic extends BaseLogic
|
|||||||
$response['terminal'] = UserTerminalEnum::WECHAT_OA;
|
$response['terminal'] = UserTerminalEnum::WECHAT_OA;
|
||||||
|
|
||||||
return self::createAuth($response);
|
return self::createAuth($response);
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
self::$error = $e->getMessage();
|
self::$error = $e->getMessage();
|
||||||
return false;
|
return false;
|
||||||
@ -393,7 +392,6 @@ class LoginLogic extends BaseLogic
|
|||||||
// 扫码地址
|
// 扫码地址
|
||||||
$url = WeChatRequestService::getScanCodeUrl($appId, $redirectUri, $state);
|
$url = WeChatRequestService::getScanCodeUrl($appId, $redirectUri, $state);
|
||||||
return ['url' => $url];
|
return ['url' => $url];
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
self::$error = $e->getMessage();
|
self::$error = $e->getMessage();
|
||||||
return false;
|
return false;
|
||||||
@ -431,7 +429,6 @@ class LoginLogic extends BaseLogic
|
|||||||
|
|
||||||
Db::commit();
|
Db::commit();
|
||||||
return $userInfo;
|
return $userInfo;
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
Db::rollback();
|
Db::rollback();
|
||||||
self::$error = $e->getMessage();
|
self::$error = $e->getMessage();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user