Merge branch 'web_sannong_fr' into pre

.env

@@ -17,15 +17,26 @@ DB_PREFIX=
 #REDIS_DB=0
 
 
-REDIS_HOST=192.168.1.201
+# REDIS_HOST=192.168.1.201
+# REDIS_AUTH=
+# REDIS_PORT=6379
+# REDIS_DB=0
+
+REDIS_HOST=192.168.1.123
 REDIS_AUTH=
-REDIS_PORT=6379
+REDIS_PORT=26739
+REDIS_PASSWORD=zxt_redis_dev
 REDIS_DB=0
 
-AMQP_HOST=103.105.201.2
-AMQP_PORT=5673
+AMQP_HOST=192.168.1.123
+AMQP_PORT=5672
 AMQP_USER=rabbitmq
-AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
+AMQP_PASSWORD=zxt_mq_dev
+
+# AMQP_HOST=103.105.201.2
+# AMQP_PORT=5673
+# AMQP_USER=rabbitmq
+# AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
 
 
 #小程序获取openid

app/Controller/NewsController.php

@@ -423,6 +423,52 @@ class NewsController extends AbstractController
         $result['data']['cat_arr_id'] =  $result['data']['cat_arr_id']?json_decode($result['data']['cat_arr_id']):[];
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-
-
+    /**
+     * 获取调查问卷列表
+     * @return array
+     */
+    public function getSurveyList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page'=>'required',
+                'pageSize'=>'required',
+            ],
+            [
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->newsServiceClient->getSurveyList($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取调查问卷详情
+     * @return array
+     */
+    public function getSurveyInfo()
+    {
+        $requireData = $this->request->all(); 
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id'=>'required'
+            ], 
+            [
+               'sur_id.required' => 'sur_id不能为空', 
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $result = $this->newsServiceClient->getSurveyInfo($requireData);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/PublicController.php

@@ -621,7 +621,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->upZhinengbumen($requireData);
+        $result = $this->publicServiceClient->modZhinengbumen($requireData);
         return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
     }
 }

app/Controller/WebController.php

@@ -6,13 +6,12 @@ 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;
-use App\Controller\PublicController;
 use Hyperf\Context\Context;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface;
+
 /**
  * Class WebController
  * @package App\Controller
@@ -22,7 +21,7 @@ class WebController extends AbstractController
 
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-    private $publicServiceClient;
+
     /**
      * @var NewsServiceInterface
      */
@@ -37,7 +36,6 @@ class WebController extends AbstractController
 
 
     private $PublicController;
-
     public function __construct(PublicController $PublicController)
     {
         $this->PublicController = $PublicController;
@@ -49,25 +47,8 @@ class WebController extends AbstractController
      */
     public function getWebsiteCategory()
     {
-
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'pageSize' => 'required'
-            ],
-            [
-                'pageSize.required' => '显示条数不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-
         $data = [
-            'website_id'=>Context::get("SiteId"),
-            'pageSize'=>$requireData['pageSize']
+            'website_id'=>Context::get("SiteId")
         ];
         // var_dump("网站id：",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
@@ -103,24 +84,26 @@ class WebController extends AbstractController
     public function getWebsiteAdvertisement()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'adPlace' => 'required'
-            ],
-            [
-                'adPlace.required' => '广告位置编号不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        $data = ['website_id'=>Context::get("SiteId")]; 
+        if($requireData['ad_tag']){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'ad_tag' => 'required'
+                ],
+                [
+                    'ad_tag.required' => '广告位置表示不能为空'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['ad_tag'] = $requireData['ad_tag'];
         }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'ad_placeid'=>$requireData['adPlace']
-        ]; 
         
+        
+        // return Result::success($data);//测试
         $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
 
         if ($result['code'] != ErrorCode::SUCCESS) {
@@ -153,7 +136,6 @@ class WebController extends AbstractController
         return Result::success($result['data']);
     }
 
-
     /**
      *各省市查询 
      */
@@ -374,8 +356,9 @@ class WebController extends AbstractController
 
     /**
      * 获取文章列表
+     * @return array
      */
-    public function getWebsiteArticlesList()
+    public function getWebsiteArticleList()
     {
        
         $requireData = $this->request->all();
@@ -390,55 +373,39 @@ class WebController extends AbstractController
 
             ]
             );
-            $data['catid'] =  $requireData['catid']; 
-        }elseif(isset($requireData['keyword'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'keyword' => 'required'
-                ],
-                [
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['keyword'] =  $requireData['keyword']; 
-        }else{
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'catid' => 'required',
-                    'keyword' => 'required'
-                ],
-                [
-                    'catid.required' => '栏目id不能为空',
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-            $data['keyword'] =  $requireData['keyword']; 
+            if(is_string($requireData['catid'])){
+                $data['catid'] = json_decode($requireData['catid']); 
+            }else{
+                $data['catid'] = $requireData['catid']; 
+            }
         }
+            
         $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page' => 'required',
-                    'pageSize' => 'required'
-                ],
-                [
-                    'page.required' => '分页不能为空',
-                    'pageSize.required' => '显示条数不能为空'
-    
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['website_id'] = Context::get("SiteId");
-            $data['pageSize'] = $requireData['pageSize']; 
-            $data['page'] = $requireData['page']; 
-        $result = $this->newsServiceClient->getArticleList($data);
+            $requireData,
+            [
+                'page' => 'required',
+                'pageSize' => 'required'
+            ],
+            [
+                'page.required' => '分页不能为空',
+                'pageSize.required' => '显示条数不能为空'
+
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // $data['catid'] =  $requireData['catid']; 
+        if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
+            $data['keyword'] =  $requireData['keyword'];
+        }
+
+        $data['website_id'] = Context::get("SiteId");
+        $data['pageSize'] = $requireData['pageSize']; 
+        $data['page'] = $requireData['page']; 
+        // return Result::success($data);
+        $result = $this->newsServiceClient->getWebsiteArticleList($data);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -472,7 +439,7 @@ class WebController extends AbstractController
             'website_id'=>Context::get("SiteId"),
             'id'=>$requireData['articleid'],
         ]; 
-        $result = $this->newsServiceClient->getArticleInfo($data);
+        $result = $this->newsServiceClient->selectWebsiteArticleInfo($data);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -480,4 +447,303 @@ class WebController extends AbstractController
         return Result::success($result['data']);
         
     }
+    /**
+     * 获取网站底部信息
+     * @return array
+     */
+    public function getWebsiteFootInfo()
+    {
+        $data = [
+            'website_id'=>Context::get("SiteId")
+        ];
+        $result = $this->websiteServiceClient->getWebsiteFootInfo($data);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 获取网站底部导航
+     * @return array
+    */
+    public function getWebsiteFooterCategory()
+    {
+        $data = [
+            'website_id'=>Context::get("SiteId")
+        ];
+        $result = $this->websiteServiceClient->getWebsiteFooterCategory($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    /**
+     * 获取网站底部导航列表
+     * @return array
+    */
+    public function getWebsiteFooterCategoryList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'fcat_id' =>'required|integer'
+            ],
+            [
+                'fcat_id.required' => '底部导航栏目id不能为空',
+                'fcat_id.integer' => '底部导航栏目id必须为整数'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first(); 
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'fcat_id'=>$requireData['fcat_id'],
+            'website_id'=>Context::get("SiteId")
+        ];
+        $result = $this->websiteServiceClient->getWebsiteFooterCategoryList($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    /**
+     * 获取网站底部导航内容
+     * @return array
+    */
+    public function getWebsiteFooterCategoryInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'fcat_id' =>'required|integer',
+                'type' => 'nullable|in:0'
+            ],
+            [
+                'fcat_id.required' => 'id不能为空',
+                'fcat_id.integer' => 'id必须为整数',
+                'type.in' => '类型必须为0'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $data = [
+            'fcat_id'=>$requireData['fcat_id'],
+            'website_id'=>Context::get("SiteId")
+        ];
+        if(isset($requireData['type'])){
+            $data['type'] = $requireData['type'];
+        }
+        $result = $this->websiteServiceClient->getWebsiteFooterCategoryInfo($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    /**
+     * 搜索导航
+     * @return array
+     */
+    public function selectWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'cityid' => 'nullable|numeric',
+                'department_id' => 'nullable|numeric',
+            ], 
+            [
+                'cityid.numeric' => '城市id必须为数字',
+                'department_id.numeric' => '部门id必须为数字' 
+            ]
+        ) ;
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = $requireData;
+        $data['website_id'] = Context::get("SiteId");
+        $result = $this->newsServiceClient->selectWebsiteArticle($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+        }
+
+    }
+    /**
+     * 搜索栏目的seo信息
+     * @return array
+     */
+    public function getWebsiteCategoryHead()
+    {
+        $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);
+        }
+        $data = $requireData;
+        $data['website_id'] = Context::get("SiteId");
+        $result = $this->websiteServiceClient->getWebsiteCategoryHead($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+         }
+
+    }
+    /**
+     * 搜索某个导航
+     * @return array
+     */
+    public function getOneWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'catid' =>'required|integer'
+            ], 
+            [
+                'catid.required' => 'catid不能为空'
+            ]
+        ) ;
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'category_id' => $requireData['catid'],
+            'website_id' => Context::get("SiteId")
+        ];
+        $result = $this->websiteServiceClient->getOneWebsiteCategory($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]); 
+        }else{
+            return Result::success($result['data']);
+         }
+
+    }
+    /**
+     * 获取网站调查问卷
+     */
+    public function getWebsiteSurvey()
+    {
+        $requireData = $this->request->all();
+        if(isset($requireData['art_id'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'art_id' =>'required|integer'
+                ],
+                [
+                    'art_id.required' => 'id不能为空',
+                    'art_id.integer' => 'id必须为整数'
+                ]
+            ); 
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['art_id'] = $requireData['art_id'];
+        }
+        $data['website_id'] =  Context::get("SiteId");
+        // return Result::success($data);
+        $result = $this->newsServiceClient->getWebsiteSurvey($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+
+    }
+    /*
+     * 添加网站调查问卷选项
+     * 
+     * */
+    public function addWebsiteSurveyOption()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id' =>'required',
+                'choice_name' =>'required|string|max:30',
+            ],
+            [
+                'sur_id.required' => '问卷id不能为空',
+                'choice_name.required' => '选项名称不能为空',
+                'choice_name.string' => '选项名称必须为字符串',
+                'choice_name.max' => '选项名称不能超过30个字符',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id' => Context::get("SiteId"),
+            'sur_id' => $requireData['sur_id'],
+            'choice_name' => $requireData['choice_name'],
+        ];
+        $result = $this->newsServiceClient->addWebsiteSurveyOption($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    /*
+     * 调查问卷-投票
+     * 
+     * */
+    public function addWebsiteSurveyVote()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id' =>'required',
+                'choice_id' =>'required',
+            ],
+            [
+                'sur_id.required' => '问卷id不能为空',
+                'choice_id.required' => '选项名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id' => Context::get("SiteId"),
+            'sur_id' => $requireData['sur_id'],
+            'choice_id' => $requireData['choice_id']
+        ];
+        // return Result::success($data);
+        $result = $this->newsServiceClient->addWebsiteSurveyVote($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    
 }

app/JsonRpc/NewsService.php

@@ -143,5 +143,69 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
         return $this->__request(__FUNCTION__, $data);
     }
     
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticleList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function selectWebsiteArticleInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteSurvey(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyOption(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyVote(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticle(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -71,4 +71,44 @@ interface NewsServiceInterface
      */
     public function upArticleStatus(array $data);
 
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteArticleList(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticleInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteSurvey(array $data);
+      /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyOption(array $data);
+      /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyVote(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticle(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -209,10 +209,12 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
     /**
      * @param array $data
      * @return array|mixed
      */
+
     public function getWebsiteAdvertisement(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -222,22 +224,27 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return array|mixed
      */
+
     public function selectWebsiteDepartment(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
     /**
      * @param array $data
      * @return mixed
      */
+
     public function selectWebsiteArea(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
     /**
      * @param array $data
      * @return mixed
      */
+
     public function getWebsiteModelCategory(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -247,6 +254,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
+
     public function selectWebsiteLinks(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -255,10 +263,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
 
 
 
-
-
-
-
     /**
      * @param array $data
      * @return array|mixed
@@ -449,4 +453,64 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
+
+
+    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteFootInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteFooterCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteFooterCategoryList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteFooterCategoryInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCategoryHead(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOneWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -118,28 +118,30 @@ interface WebsiteServiceInterface
      */
     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);
      
 
-
-
-
     /**
      * @param array $data
      * @return mixed
      *
      */
+
     public function getWebsiteAdvertisement(array $data);
 
     /**
@@ -147,18 +149,23 @@ interface WebsiteServiceInterface
      * @return mixed
      *
      */
+
     public function selectWebsiteDepartment(array $data);
+
     /**
      * @param array $data
      * @return mixed
      *
      */
+
     public function selectWebsiteArea(array $data);
+
     /**
      * @param array $data
      * @return mixed
      *
      */
+
     public function getWebsiteModelCategory(array $data);
 
     /**
@@ -166,10 +173,8 @@ interface WebsiteServiceInterface
      * @return mixed
      *
      */
-    public function selectWebsiteLinks(array $data);
-
-
 
+    public function selectWebsiteLinks(array $data);
 
 
 
@@ -306,4 +311,42 @@ interface WebsiteServiceInterface
      */
     public function checkWebsiteUrl(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
+     */
+    public function getOneWebsiteCategory(array $data);
+     
 }

config/api/news.php

@@ -29,8 +29,16 @@ Router::addGroup(
         Router::post('/upArticleStatus', [NewsController::class, 'upArticleStatus']);
         //查看资讯
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+        // 前端-搜索资讯
+        Router::get('/selectWebsiteCategory', [NewsController::class, 'selectWebsiteArticle']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
+         //前端-获取资讯列表
+         Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
+         //后端-获取调查问卷列表
+         Router::post('/getSurveyList', [NewsController::class, 'getSurveyList']);
+         //后端-获取调查问卷详情
+         Router::post('/getSurveyInfo', [NewsController::class, 'getSurveyInfo']);
 
 },
     ['middleware' => [FooMiddleware::class]]

config/api/web.php

@@ -15,10 +15,30 @@ Router::addGroup(
                 Router::get('/getWebsiteArticlett', [WebController::class, 'getWebsiteArticlett']);
                 Router::get('/getWebsiteModelArticles', [WebController::class, 'getWebsiteModelArticles']);
                 Router::get('/getWebsiteModelCategory', [WebController::class, 'getWebsiteModelCategory']);
-                Router::get('/getWebsiteArticlesList', [WebController::class, 'getWebsiteArticlesList']);
+                Router::get('/getWebsiteArticleList', [WebController::class, 'getWebsiteArticleList']);
                 Router::get('/selectWebsiteArticleInfo', [WebController::class, 'selectWebsiteArticleInfo']);
 
                 Router::get('/selectWebsiteLinks', [WebController::class, 'selectWebsiteLinks']);
+                // 获取网站底部基础信息
+                Router::get('/getWebsiteFootInfo', [WebController::class, 'getWebsiteFootInfo']);
+                // 获取网站底部导航
+                Router::get('/getWebsiteFooterCategory', [WebController::class, 'getWebsiteFooterCategory']);
+                // 获取网站底部导航列表
+                Router::get('/getWebsiteFooterCategoryList', [WebController::class, 'getWebsiteFooterCategoryList']);
+                // 获取网站底部导航内容
+                Router::get('/getWebsiteFooterCategoryInfo', [WebController::class, 'getWebsiteFooterCategoryInfo']);
+                // 搜索网站二级导航
+                Router::get('/selectWebsiteCategory', [WebController::class, 'selectWebsiteCategory']);
+                // 搜索网站二级导航-seo列表页
+                Router::get('/getWebsiteCategoryHead', [WebController::class, 'getWebsiteCategoryHead']);
+                //获取某个栏目
+                Router::get('/getOneWebsiteCategory', [WebController::class, 'getOneWebsiteCategory']);
+                //获取调查问卷
+                Router::get('/getWebsiteSurvey', [WebController::class, 'getWebsiteSurvey']);
+                // 添加调查问卷选项
+                Router::get('/addWebsiteSurveyOption', [WebController::class, 'addWebsiteSurveyOption']);
+                // 调查问卷-投票
+                Router::get('/addWebsiteSurveyVote', [WebController::class, 'addWebsiteSurveyVote']);
             },
     ['middleware' => [WebMiddleware::class]]
 );