login-01

.env

@@ -11,7 +11,11 @@ APP_ENV=dev
 # DB_COLLATION=utf8mb4_unicode_ci
 # DB_PREFIX=
 
+
+
 HOST = http://192.168.1.123:13306/
+
+
 DB_DRIVER=mysql
 DB_HOST=192.168.1.123
 DB_PORT=13306
@@ -23,18 +27,6 @@ DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
 
-# HOST = http://101.254.114.211:13306/
-# DB_DRIVER=mysql
-# DB_HOST=101.254.114.211
-# DB_PORT=13306
-# DB_DATABASE=hyperf
-# DB_USERNAME=root
-# DB_PASSWORD=xKmapDpKCxMMSkbe
-# DB_CHARSET=utf8mb4
-# DB_COLLATION=utf8mb4_unicode_ci
-# DB_PREFIX=
-
-
 #REDIS_HOST=101.254.114.211
 #REDIS_AUTH=YPWWnFnNebc7427B
 #REDIS_PORT=26739
@@ -48,15 +40,12 @@ REDIS_DB=0
 
 
 
-# REDIS_HOST=192.168.1.201
-# REDIS_AUTH=
-# REDIS_PORT=6379
-# REDIS_DB=0
-
-AMQP_HOST=103.105.201.2
-AMQP_PORT=5673
+AMQP_HOST=192.168.1.123
+AMQP_PORT=5672
 AMQP_USER=rabbitmq
-AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
+AMQP_PASSWORD=zxt_mq_dev
+
+
 
 
 #小程序获取openid

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;
@@ -56,6 +57,7 @@ class LoginController extends AbstractController
         if (empty($code)) {
             return Result::error("验证码已过期");
         }
+
         if (strtolower($code) != strtolower($reqData['captcha'])) {
             return Result::error("验证码错误");
         }
@@ -65,21 +67,28 @@ class LoginController extends AbstractController
                 'user_name' => $reqData['username'],
             ];
         }
+
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
         if ($userInfos['code'] == 0) {
             return Result::error("用户不存在");
         }
+
         if($userInfos['data']['status']==0){
             return Result::error("用户已经冻结");
         }
+
         if (md5(md5($reqData['password']) . $userInfos['data']['salt']) != $userInfos['data']['password']) {
             return Result::error("登陆密码错误");
         }
         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("您没有权限登陆此网站");
            }
@@ -318,10 +327,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{

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

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::addRoute(['GET', 'POST'], '/getverifyCode', 'App\Controller\IndexController@getverifyCode');
 Router::post('/api/registerOrLogin', 'App\Controller\LoginController@registerOrLogin');