白名单

app/Controller/WebsiteController.php

@@ -2331,7 +2331,7 @@ class WebsiteController extends AbstractController
     public function getSiteInfo()
     {
         $id = Context::get("SiteId");
-        $result = $this->websiteServiceClient->getWebsiteInfo($id);
+        $result = $this->websiteServiceClient->getWebsiteInfo(intval($id));
         if($result['code']==200){
             $result['data']['website_url'] = isset($result['data']['website_url']) && $result['data']['website_url']?json_decode($result['data']['website_url']):'';
             $result['data']['website_column_arr_id'] = isset($result['data']['website_column_arr_id']) && $result['data']['website_column_arr_id']?json_decode($result['data']['website_column_arr_id']):'';
@@ -2348,7 +2348,7 @@ class WebsiteController extends AbstractController
     public function getSiteCategory()
     {
         $requireData['website_id'] = Context::get("SiteId");
-        $result = $this->websiteServiceClient->getAdminWebsiteCategory($requireData);
+        $result = $this->websiteServiceClient->getWebsiteAllCategory($requireData);
         return $result['code']==200?Result::success(PublicData::buildCategoryTree($result['data'])):Result::error($result['message']);
     }
 
@@ -2512,5 +2512,134 @@ class WebsiteController extends AbstractController
         Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     // --自助建站-----------20250522fr----------------------end
+    /**
+     * 获取网站路由白名单列表
+     * @return array    
+     */
+    public function getWhiteRouterList(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer'
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须是整数',
+                'pageSize.required' => '每页显示数量不能为空',
+                'pageSize.integer' => '每页显示数量必须是整数'  
+            ]
+
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            // return $requireData;
+            $result = $this->websiteServiceClient->getWhiteRouterList($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加白名单
+     * @return array
+     */
+    public function addWhiteRouter(){
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'function_name' =>'required',
+                'router_url' =>'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'function_name.required' => '功能名称不能为空',
+                'router_url.required' => '路由地址不能为空',
+            ]
+
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->addWhiteRouter($requireData);    
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除白名单
+     * @return array
+     */
+    public function delWhiteRouter(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数类型',
+            ]   
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->delWhiteRouter($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取白名单信息
+     * @return array
+     */
+    public function getWhiteRouterInfo(){
+        $requireData = $this->request->all();       
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer'
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'id.integer' => '网站id必须是整数类型'
+            ]
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $result = $this->websiteServiceClient->getWhiteRouterInfo($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 修改白名单
+     * @return array
+     */
+    public function upWhiteRouter(){
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+                'website_id' =>'required',
+                'function_name' =>'required',
+                'router_url' =>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'website_id.required' => '网站id不能为空',
+                'function_name.required' => '功能名称不能为空',
+                'router_url.required' => '路由地址不能为空',
+            ]
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->upWhiteRouter($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/JsonRpc/WebsiteService.php

@@ -767,4 +767,46 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -490,4 +490,15 @@ interface WebsiteServiceInterface
     public function getFooterContentInfo(array $data);
     public function getStaticResourceInfo(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterList(array $data);
+    public function addWhiteRouter(array $data);
+    public function delWhiteRouter(array $data);
+    public function getWhiteRouterInfo(array $data);
+    public function upWhiteRouter(array $data);
+
+
 }

config/api/website.php

@@ -141,6 +141,13 @@ Router::addGroup(
         Router::post('/upWebFootInfo', [WebsiteController::class, 'upWebFootInfo']);
         Router::post('/addWebFootInfo', [WebsiteController::class, 'addWebFootInfo']);
         // --网站底部基础信息-----------fr----------------------end
+        // --网站路由白名单-----------fr----------------------start
+        Router::get('/getWhiteRouterList', [WebsiteController::class, 'getWhiteRouterList']);
+        Router::post('/addWhiteRouter', [WebsiteController::class, 'addWhiteRouter']);
+        Router::post('/delWhiteRouter', [WebsiteController::class, 'delWhiteRouter']);
+        Router::get('/getWhiteRouterInfo', [WebsiteController::class, 'getWhiteRouterInfo']);
+        Router::post('/upWhiteRouter', [WebsiteController::class, 'upWhiteRouter']);
+        // --网站路由白名单-----------fr----------------------end
     },
     ['middleware' => [FooMiddleware::class]]
 );