|
@@ -96,34 +96,49 @@ class LoginController extends AbstractController
|
|
// var_dump($userData);
|
|
// var_dump($userData);
|
|
// 使用默认场景登录
|
|
// 使用默认场景登录
|
|
$token = $jwt->getToken('default', $userData);
|
|
$token = $jwt->getToken('default', $userData);
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ // $out = $jwt->logout($token->toString());
|
|
|
|
+ // $a = $jwt->verifyToken($token->toString());
|
|
// 检查是否二次登录 测试
|
|
// 检查是否二次登录 测试
|
|
|
|
|
|
// 检查是否有旧的token
|
|
// 检查是否有旧的token
|
|
- // var_dump("--------------",$userData['uid']);
|
|
|
|
- // return Result::success($userData['uid']);
|
|
|
|
|
|
+ // var_dump("--------------",$token);
|
|
|
|
+ // return Result::success($a);
|
|
$old_token = UserToken::where('user_id', $userData['uid'])->first();
|
|
$old_token = UserToken::where('user_id', $userData['uid'])->first();
|
|
- // var_dump("==============================old_token",$old_token->token->toString());
|
|
|
|
|
|
+ // // var_dump("==============================old_token",$old_token->token->toString());
|
|
if (!empty($old_token)) {
|
|
if (!empty($old_token)) {
|
|
- if ($old_token->token != $token->toString()) {
|
|
|
|
- $out = $jwt->logout($old_token->token);
|
|
|
|
- $time = $jwt->getTokenDynamicCacheTime($old_token->token);
|
|
|
|
- if ($time == 0) {
|
|
|
|
- $new_token = UserToken::where('user_id', $$userData['uid'])->update(['token' => $out]);
|
|
|
|
- // var_dump("******************log_out",$log_out);
|
|
|
|
- }
|
|
|
|
- if(!isset($new_token) || empty($new_token)) {
|
|
|
|
- return Result::error("Token过期失败!");
|
|
|
|
|
|
+ // // var_dump("==============================out",$old_token->token);
|
|
|
|
+ $jwt->logout($old_token->token);
|
|
|
|
+ try {
|
|
|
|
+ $jwt->verifyToken($old_token->token);
|
|
|
|
+ // // $a = $jwt->verifyToken($token);
|
|
|
|
+ // var_dump("======:",$a);
|
|
|
|
+ }catch (\Exception $exception){
|
|
|
|
+ var_dump("接收:",$exception->getCode());
|
|
|
|
+ $code = $exception->getCode();
|
|
|
|
+ // var_dump($code);
|
|
|
|
+ if ($code== 400) {
|
|
|
|
+ $new_token = UserToken::where('user_id', $userData['uid'])->update(['token' => $token->toString()]);
|
|
|
|
+ if (empty($new_token)) {
|
|
|
|
+ return Result::error("Token过期失败!");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ } else{
|
|
|
|
+ return Result::error("Token过期失败!");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ var_dump("======:",$code);
|
|
|
|
+ // return Result::success($code);
|
|
|
|
+
|
|
|
|
+
|
|
}else{
|
|
}else{
|
|
|
|
+ // var_dump("==============================in",$token);
|
|
|
|
+ $usernew_token = $token->toString();
|
|
$user_token = UserToken::create([
|
|
$user_token = UserToken::create([
|
|
'user_id' => $userData['uid'],
|
|
'user_id' => $userData['uid'],
|
|
- 'token' => $token->toString()
|
|
|
|
|
|
+ 'token' => $usernew_token
|
|
]);
|
|
]);
|
|
- var_dump("==============================user_token",$token->toString());
|
|
|
|
|
|
+ // // var_dump("==============================user_token",$token->toString());
|
|
if (empty($user_token)) {
|
|
if (empty($user_token)) {
|
|
return Result::error("登录失败!");
|
|
return Result::error("登录失败!");
|
|
}
|
|
}
|