LiuJ 4 meses atrás
pai
commit
13bea6fccf

+ 29 - 9
app/Controller/WebsiteController.php

@@ -2609,12 +2609,12 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-//                'website_id' => 'required',
+                //                'website_id' => 'required',
                 'function_name' => 'required',
                 'router_url' => 'required',
             ],
             [
-//                'website_id.required' => '网站id不能为空',
+                //                'website_id.required' => '网站id不能为空',
                 'function_name.required' => '功能名称不能为空',
                 'router_url.required' => '路由地址不能为空',
             ]
@@ -2686,13 +2686,13 @@ class WebsiteController extends AbstractController
             $requireData,
             [
                 'id' => 'required|integer',
-//                'website_id' => 'required',
+                //                'website_id' => 'required',
                 'function_name' => 'required',
                 'router_url' => 'required',
             ],
             [
                 'id.required' => 'id不能为空',
-//                'website_id.required' => '网站id不能为空',
+                //                'website_id.required' => '网站id不能为空',
                 'function_name.required' => '功能名称不能为空',
                 'router_url.required' => '路由地址不能为空',
             ]
@@ -2806,13 +2806,14 @@ class WebsiteController extends AbstractController
      * 自助建站-修改网站应用状态
      * @return array
      */
-    public function upWebsiteStatus(){
+    public function upWebsiteStatus()
+    {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'website_id' =>'required|integer',
-                'status' =>'required|integer',
+                'website_id' => 'required|integer',
+                'status' => 'required|integer',
             ],
             [
                 'website_id.required' => '网站id不能为空',
@@ -2826,7 +2827,7 @@ class WebsiteController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->websiteServiceClient->upWebsiteStatus($requireData);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
 
@@ -2852,8 +2853,27 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-       
+
         $result = $this->websiteServiceClient->delWebsiteUrl($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    public function checkPath()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->checkPath($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

+ 45 - 41
app/JsonRpc/WebsiteService.php

@@ -45,7 +45,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsite(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,compact('id', 'data'));
+        return $this->__request(__FUNCTION__, compact('id', 'data'));
     }
 
     /**
@@ -54,7 +54,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsite(int $id)
     {
-        return $this->__request(__FUNCTION__,compact('id'));
+        return $this->__request(__FUNCTION__, compact('id'));
     }
 
     /**
@@ -63,7 +63,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsiteInfo(int $id)
     {
-        return $this->__request(__FUNCTION__,compact('id'));
+        return $this->__request(__FUNCTION__, compact('id'));
     }
 
     /**
@@ -84,7 +84,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsiteColumnList(array $data)
     {
-//        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
+        //        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -104,7 +104,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteColumn(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,compact('id', 'data'));
+        return $this->__request(__FUNCTION__, compact('id', 'data'));
     }
 
     /**
@@ -113,7 +113,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteColumn(int $id)
     {
-        return $this->__request(__FUNCTION__,compact('id'));
+        return $this->__request(__FUNCTION__, compact('id'));
     }
 
     /**
@@ -122,9 +122,9 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param int $pageSize
      * @return mixed
      */
-    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize,int $websiteId)
+    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize, int $websiteId)
     {
-        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize','websiteId'));
+        return $this->__request(__FUNCTION__, compact('keyword', 'page', 'pageSize', 'websiteId'));
     }
     /**
      * @param array $data
@@ -142,7 +142,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteRole(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,compact('id', 'data'));
+        return $this->__request(__FUNCTION__, compact('id', 'data'));
     }
 
     /**
@@ -151,7 +151,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteRole(int $id)
     {
-        return $this->__request(__FUNCTION__,compact('id'));
+        return $this->__request(__FUNCTION__, compact('id'));
     }
     /**
      * @param string $keyword
@@ -159,9 +159,9 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param int $pageSize
      * @return mixed
      */
-    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize,int $websiteId,int $roleId)
+    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize, int $websiteId, int $roleId)
     {
-        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize','websiteId','roleId'));
+        return $this->__request(__FUNCTION__, compact('keyword', 'page', 'pageSize', 'websiteId', 'roleId'));
     }
 
     /**
@@ -180,7 +180,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteRoleUser(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,compact('id', 'data'));
+        return $this->__request(__FUNCTION__, compact('id', 'data'));
     }
 
     /**
@@ -189,7 +189,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteRoleUser(int $id)
     {
-        return $this->__request(__FUNCTION__,compact('id'));
+        return $this->__request(__FUNCTION__, compact('id'));
     }
 
     /**
@@ -220,7 +220,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-     /**
+    /**
      * @param array $data
      * @return array|mixed
      */
@@ -418,10 +418,10 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-    
 
 
-    
+
+
     /**
      * @param array $data
      * @return mixed
@@ -430,7 +430,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -446,7 +446,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -454,7 +454,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -462,7 +462,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -478,7 +478,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    
+
 
     //20250212  网站标识
     public function addWebsiteGroup(array $data)
@@ -537,7 +537,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
 
 
     // --自助建站-----------fr----------------------start
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -545,15 +545,15 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function checkWebsiteBuild(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
-    } 
-     /**
+    }
+    /**
      * @param array $data
      * @return mixed
      */
@@ -561,14 +561,14 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function upWebsiteTemplateintel(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
-    }   
+    }
     /**
      *@param array $data
      * @return mixed
@@ -615,7 +615,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     /**
      * @param array $data
      * @return mixed
-    */
+     */
     public function getWebFootInfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -631,7 +631,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     /**
      * @param array $data
      * @return mixed
-    */
+     */
     public function upWebFootInfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -670,7 +670,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsiteRoute(array $data)
     {
-        return $this->__request(__FUNCTION__, $data); 
+        return $this->__request(__FUNCTION__, $data);
     }
     /**
      * @param array $data
@@ -681,7 +681,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-   /*
+    /*
     * @param array $data
     * @return mixed
     */
@@ -711,7 +711,8 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return array|mixed
      */
-    public function getFooterContentList(array $data){
+    public function getFooterContentList(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
     public function addStaticResource(array $data)
@@ -721,7 +722,8 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     /**
      * @param array $data
      */
-    public function getFooterContentInfo(array $data){
+    public function getFooterContentInfo(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
     /**
@@ -841,16 +843,16 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function upWebsiteStatus(array $data) 
-    { 
+    public function upWebsiteStatus(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
     /**
      * @param array $data
      * @return mixed
      */
-    public function updateWebsiteStatus(array $data) 
-    { 
+    public function updateWebsiteStatus(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -862,6 +864,8 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
-
-}
+    public function checkPath(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+}

+ 35 - 35
app/JsonRpc/WebsiteServiceInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\JsonRpc;
 
 interface WebsiteServiceInterface
@@ -180,7 +181,7 @@ interface WebsiteServiceInterface
      */
     public function getAdminIndex(array $data);
 
-    
+
 
     /**
      * @param array $data
@@ -339,7 +340,7 @@ interface WebsiteServiceInterface
      */
     public function upWebsiteCategorySort(array $data);
 
-    
+
 
     // --自助建站-----------fr----------------------start
     /**
@@ -349,11 +350,11 @@ interface WebsiteServiceInterface
      */
     public function getWebsiteintel(array $data);
     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
-   public function checkWebsiteBuild(array $data);
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function checkWebsiteBuild(array $data);
     /**
      * @param array $data
      * @return mixed
@@ -367,34 +368,34 @@ interface WebsiteServiceInterface
      */
     public function upWebsiteTemplateintel(array $data);
     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getAllTemplateClass(array $data);
-     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /** 
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getWebsiteTemplateList(array $data);
-   /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /** 
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function addWebsiteTemplateclassintel(array $data);
     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getWebsiteTemplateclassintel(array $data);
     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getWebsiteSectorList(array $data);
     // --自助建站-----------fr----------------------end
 
@@ -402,13 +403,13 @@ interface WebsiteServiceInterface
     /**
      * @param array $data
      * @return mixed
-    */
+     */
     public function getWebFootInfo(array $data);
     /**
      * @param array $data
      * @return mixed
      *
-    */
+     */
     public function addWebFootInfo(array $data);
     /**
      * @param array $data
@@ -527,18 +528,17 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return mixed
      */
-    public function updateWebsiteStatus(array $data);  
+    public function updateWebsiteStatus(array $data);
     /**
      * @param array $data
      * @return mixed
      */
-    public function upWebsiteStatus(array $data);  
+    public function upWebsiteStatus(array $data);
 
     /**
      * @param array $data
      * @return mixed
      */
     public function delWebsiteUrl(array $data);
-
-
+    public function checkPath(array $data);
 }

+ 23 - 17
config/api/website.php

@@ -1,12 +1,14 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 use App\Controller\WebsiteController;
 use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
+
 Router::addGroup(
-    '/website', function () {
+    '/website',
+    function () {
         //添加网站
         Router::post('/addWebsite', [WebsiteController::class, 'addWebsite']);
         //获取网站列表
@@ -34,7 +36,7 @@ Router::addGroup(
         Router::get('/getWebsiteRoleUserList', [WebsiteController::class, 'getWebsiteRoleUserList']);
         Router::post('/createWebsiteRoleUser', [WebsiteController::class, 'createWebsiteRoleUser']);
         Router::post('/delWebsiteRoleUser', [WebsiteController::class, 'delWebsiteRoleUser']);
-        
+
         //获取分类下模板列表
         Router::get('/getTemplate', [WebsiteController::class, 'getTemplate']);
         //获取分类下模板列表
@@ -97,6 +99,9 @@ Router::addGroup(
         Router::post('/getWebsiteGroupList', [WebsiteController::class, 'getWebsiteGroupList']);
         //获取网站下导航列表
         Router::post('/getWebsiteNavList', [WebsiteController::class, 'getWebsiteNavList']);
+        //checkPath 检测路径是否存在
+        Router::post('/checkPath', [WebsiteController::class, 'checkPath']);
+
 
         // 20250307 根据网站标识获取导航池
         Router::post('/getWebsiteNavPool', [WebsiteController::class, 'getWebsiteNavPool']);
@@ -168,7 +173,8 @@ Router::addGroup(
 );
 // --自助建站-----------fr----------------------start
 Router::addGroup(
-    '/website', function () {
+    '/website',
+    function () {
         // 获取职能部门
         Router::post('/selectWebsiteDepartment', [WebsiteController::class, 'selectWebsiteDepartment']);
         // 获取行政区划
@@ -178,18 +184,18 @@ Router::addGroup(
 // --自助建站-----------fr----------------------end
 
 Router::addGroup(
-    '/web', function () {
-    //获取网站基本信息
-    Router::post('/getSiteInfo', [WebsiteController::class, 'getSiteInfo']);
-    //获取网站导航池
-    Router::get('/getSiteCategory', [WebsiteController::class, 'getSiteCategory']);
-    //获取底部导航
-    Router::get('/getFooterCategoryList', [WebsiteController::class, 'getFooterCategoryList']);
-    //获取底部导航详情
-    Router::get('/getFooterContentList', [WebsiteController::class, 'getFooterContentList']);
-    //底部导航详情页
-    Router::get('/getFooterContentInfo', [WebsiteController::class, 'getFooterContentInfo']);
-
-},
+    '/web',
+    function () {
+        //获取网站基本信息
+        Router::post('/getSiteInfo', [WebsiteController::class, 'getSiteInfo']);
+        //获取网站导航池
+        Router::get('/getSiteCategory', [WebsiteController::class, 'getSiteCategory']);
+        //获取底部导航
+        Router::get('/getFooterCategoryList', [WebsiteController::class, 'getFooterCategoryList']);
+        //获取底部导航详情
+        Router::get('/getFooterContentList', [WebsiteController::class, 'getFooterContentList']);
+        //底部导航详情页
+        Router::get('/getFooterContentInfo', [WebsiteController::class, 'getFooterContentInfo']);
+    },
     ['middleware' => [\App\Middleware\Auth\WebMiddleware::class]]
 );