Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -763,7 +763,7 @@ class WebController extends AbstractController
         }
         $requireData['website_id'] =  Context::get("SiteId");
         // return Result::success($requireData);
-        $result = $this->websiteServiceClient->getWebsiteCatidArticle($requireData);
+        $result = $this->newsServiceClient->getWebsiteCatidArticle($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 }

app/JsonRpc/NewsService.php

@@ -264,6 +264,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
      * @return mixed
      */
     public function selectWebsiteArticle(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+        /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCatidArticle(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/NewsServiceInterface.php

@@ -117,6 +117,11 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function selectWebsiteArticle(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+    */
+    public function getWebsiteCatidArticle(array $data);
 
     /**
      * @param array $data

app/JsonRpc/WebsiteServiceInterface.php

@@ -447,9 +447,5 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteParentCategory(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-    */
-    public function getWebsiteCatidArticle(array $data);
+
 }