Merge branch '20241216_fr_diyweb' into dev

app/Controller/FooterController.php

@@ -37,10 +37,12 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'website_name' =>'required'
+                    'website_name' =>'required|string|max:20',
                 ],
                 [
-                    'website_name.required' => '网站名称不能为空'
+                    'website_name.required' => '网站名称不能为空',
+                    'website_name.string' => '网站名称必须是字符串',
+                    'website_name.max' => '网站名称不能超过20个字符',
                 ]
             );
             if ($validator->fails()){
@@ -53,10 +55,12 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'name' =>'required'
+                    'name' =>'required|string|max:20'
                 ],
                 [
-                    'name.required' => '底部导航名称不能为空'
+                    'name.required' => '底部导航名称不能为空',
+                    'name.string' => '底部导航名称必须是字符串',
+                    'name.max' => '底部导航名称不能超过20个字符',
                 ]
             );
             if ($validator->fails()){
@@ -68,12 +72,14 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'page' =>'required',
-                'pageSize' =>'required'
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer'
             ],
             [
                 'page.required' => '第几页不能为空',
-                'pageSize.required' => '每页显示数量不能为空'
+                'page.integer' => '第几页必须是整数',
+                'pageSize.required' => '每页显示数量不能为空',
+                'pageSize.integer' => '每页显示数量必须是整数'
             ]
         );
         if ($validator->fails()){
@@ -102,14 +108,19 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'website_id' =>'required',
-                    'name' =>'required',
-                    'type' =>'required'
+                    'website_id' =>'required|integer',
+                    'name' =>'required|string|max:20',
+                    'type' =>'required|integer|in:0,1'
                 ],
                 [
                     'website_id.required' => '网站id不能为空',
+                    'website_id.integer' => '网站id必须是整数',
                     'name.required' => '底部导航名称不能为空',
-                    'type.required' => '底部导航类型不能为空'
+                    'name.string' => '底部导航名称必须是字符串',
+                    'name.max' => '底部导航名称不能超过20个字符',
+                    'type.required' => '底部导航类型不能为空',
+                    'type.integer' => '底部导航类型必须是整数',
+                    'type.in' => '底部导航类型必须是0或1'
                 ]
             );
             if ($validator->fails()){
@@ -137,24 +148,27 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required'
+                'id' =>'required|integer'
             ],
             [
-                'id.required' => '底部导航id不能为空'
+                'id.required' => '底部导航id不能为空',
+                'id.integer' => '底部导航id必须是整数'
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['name'])){
+        if(isset($requireData['name']) || isset($requireData['website_id'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'name' =>'required' 
+                    'name' =>'required|string|max:20' 
                 ],
                 [
-                    'name.required' => '底部导航名称不能为空'
+                    'name.required' => '底部导航名称不能为空',
+                    'name.string' => '底部导航名称必须是字符串',
+                    'name.max' => '底部导航名称不能超过20个字符'
                 ]
             );
             if ($validator->fails()){
@@ -167,10 +181,11 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'website_id' =>'required'
+                    'website_id' =>'required|integer'
                 ],
                 [
-                    'website_id.required' => '网站id不能为空'
+                    'website_id.required' => '网站id不能为空',
+                    'website_id.integer' => '网站id必须是整数'
                 ]
             );
             if ($validator->fails()){
@@ -199,10 +214,11 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required'
+                'id' =>'required|integer'
             ],
             [
-                'id.required' => '底部导航id不能为空'
+                'id.required' => '底部导航id不能为空',
+                'id.integer' => '底部导航id必须是整数'
             ]
         );
         $data['id'] = $requireData['id'];
@@ -227,19 +243,23 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'type' =>'required',
-                'fcat_id' =>'required',
-                'con_title' =>'required',
-                'content' =>'required'
+                'type' =>'required|integer|in:0,1',
+                'fcat_id' =>'required|integer',
+                'con_title' =>'required|string',
+                'content' =>'required|string'
             ],
             [
                 'type.required' => '底部导航类型不能为空',
+                'type.integer' => '底部导航类型必须是整数',
+                'type.in' => '底部导航类型必须是0或1',
                 'fcat_id.required' => '底部导航id不能为空',
+                'fcat_id.integer' => '底部导航id必须是整数',
                 'con_title.required' => '内容标题不能为空',
-                'content.required' => '内容不能为空'
+                'con_title.string' => '内容标题必须是字符串',
+                'content.required' => '内容不能为空',
+                'content.string' => '内容必须是字符串'
             ]
         );
-        
         if($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
@@ -248,23 +268,24 @@ class FooterController extends AbstractController
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['con_title'] = $requireData['con_title'];
         $data['content'] = $requireData['content'];
-        if($data['type'] == 1){
+        if(isset($requireData['list_title'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'list_title' =>'required'
+                    'list_title' =>'required|string'
                 ],
                 [
-                    'list_title.required' => '列表标题不能为空'
+                    'list_title.required' => '列表标题不能为空',
+                    'list_title.string' => '列表标题必须是字符串'
                 ]
             );
-            if ($validator->fails()){
+            if($validator->fails()){
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);
             }
             $data['list_title'] = $requireData['list_title'];
         }
-        // var_dump($data);
+        // return Result::success($data);
         $result = $this->footerServiceClient->addFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -282,14 +303,17 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'fcat_id' =>'required',
-                'page' =>'required',
-                'pageSize' =>'required'
+                'fcat_id' =>'required|integer',
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer'
             ],
             [
                 'fcat_id.required' => '底部导航id不能为空',
+                'fcat_id.integer' => '底部导航id必须是整数',
                 'page.required' => '第几页不能为空',
-                'pageSize.required' => '每页显示数量不能为空'
+                'page.integer' => '第几页必须是整数',
+                'pageSize.required' => '每页显示数量不能为空',
+                'pageSize.integer' => '每页显示数量必须是整数'
             ]
         );
         if($validator->fails()){
@@ -301,10 +325,12 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'list_title' =>'required'
+                    'list_title' =>'required|string|max:30'
                 ],
                 [
-                    'list_title.required' => '列表标题不能为空'
+                    'list_title.required' => '列表标题不能为空',
+                    'list_title.string' => '列表标题必须是字符串',
+                    'list_title.max' => '列表标题不能超过30个字符'
                 ]
             );
             
@@ -318,10 +344,11 @@ class FooterController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'con_title' =>'required'
+                    'con_title' =>'required|string'
                 ],
                 [
-                    'con_title.required' => '内容标题不能为空'
+                    'con_title.required' => '内容标题不能为空',
+                    'con_title.string' => '内容标题必须是字符串'
                 ]
             );
             if($validator->fails()){
@@ -351,10 +378,11 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required'
+                'id' =>'required|integer'
             ],
             [
-                'id.required' => '底部导航内容id不能为空'
+                'id.required' => '底部导航内容id不能为空',
+                'id.integer' => '底部导航内容id必须是整数'
             ]
         );
         if($validator->fails()){
@@ -384,16 +412,21 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required',
-                'type' =>'required',
-                'con_title' =>'required',
-                'content' =>'required'
+                'id' =>'required|integer',
+                'type' =>'required|integer|in:0,1',
+                'con_title' =>'required|string',
+                'content' =>'required|string'
             ],
             [
                 'id.required' => '底部导航内容id不能为空',
+                'id.integer' => '底部导航内容id必须是整数',
                 'type.required' => '底部导航类型不能为空',
+                'type.integer' => '底部导航类型必须是整数',
+                'type.in' => '底部导航类型必须是0或1',
                 'con_title.required' => '内容标题不能为空',
-                'content.required' => '内容不能为空'
+                'con_title.string' => '内容标题必须是字符串',
+                'content.required' => '内容不能为空',
+                'content.string' => '内容必须是字符串'
             ]
         );
         if($validator->fails()){
@@ -404,14 +437,15 @@ class FooterController extends AbstractController
         $data['type'] = $requireData['type'];
         $data['con_title'] = $requireData['con_title'];
         $data['content'] = $requireData['content'];
-        if($data['type'] == 1){
+        if(isset($requireData['list_title'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'list_title' =>'required'
+                    'list_title' =>'required|string'
                 ],
                 [
-                    'list_title.required' => '列表标题不能为空'
+                    'list_title.required' => '列表标题不能为空',
+                    'list_title.string' => '列表标题必须是字符串'
                 ]
             );
             if ($validator->fails()){
@@ -438,10 +472,11 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required'
+                'id' =>'required|integer'
             ],
             [
-                'id.required' => '底部导航id不能为空'
+                'id.required' => '底部导航id不能为空',
+                'id.integer' => '底部导航id必须是整数'
             ]
         );
         if($validator->fails()){