Merge branch '20250814_randomweb_fr'

app/Controller/PublicController.php

@@ -2541,7 +2541,35 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getSectorType($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
-    
+    /**
+     * 自助建站-获取组件类型
+     * @return array
+     */
+    public function randomWebTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required|int',
+                'template_id' => 'required|int',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.int' => '网站id必须为整数',
+                'template_id.required' => '模板id不能为空',
+                'template_id.int' => '模板id必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->randomWebTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+
 
     
      

app/JsonRpc/PublicRpcService.php

@@ -512,6 +512,13 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-随机获取模板
+     */
+    public function randomWebTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
 
 

app/JsonRpc/PublicRpcServiceInterface.php

@@ -245,6 +245,8 @@ interface PublicRpcServiceInterface
     public function updateComponentImg(array $data);
     //自助建站-获取通栏类型
     public function getSectorType(array $data);
+    //自助建站-随机获取模板
+    public function randomWebTemplate(array $data);
 
 
 

config/api/public.php

@@ -143,6 +143,8 @@ Router::addGroup(
 
         // 获取所有通栏分类
         Router::post('/getSectorType', [PublicController::class, 'getSectorType']);
+        // 随机模板
+        Router::post('/randomWebTemplate', [PublicController::class, 'randomWebTemplate']);
 
     },
     ['middleware' => [FooMiddleware::class]]