1

app/Controller/UserController.php

@@ -199,6 +199,7 @@ class UserController extends AbstractController
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
+        $result['data']['website_id'] =   Context::get("SiteId");
         return Result::success($result['data']);
     }
 

app/JsonRpc/NewsService.php

@@ -150,7 +150,7 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
- 
+
 
      //20250226  产品列表
     public function getGoodList(array $data){
@@ -168,12 +168,8 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     public function updateGood(array $data){
         return $this->__request(__FUNCTION__, $data);
     }
-  
-    
-     //20250226  产品列表
-    
- 
 
+     //20250226  产品列表
     /**
      * @param array $data
      * @return array|mixed

app/JsonRpc/WebsiteService.php

@@ -672,4 +672,5 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
     
+
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -388,40 +388,37 @@ interface WebsiteServiceInterface
      */
     public function getFooterContentInfo(array $data);
 
-
-
-
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFootInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategory(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategoryList(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategoryInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function selectWebsiteCategory(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteCategoryHead(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */

app/Middleware/Auth/WebMiddleware.php

@@ -1,93 +1,91 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Middleware\Auth;
-
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Hyperf\Context\Context;
-use App\JsonRpc\WebsiteServiceInterface;
-use Phper666\JWTAuth\JWT;
-class WebMiddleware implements MiddlewareInterface
-{
-    protected ContainerInterface $container;
-
-    protected RequestInterface $request;
-
-    protected HttpResponse $response;
-    protected JWT $JWT;
-    /**
-     * @var WebsiteServiceInterface
-     */
-    #[Inject]
-    private $websiteServiceClient;
-    public function __construct(ContainerInterface $container, HttpResponse $response, RequestInterface $request,Jwt $JWT)
-    {
-        $this->container = $container;
-        $this->response = $response;
-        $this->request = $request;
-        $this->JWT = $JWT;
-
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-
-        $header = $request->getHeaders();
-        try {
-            if($header &&  isset($header['siteid']) && $header['siteid'][0]!='null' && isset($header['siteid'][0])){
-                Context::set("SiteId",intval($header['siteid'][0]));
-                return $handler->handle($request);
-            }elseif($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
-                $origin = $header['origin'][0];
-                $logindevice = explode("//", $origin);
-                $data = [
-                    'website_url'=>$logindevice[1]
-                ];
-                // var_dump("222:",$data);
-                $result = $this->websiteServiceClient->getWebsiteId($data);
-                // var_dump("3333333:",$result);
-                if(!isset($result['data']['id']) || !$result['data']['id']){
-                    return $this->response->json(
-                        [
-                            'code' => -1,
-                            'data' => [],
-                            'message' => '网站不存在',
-                        ]
-                    );
-                }
-                // var_dump("获取站点id：",$result);
-                Context::set("SiteId",$result['data']['id']);
-                if ($result) {
-                    return $handler->handle($request);
-                }
-            }else{
-                return $this->response->json(
-                    [
-                        'code' => -1,
-                        'data' => [],
-                        'message' => 'origin:必填',
-                    ]
-                );
-            }
-
-        }catch (\Exception $e){
-            var_dump("错误消息：",$e->getMessage(),$e->getCode());
-            return $this->response->json(
-                [
-                    'code' => $e->getCode(),
-                    'data' => [],
-                    'message' => '网址必填：'.$e->getMessage(),
-                ]
-            );
-        }
-        return false;
-    }
-}
+<?php
+
+declare(strict_types=1);
+
+namespace App\Middleware\Auth;
+
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Hyperf\Context\Context;
+use App\JsonRpc\WebsiteServiceInterface;
+use Phper666\JWTAuth\JWT;
+class WebMiddleware implements MiddlewareInterface
+{
+    protected ContainerInterface $container;
+
+    protected RequestInterface $request;
+
+    protected HttpResponse $response;
+    protected JWT $JWT;
+    /**
+     * @var WebsiteServiceInterface
+     */
+    #[Inject]
+    private $websiteServiceClient;
+    public function __construct(ContainerInterface $container, HttpResponse $response, RequestInterface $request,Jwt $JWT)
+    {
+        $this->container = $container;
+        $this->response = $response;
+        $this->request = $request;
+        $this->JWT = $JWT;
+
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+
+        $header = $request->getHeaders();
+        try {
+          
+            if($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
+                $origin = $header['origin'][0];
+                $logindevice = explode("//", $origin);
+                $data = [
+                    'website_url'=>$logindevice[1]
+                ];
+                // var_dump("222:",$data);
+                $result = $this->websiteServiceClient->getWebsiteId($data);
+                // var_dump("3333333:",$result);
+                if($result['code']==0 || !isset($result['data']['id']) || !$result['data']['id']){
+                    return $this->response->json(
+                        [
+                            'code' => -1,
+                            'data' => [],
+                            'message' => '网站不存在',
+                        ]
+                    );
+                }
+                // var_dump("获取站点id：",$result);
+                Context::set("SiteId",$result['data']['id']);
+                if ($result) {
+                    return $handler->handle($request);
+                }
+            }else{
+                return $this->response->json(
+                    [
+                        'code' => -1,
+                        'data' => [],
+                        'message' => 'origin:必填',
+                    ]
+                );
+            }
+
+        }catch (\Exception $e){
+            var_dump("错误消息：",$e->getMessage(),$e->getCode());
+            return $this->response->json(
+                [
+                    'code' => $e->getCode(),
+                    'data' => [],
+                    'message' => '网址必填：'.$e->getMessage(),
+                ]
+            );
+        }
+        return false;
+    }
+}