完成搭建网站修-搜索及获取皮肤列表、选择皮肤的接口完善修改皮肤、添加皮肤的接口

app/Controller/PublicController.php

@@ -1152,32 +1152,7 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->updateComponent($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    public function getWebsiteTemplateList()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'page' => 'required|integer|min:1',
-                'page_size' => 'required|integer|min:1',
-            ],
-            [
-                'page.required' => 'page 不能为空',
-                'page.integer' => 'page 必须是整数',
-                'page.min' => 'page 必须大于等于 1',
-                'page_size.required' => 'page_size 不能为空',
-                'page_size.integer' => 'page_size 必须是整数',
-                'page_size.min' => 'page_size 必须大于等于 1',
-            ]
-        );
-         if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->getWebsiteTemplateList($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
+   
 
     public function getWebsiteTemplateInfo()
     {
@@ -1574,5 +1549,111 @@ class PublicController extends AbstractController
             $data
         );
     }
+    /**
+     * 自助建站-1.选择页面回显相关数据
+     * @return array
+     */
+    public function getWebPageType()
+    {
+        $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->publicServiceClient->getWebPageType($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-2.选择页面类型
+     * @return array
+     */
+    public function addWebPageType()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'is_search' =>'required',
+                'website_id' =>'required',
+            ],
+            [
+                'is_search.required' => '是否带搜索页面',
+                'website_id.required' => '网站id 不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->addWebPageType($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-3.皮肤列表
+     * @return array
+     */
+    public function getWebsiteTemplateList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'required|integer|min:1',
+                'page_size' => 'required|integer|min:1',
+                ''
+            ],
+            [
+                'page.required' => 'page 不能为空',
+                'page.integer' => 'page 必须是整数',
+                'page.min' => 'page 必须大于等于 1',
+                'page_size.required' => 'page_size 不能为空',
+                'page_size.integer' => 'page_size 必须是整数',
+                'page_size.min' => 'page_size 必须大于等于 1',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getWebsiteTemplateList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-4.添加网站
+     * @return array
+     */
+    public function chooseWebsiteTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'template_id' =>'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'template_id.required' => '皮肤id不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->chooseWebsiteTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/JsonRpc/PublicRpcService.php

@@ -370,4 +370,16 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getWebPageType(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addWebPageType(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function chooseWebsiteTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -197,4 +197,12 @@ interface PublicRpcServiceInterface
     public function getWeatherInfo(array $data);
     public function getCalendar(array $data);
 
+    // --------------自助建站---最新-----fr
+    // 1.选择页面类型回显
+    public function getWebPageType(array $data);
+    // 2.选择页面类型
+    public function addWebPageType(array $data);
+    // 4.选择皮肤
+    public function chooseWebsiteTemplate(array $data);
+
 }

config/api/public.php

@@ -76,7 +76,6 @@ Router::addGroup(
         Router::post('/updateComponent', [PublicController::class, 'updateComponent']);
         Router::post('/getComponentInfo', [PublicController::class, 'getComponentInfo']);
         //获取搭建列表
-        Router::post('/getWebsiteTemplateList', [PublicController::class, 'getWebsiteTemplateList']);
         Router::post('/getWebsiteTemplateInfo', [PublicController::class, 'getWebsiteTemplateInfo']);
 
         //黑名单列表-违禁词
@@ -87,6 +86,15 @@ Router::addGroup(
         Router::post('/delBlackWord', [PublicController::class, 'delBlackWord']);
         //修改黑名单-违禁词
         Router::post('/upBlackWord', [PublicController::class, 'upBlackWord']);
+
+        // 自助建站-1.选择页面回显相关数据
+        Router::get('/getWebPageType', [PublicController::class, 'getWebPageType']);
+        // 自助建站-2.选择页面
+        Router::post('/addWebPageType', [PublicController::class, 'addWebPageType']);
+        // 自助建站-3.皮肤列表
+        Router::post('/getWebsiteTemplateList', [PublicController::class, 'getWebsiteTemplateList']);
+        // 自助建站-4.选择皮肤
+        Router::post('/chooseWebsiteTemplate', [PublicController::class, 'chooseWebsiteTemplate']);
     },
     ['middleware' => [FooMiddleware::class]]
 );