rkljw 2 months ago
parent
commit
2621fcba4b
4 changed files with 14 additions and 8 deletions
  1. 2 2
      .env
  2. 8 4
      app/Controller/LoginController.php
  3. 4 1
      app/Middleware/Auth/PublicMiddleware.php
  4. 0 1
      config/api/login.php

+ 2 - 2
.env

@@ -1,6 +1,8 @@
 APP_NAME=admin_consumer
 APP_ENV=dev
+
 HOST = 192.168.1.123:9501/
+
 DB_DRIVER=mysql
 DB_HOST=192.168.1.123
 DB_PORT=13306
@@ -17,14 +19,12 @@ REDIS_AUTH=zxt_redis_dev
 REDIS_PORT=26739
 REDIS_DB=0
 
-
 AMQP_HOST=192.168.1.123
 AMQP_PORT=5672
 AMQP_USER=rabbitmq
 AMQP_PASSWORD=zxt_mq_dev
 
 
-
 #小程序获取openid
 WECHAT = https://api.weixin.qq.com/
 

+ 8 - 4
app/Controller/LoginController.php

@@ -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{

+ 4 - 1
app/Middleware/Auth/PublicMiddleware.php

@@ -48,16 +48,19 @@ class PublicMiddleware implements MiddlewareInterface
                 $data = [
                     'website_url'=>$origin
                 ];
+
                 $result = $this->websiteServiceClient->getWebsiteId($data);
                 if(!isset($result['data']['id']) || !$result['data']['id']){
                     return $this->response->json(
                         [
                             'code' => -1,
                             'data' => [],
-                            'message' => '网站不存在',
+
+                            'message' => '网站不存在...',
                         ]
                     );
                 }
+//                var_dump($result['data']);
                 // var_dump("获取站点id:",$result);
                 Context::set("SiteId",$result['data']['id']);
                 if ($result) {

+ 0 - 1
config/api/login.php

@@ -9,7 +9,6 @@ Router::addGroup(
     ['middleware' => [\App\Middleware\Auth\PublicMiddleware::class]]
 );
 
-
 Router::post('/api/checkVerifyCode', 'App\Controller\LoginController@checkVerifyCode');
 
 Router::post('/api/registerOrLogin', 'App\Controller\LoginController@registerOrLogin');