Merge branch 'web_sannong_fr'

app/Controller/WebController.php

@@ -741,4 +741,29 @@ class WebController extends AbstractController
          }
 
     }
+    /**
+     * 获取网站模块新闻----图文
+     * @return array
+     */
+    public function getWebsiteCatidArticle()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'catid' =>'required|integer'
+            ],
+            [
+                'catid.required' => 'id不能为空' 
+            ] 
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $requireData['website_id'] =  Context::get("SiteId");
+        // return Result::success($requireData);
+        $result = $this->websiteServiceClient->getWebsiteCatidArticle($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/JsonRpc/WebsiteService.php

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

app/JsonRpc/WebsiteServiceInterface.php

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

config/api/web.php

@@ -40,8 +40,10 @@ Router::addGroup(
                 // 调查问卷-投票
                 Router::get('/addWebsiteSurveyVote', [WebController::class, 'addWebsiteSurveyVote']);
 
-                        // 获取父级/子级栏目----路由
-                 Router::get('/getWebsiteParentCategory', [WebController::class, 'getWebsiteParentCategory']);
+                // 获取父级/子级栏目----路由
+                Router::get('/getWebsiteParentCategory', [WebController::class, 'getWebsiteParentCategory']);
+                // 获取栏目下的文章
+                Router::get('/getWebsiteCatidArticle', [WebController::class, 'getWebsiteCatidArticle']);
             },
     ['middleware' => [WebMiddleware::class]]
 );