自助建站-获取风格列表、添加风格、修改风格、删除风格搬到public中

app/Controller/PublicController.php

@@ -631,33 +631,123 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
     }
     /**
-     * 获取风格名称
+     * 获取风格
+     * @return void
+     */
+    public function getTemplateClassList()
+    {
+        $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 Result::success($requireData);
+        $result = $this->publicServiceClient->getTemplateClassList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 添加风格
+     * @return void
+     */
+    public function addTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+                'keyword' =>'required',
+            ],
+            [
+                'name.required' => '风格名称不能为空',
+                'keyword.required' => '风格关键词不能为空'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->addTemplateClass($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 更新风格
      * @return array
      */
-    public function getTemplateClass()
+    public function upTemplateClass()
     {
         $requireData = $this->request->all();
-        // 参数验证
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                // 'type' => 'required|integer',
+                'name' => 'required',
+                'id' => 'required',
+                'keyword' =>'required',
             ],
             [
-                // 'type.required' => 'type 不能为空',
-                // 'type.integer' => 'type 必须是整数',
+                'name.required' => '风格名称不能为空',
+                'id.required' => '风格ID不能为空',
+                'keyword.required' => '风格关键词不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->upTemplateClass($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 删除风格
+     * @return array
+     */
+    public function delTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'id.required' => '风格id不能为空'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->delTemplateClass($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取风格下拉框
+     * @return void
+     */
+    public function getTemplateClass()
+    {
+        $requireData = $this->request->all();
         $result = $this->publicServiceClient->getTemplateClass($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取风格列表
+     * 获取皮肤列表
      * @return array
      */
     public function getTemplateList()

app/Controller/WebsiteController.php

@@ -1295,112 +1295,7 @@ class WebsiteController extends AbstractController
         }
     }
 
-    /**
-     * 获取风格
-     * @return void
-     */
-    public function getTemplateClass()
-    {
-        $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 Result::success($requireData);
-        $result = $this->websiteServiceClient->getTemplateClass($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-
-    /**
-     * 添加风格
-     * @return void
-     */
-    public function addTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'name' => 'required',
-                'keyword' =>'required',
-            ],
-            [
-                'name.required' => '风格名称不能为空',
-                'keyword.required' => '风格关键词不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $result = $this->websiteServiceClient->addTemplateClass($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-
-    /**
-     * 更新风格
-     * @return array
-     */
-    public function upTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'name' => 'required',
-                'id' => 'required',
-                'keyword' =>'required',
-            ],
-            [
-                'name.required' => '风格名称不能为空',
-                'id.required' => '风格ID不能为空',
-                'keyword.required' => '风格关键词不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $result = $this->websiteServiceClient->upTemplateClass($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-
-    /**
-     * 删除风格
-     * @return array
-     */
-    public function delTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'id' => 'required'
-            ],
-            [
-                'id.required' => '风格id不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $result = $this->websiteServiceClient->delTemplateClass($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
+    
 
     /**
      * 获取分类下的模板

app/JsonRpc/PublicRpcService.php

@@ -217,10 +217,48 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
     public function getTemplateClass(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getTemplateClassList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function upTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function delTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
     public function getTemplateList(array $data)
     {

app/JsonRpc/PublicRpcServiceInterface.php

@@ -130,7 +130,34 @@ interface PublicRpcServiceInterface
      */
     public function modZhinengbumen(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
     public function getTemplateClass(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getTemplateClassList(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplateClass(array $data);
     public function getTemplateList(array $data);
     public function getTemplateInfo(array $data);
     public function addTemplate(array $data);

app/JsonRpc/WebsiteService.php

@@ -272,41 +272,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function getTemplateClass(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function addTemplateClass(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function upTemplateClass(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function delTemplateClass(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
 
     /**
      * @param array $data

app/JsonRpc/WebsiteServiceInterface.php

@@ -180,29 +180,7 @@ interface WebsiteServiceInterface
      */
     public function getAdminIndex(array $data);
 
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getTemplateClass(array $data);
-
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addTemplateClass(array $data);
-
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upTemplateClass(array $data);
-
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delTemplateClass(array $data);
+    
 
     /**
      * @param array $data

config/api/public.php

@@ -45,6 +45,16 @@ Router::addGroup(
         Router::post('/modZhinengbumen', [PublicController::class, 'modZhinengbumen']);
         Router::post('/getPidZhinengbumen', [PublicController::class, 'getPidZhinengbumen']);
 
+        // 风格
+        //获取风格列表
+        Router::get('/getTemplateClass', [PublicController::class, 'getTemplateClass']);
+        //添加风格
+        Router::post('/addTemplateClass', [PublicController::class, 'addTemplateClass']);
+        //更新风格
+        Router::post('/upTemplateClass', [PublicController::class, 'upTemplateClass']);
+        //删除风格
+        Router::post('/delTemplateClass', [PublicController::class, 'delTemplateClass']);
+
         //获取风格名称
         Router::post('/getTemplateClass', [PublicController::class, 'getTemplateClass']);
         //获取风格列表

config/api/website.php

@@ -34,14 +34,7 @@ Router::addGroup(
         Router::get('/getWebsiteRoleUserList', [WebsiteController::class, 'getWebsiteRoleUserList']);
         Router::post('/createWebsiteRoleUser', [WebsiteController::class, 'createWebsiteRoleUser']);
         Router::post('/delWebsiteRoleUser', [WebsiteController::class, 'delWebsiteRoleUser']);
-        //获取模板分类
-        Router::get('/getTemplateClass', [WebsiteController::class, 'getTemplateClass']);
-        //添加模板分类
-        Router::post('/addTemplateClass', [WebsiteController::class, 'addTemplateClass']);
-        //更新模板分类
-        Router::post('/upTemplateClass', [WebsiteController::class, 'upTemplateClass']);
-        //删除模板分类
-        Router::post('/delTemplateClass', [WebsiteController::class, 'delTemplateClass']);
+        
         //获取分类下模板列表
         Router::get('/getTemplate', [WebsiteController::class, 'getTemplate']);
         //获取分类下模板列表