修改代码

app/Controller/AuthorityController.php

@@ -155,7 +155,9 @@ class AuthorityController extends AbstractController
     public  function  getRecursionMenu()
     {
         $header = $this->request->getHeaders();
-//        var_dump($header);
+        if(!isset($header['origin'])){
+            return Result::error("header请配置origin");
+        }
         $origin =  $header['origin'][0];
         $logindevice = explode("//", $origin);
         $reqData = [

app/Controller/LoginController.php

@@ -67,6 +67,9 @@ class LoginController extends AbstractController
         }
         $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
+        if($userInfos['code']==0){
+            return Result::error("用户名或密码错误");
+        }
         $this->logger->info("验证用户返回值：", $userInfos);
         if(md5(md5($reqData['password']).$userInfos['data']['salt']) != $userInfos['data']['password']){
             return Result::error("用户名或密码错误");

app/Controller/NewsController.php

@@ -315,4 +315,5 @@ class NewsController extends AbstractController
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+
 }

app/Controller/WebController.php

@@ -0,0 +1,78 @@
+<?php
+declare(strict_types=1);
+namespace App\Controller;
+
+use App\JsonRpc\NewsServiceInterface;
+use App\JsonRpc\WebsiteServiceInterface;
+use App\Tools\PublicData;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use App\Constants\ErrorCode;
+/**
+ * Class WebController
+ * @package App\Controller
+ */
+class WebController extends AbstractController
+{
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
+
+    /**
+     * @var NewsServiceInterface
+     */
+    #[Inject]
+    private $newsServiceClient;
+
+    /**
+     * @var WebsiteServiceInterface
+     */
+    #[Inject]
+    private $websiteServiceClient;
+    protected $siteId;
+    public function __construct(){
+        $websiteInfo = $this->getWebsiteId();
+        if($websiteInfo['code'] == 200){
+            $this->siteId = $websiteInfo['data']['id'];
+        }
+    }
+    /**
+     * 获取栏目导航
+     * @return array
+     */
+    public function getWebsiteCategory()
+    {
+        $data = [
+            'website_id'=>$this->siteId
+        ];
+        $result = $this->websiteServiceClient->getWebsiteCategory($data);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * @return array
+     */
+    public function getWebsiteId()
+    {
+        $header = $this->request->getHeaders();
+        var_dump("获取header：",$header);
+        if(!isset($header['origin'])){
+            return Result::error("header请配置origin");
+        }
+        $origin = $header['origin'][0];
+        $logindevice = explode("//", $origin);
+        $data = [
+            'website_url'=>$logindevice[1]
+        ];
+        $result = $this->websiteServiceClient->getWebsiteId($data);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+}

app/Controller/WebsiteController.php

@@ -414,4 +414,18 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->delWebsiteRoleUser($id);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * 网站栏目映射
+     * @return void
+     */
+    public function addWebsiteCategory()
+    {
+
+    }
+
+    public function getAdminIndex()
+    {
+
+    }
 }

app/JsonRpc/WebsiteService.php

@@ -190,4 +190,22 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__,$id);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getWebsiteId(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -117,4 +117,17 @@ interface WebsiteServiceInterface
      * @return array
      */
     public function delWebsiteRoleUser(int $id);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteId(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteCategory(array $data);
 }

app/Middleware/CorsMiddleware.php

@@ -24,7 +24,7 @@ class CorsMiddleware implements MiddlewareInterface
         if ($request->getMethod() == 'OPTIONS') {
             return $response;
         }
-
+        var_dump($request);
         return $handler->handle($request);
     }
 }

config/api/web.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\WebController;
+use Hyperf\HttpServer\Router\Router;
+Router::addGroup(
+    '/web', function () {
+                Router::get('/getWebsiteId', [WebController::class, 'getWebsiteId']);
+                Router::get('/getWebsiteCategory', [WebController::class, 'getWebsiteCategory']);
+            }
+);

config/routes.php

@@ -33,4 +33,5 @@ require __DIR__.'/api/chat.php';
 require __DIR__.'/api/link.php';
 require __DIR__.'/api/login.php';
 require __DIR__.'/api/news.php';
-require __DIR__.'/api/website.php';
+require __DIR__.'/api/website.php';
+require __DIR__.'/api/web.php';

runtime/container/proxy/App_Controller_AuthorityController.proxy.php

@@ -136,7 +136,9 @@ class AuthorityController extends AbstractController
     public function getRecursionMenu()
     {
         $header = $this->request->getHeaders();
-        //        var_dump($header);
+        if (!isset($header['origin'])) {
+            return Result::error("header请配置origin");
+        }
         $origin = $header['origin'][0];
         $logindevice = explode("//", $origin);
         $reqData = ['user_id' => $this->UserId, 'logindevice' => $logindevice[1]];

runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -61,6 +61,9 @@ class LoginController extends AbstractController
         }
         $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
+        if ($userInfos['code'] == 0) {
+            return Result::error("用户名或密码错误");
+        }
         $this->logger->info("验证用户返回值：", $userInfos);
         if (md5(md5($reqData['password']) . $userInfos['data']['salt']) != $userInfos['data']['password']) {
             return Result::error("用户名或密码错误");

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -315,4 +315,14 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->delWebsiteRoleUser($id);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 网站栏目映射
+     * @return void
+     */
+    public function addWebsiteCategory()
+    {
+    }
+    public function getAdminIndex()
+    {
+    }
 }

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_0378cdd6be6e3f45eb47c08ebad4a7ed extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_c62b50c7b2753be00f078b54438742cd extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
@@ -157,4 +157,21 @@ class WebsiteServiceInterface_0378cdd6be6e3f45eb47c08ebad4a7ed extends \Hyperf\R
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteId(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteCategory(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/hyperf.pid

@@ -1 +1 @@
-48511
+3593