|
@@ -6,6 +6,7 @@ use App\JsonRpc\UserServiceInterface;
|
|
|
use App\Tools\CommonService;
|
|
|
use App\Tools\PublicData;
|
|
|
use App\Tools\Result;
|
|
|
+use Hyperf\Context\Context;
|
|
|
use function Hyperf\Support\env;
|
|
|
use Hyperf\Di\Annotation\Inject;
|
|
|
use Hyperf\HttpServer\Annotation\AutoController;
|
|
@@ -81,9 +82,13 @@ class LoginController extends AbstractController
|
|
|
}
|
|
|
if($userInfos['data']['type_id']!=10000){
|
|
|
$authData = [
|
|
|
- 'id'=>$userInfos['data']['sszq']
|
|
|
+
|
|
|
+ 'id'=>$userInfos['data']['sszq'],
|
|
|
+ 'SiteId'=>Context::get("SiteId")
|
|
|
];
|
|
|
+ var_dump("参数:",$authData);
|
|
|
$resultAuth = $this->checkUserAuth($authData);
|
|
|
+
|
|
|
if(!$resultAuth){
|
|
|
return Result::error("您没有权限登陆此网站");
|
|
|
}
|
|
@@ -324,10 +329,9 @@ class LoginController extends AbstractController
|
|
|
'id'=>$data['id']
|
|
|
];
|
|
|
$result = $this->userServiceClient->getWebsiteGroupInfo($websiteGroup);
|
|
|
- var_dump("webids:",$result['data']['web_ids']);
|
|
|
if($result['code']==200){
|
|
|
- if($data['siteId'] && $result['data']['web_ids']){
|
|
|
- if(in_array($data['siteId'],$result['data']['web_ids'])){
|
|
|
+ if($data['SiteId'] && $result['data']['web_ids']){
|
|
|
+ if(in_array($data['SiteId'],json_decode($result['data']['web_ids'],true))){
|
|
|
return true;
|
|
|
}
|
|
|
}else{
|