Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -732,7 +732,7 @@ class WebController extends AbstractController
         //     $errorMessage = $validator->errors()->first();
         //     return Result::error($errorMessage);
         // }
-        $requireData['website_id'] =  Context::get("SiteId");
+        $requireData['website_id'] =  Context::get("SiteId") ?? 0;
         $result = $this->websiteServiceClient->getWebsiteParentCategory($requireData);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]); 
@@ -844,4 +844,28 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getWebsiteArticles($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+    /*
+     * 匹配路由
+     *
+     * */
+    public function getWebsiteRoute()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pinyin' =>'required',
+            ],
+            [
+                'pinyin.required' => '路由不能为空',
+            ]
+        ); 
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $requireData['website_id'] =  Context::get("SiteId");
+        $result = $this->websiteServiceClient->getWebsiteRoute($requireData); 
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/JsonRpc/WebsiteService.php

@@ -699,4 +699,12 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteRoute(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data); 
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -458,4 +458,9 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteHead(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteRoute(array $data);
 }

config/api/web.php

@@ -52,6 +52,8 @@ Router::addGroup(
                 Router::get('/getWebsiteAllArticle', [WebController::class, 'getWebsiteAllArticle']);
                 // 乡村网-获取特殊新闻
                 Router::get('/getWebsiteArticles', [WebController::class, 'getWebsiteArticles']);
+                // 匹配路由
+                Router::get('/getWebsiteRoute', [WebController::class, 'getWebsiteRoute']);
             },
     ['middleware' => [WebMiddleware::class]]
 );