|
@@ -398,11 +398,15 @@ class LoginController extends AbstractController
|
|
|
]);
|
|
|
if($results['code']==200){
|
|
|
return Result::success(['isLogin' => true]);
|
|
|
+ }elseif($results['code']==-1){
|
|
|
+ return Result::error("没有权限登陆".$logindevice[1]."这个域名",-1);
|
|
|
+ }elseif($results['code']==-2){
|
|
|
+ return Result::error("token已过期",-2);
|
|
|
}else{
|
|
|
- return Result::error("没有权限登陆".$logindevice[1]."这个域名");
|
|
|
+ return Result::error("参数错误");
|
|
|
}
|
|
|
}catch(\Exception $e){
|
|
|
- return Result::error('token已过期:'.$e->getMessage());
|
|
|
+ return Result::error('token已过期:'.$e->getMessage(),-2);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -691,12 +695,12 @@ class LoginController extends AbstractController
|
|
|
$ver =$jwt->getClaimsByToken($data['token']);
|
|
|
$tokenTime = $jwt->getTokenDynamicCacheTime($data['token']);
|
|
|
if($tokenTime==0){
|
|
|
- return Result::error("token已过期,请重新登录",-1);
|
|
|
+ return Result::error("token已过期,请重新登录",-2);
|
|
|
}
|
|
|
if(isset($data['userurl']) && $data['userurl']){
|
|
|
$result = $this->websiteServiceClient->getWebsiteId(['website_url'=>$data['userurl']]);
|
|
|
if(!isset($result['data']['id']) || !$result['data']['id']){
|
|
|
- return Result::error("网站不存在...",-1);
|
|
|
+ return Result::error("网站不存在...",-2);
|
|
|
}
|
|
|
if($ver['type_id']!=10000){
|
|
|
$userInfo = $this->userServiceClient->getUserInfo($ver['uid']);
|
|
@@ -716,13 +720,13 @@ class LoginController extends AbstractController
|
|
|
return Result::success([]);
|
|
|
}
|
|
|
}else{
|
|
|
- return Result::error("用户没有群组...",-1);
|
|
|
+ return Result::error("用户没有群组...",-2);
|
|
|
}
|
|
|
}else{
|
|
|
return Result::success([]);
|
|
|
}
|
|
|
}else{
|
|
|
- return Result::error("userurl不能为空...",-1);
|
|
|
+ return Result::error("userurl不能为空...",-2);
|
|
|
}
|
|
|
|
|
|
}
|