Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/AdController.php

@@ -54,7 +54,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->createAd($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -127,7 +127,7 @@ class AdController extends AbstractController
 
             }
         }
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function updateAd()
@@ -150,7 +150,7 @@ class AdController extends AbstractController
         }
         $requireData = $this->request->all();
         $result = $this->adServiceClient->updateAd($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function delAd()
@@ -171,7 +171,7 @@ class AdController extends AbstractController
         }
         $result = $this->adServiceClient->delAd($requireData);
         var_dump($result);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -206,7 +206,7 @@ class AdController extends AbstractController
                 $result['data']['rows'][$k]['status_name'] = $statusName[$v['status']];
             }
         }
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -242,7 +242,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->createAdPlace($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function updateAdPlace()
@@ -276,7 +276,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->updateAdPlace($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -326,4 +326,28 @@ class AdController extends AbstractController
         $result = $this->adServiceClient->getAdPlaceInfo(intval($requireData['id']));
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * 孪生站添加广告位
+     * @return array
+     */
+    public function addTwinAdPlace()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'adPlaceList' => 'required', //广告位名称
+            ],
+            [
+                'adPlaceList.required' => '广告位列表不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->adServiceClient->addTwinAdPlace($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/Controller/FormController.php

@@ -0,0 +1,150 @@
+<?php
+
+declare(strict_types=1);
+namespace App\Controller;
+
+use App\JsonRpc\FormServiceInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use App\Constants\ErrorCode;
+use Hyperf\Context\Context;
+use App\Service\ImportQueueService;
+/**
+ * ClassFormController
+ * @package App\Controller
+ */
+
+class FormController extends AbstractController
+    {
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
+
+    #[Inject]
+    protected ImportQueueService $Iservice;
+
+    /**
+     * @var FormServiceInterface
+     */
+    #[Inject]
+    private $formServiceClient;
+ 
+    /**
+     * 添加网站
+     * @return array
+     */
+    public function addGlobalTable()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id'=> 'required',
+                'name'=> 'required',
+                'table'=> 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'name.required' => '表单名称不能为空',
+                'table.required' => '表单表名不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+
+        
+        $result = $this->formServiceClient->addGlobalTable($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 全局表单列表
+     * @return array
+     */
+    public function getGlobalTableList()    
+    {
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page'=> 'required',
+                'pageSize'=> 'required',
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->getGlobalTableList($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 修改全局表单
+     */
+    public function upGlobalTable()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id'=> 'required',
+                'name'=> 'required',
+                'table'=> 'required',
+                'id'=> 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'name.required' => '表单名称不能为空',
+                'table.required' => '表单表名不能为空',
+                'id.required' => 'id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->upGlobalTable($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /** 
+     * 删除全局表单
+    */
+    public function delGlobalTable()
+    {
+        $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->formServiceClient->delGlobalTable($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+}

app/Controller/NewsController.php

@@ -1258,7 +1258,7 @@ class NewsController extends AbstractController
             'business_name' => 'required',
             'company_hy_id' => 'required|integer',
             'company_size' => 'required|integer',
-            'company_nature' => 'required|integer',
+            // 'company_nature' =>'required|integer',
             'introduction' => 'required',
             'real_name' => 'required',
             // 将联系电话的验证规则修改为最少十一位整数
@@ -1275,8 +1275,8 @@ class NewsController extends AbstractController
             'company_hy_id.integer' => '所属行业必须是整数',
             'company_size.required' => '公司规模不能为空',
             'company_size.integer' => '公司规模必须是整数',
-            'company_nature.required' => '公司性质不能为空',
-            'company_nature.integer' => '公司性质必须是整数',
+            // 'company_nature.required' => '公司性质不能为空',
+            // 'company_nature.integer' => '公司性质必须是整数',
             'introduction.required' => '公司简介不能为空',
             'real_name.required' => '联系人不能为空',
             'mobile.required' => '联系电话不能为空',
@@ -1355,7 +1355,7 @@ class NewsController extends AbstractController
             'business_name' => 'required',
             'company_hy_id' => 'required',
             'company_size' => 'required',
-            'company_nature' => 'required',
+            // 'company_nature' =>'required',
             'introduction' => 'required',
             'real_name' => 'required',
             // 将联系电话的验证规则修改为最少十一位整数
@@ -1368,7 +1368,7 @@ class NewsController extends AbstractController
             'business_name.required' => '公司名称不能为空',
             'company_hy_id.required' => '所属行业不能为空',
             'company_size.required' => '公司规模不能为空',
-            'company_nature.required' => '公司性质不能为空',
+            // 'company_nature.required' => '公司性质不能为空',
             'introduction.required' => '公司简介不能为空',
             'real_name.required' => '联系人不能为空',
             'mobile.required' => '联系电话不能为空',

app/Controller/PublicController.php

@@ -631,33 +631,125 @@ 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',
+                'class_id' =>'required',
+            ],
+            [
+                'name.required' => '风格名称不能为空',
+                'keyword.required' => '风格关键词不能为空',
+                'class_id' =>'风格编号不能为空'
+            ]
+        );
+        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()
@@ -670,6 +762,7 @@ class PublicController extends AbstractController
                 'page' => 'required|integer|min:1',
                 'page_size' => 'required|integer|min:1',
                 'template_name' => 'string|nullable',
+                'template_class_id' =>'integer|nullable',
             ],
             [
                 'page.required' => 'page 不能为空',
@@ -679,6 +772,7 @@ class PublicController extends AbstractController
                 'page_size.integer' => 'page_size 必须是整数',
                 'page_size.min' => 'page_size 必须大于等于 1',
                 'template_name.string' => 'template_name 必须是字符串',
+                'template_class_id.integer' => 'template_class_id 必须是整数',
             ]
         );
         if ($validator->fails()) {
@@ -690,7 +784,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
     /**
-     * 获取风格详情
+     * 获取皮肤详情
      * @return array
      */
     public function getTemplateInfo()
@@ -715,7 +809,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
     /**
-     * 删除模板
+     * 删除皮肤
      */
     
      public function delTemplate()
@@ -743,7 +837,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 更新模板
+     * 更新皮肤
      */
     public function updateTemplate()
     {
@@ -765,11 +859,11 @@ class PublicController extends AbstractController
        
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->updateTemplate($requireData);
-        var_dump($result,'1001010');
+        // var_dump($result,'1001010');
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 新增风格
+     * 新增皮肤
      */
     public function addTemplate()
     {
@@ -778,11 +872,15 @@ class PublicController extends AbstractController
             'template_name' => 'required',
             'template_class_id' => 'required',
             'template_img' => 'required',
+            'template_keyword' =>'required',
+            'template_id' =>'required',
         ],
         [   
-            'template_name.required' => '请输入模板名称',
-            'template_class_id.required' => '请选择模板分类',
-            'template_img.required' => '请上传模板图片',
+            'template_name.required' => '请输入皮肤名称',
+            'template_class_id.required' => '请选择风格分类',
+            'template_img.required' => '请上传皮肤图片',
+            'template_keyword.required' => '请输入皮肤关键词',
+            'template_id.required' => '请输入皮肤编号',
         ]
         );
         if ($validator->fails()) {
@@ -1054,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()
     {
@@ -1476,5 +1549,305 @@ 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',
+                'website_id' =>'required',
+            ],
+            [
+                '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',
+                'website_id.required' => '网站id 不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // return Result::success($requireData);
+        $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']);
+    }
+    /**
+     * 自助建站-5.保存到草稿箱
+     * @return array
+     */
+    public function saveWebsiteTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'template_data' =>'required',
+            ],
+            [
+                'website_id.required' => '网站名称不能为空',
+                'template_data.required' => '网站名称不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->saveWebsiteTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取企业列表
+     * @return array
+     */
+    public function getCompanyList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required',
+                'website_id' =>'nullable|integer',
+                'status' =>'nullable|integer',
+                'title' =>'nullable|string',
+                'ischeck' =>'required|integer',
+            ],
+            [
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页数量不能为空',
+                'website_id.integer' => '网站id必须是整数',
+                'status.integer' => '状态必须是整数',
+                'title.string' => '标题必须是字符串',
+                'ischeck.integer' => '是否审核必须是整数',
+                'ischeck.required' => '是否审核不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->getCompanyList($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加企业
+     * @return array
+     */
+    public function addCompany()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'title' =>'required',
+            ],
+            [
+                'website_id.required' => '网站名称不能为空',
+                'title.required' => '标题不能为空',
+
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->addCompany($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 修改企业
+     * @return array
+     */
+    public function upCompany()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'website_id' =>'required',
+                'cat_arr_id' =>'required',
+                'title' =>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'website_id.required' => '网站名称不能为空',
+                'cat_arr_id.required' => '栏目不能为空',
+                'title.required' => '标题不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->upCompany($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除企业
+     * @return array
+     */
+    public function delCompany()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+            ],
+            [
+                'id.required' => '网站名称不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->delCompany($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 审核企业
+     * @return array
+     */
+    public function checkCompany()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'status' =>'required',
+            ],
+            [
+                'id.required' => '网站名称不能为空',
+                'status.required' => '网站名称不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->checkCompany($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 企业详情
+     * @return array
+     */
+    public function getCompanyInfo()
+    {
+        $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);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->getCompanyInfo($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/Controller/WebController.php

@@ -757,6 +757,33 @@ class WebController extends AbstractController
         $result = $this->websiteServiceClient->getWebsiteFootAll($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * @return array
+     */
+    public function getAdminWebsiteFootAll()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required|integer',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.integer' => '网站id必须为整数',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['link_textnum'] = 100;
+        $requireData['link_imgnum'] = 12;
+        $requireData['link_footnum'] = 4;
+        $result = $this->websiteServiceClient->getWebsiteFootAll($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
     /*
      * 获取网站顶部信息
      * 
@@ -1187,19 +1214,81 @@ class WebController extends AbstractController
      *
      * */
     public function checkWebsiteRoute()
+    {
+        $requireData = $this->request->all();
+//        $validator = $this->validationFactory->make(
+//            $requireData,
+//            [
+//                'last_route' =>'required|string',
+//                'all_route' =>'required|string',
+//            ],
+//            [
+//                'last_route.required' => 'last_route不能为空',
+//                'last_route.string' => 'last_route必须为字符串',
+//                'all_route.required' => 'all_route不能为空',
+//                'all_route.string' => 'all_route必须为字符串',
+//            ]
+//        );
+//        if ($validator->fails()){
+//            $errorMessage = $validator->errors()->first();
+//            return Result::error($errorMessage);
+//        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        // return Result::success($requireData);
+        $result = $this->newsServiceClient->checkWebsiteRoute($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+
+    /**
+     * 贴身宝贝
+     * @return array
+     */
+    public function getWebsiteTsbb()
+    {
+        $requireData = $this->request->all();
+        var_dump("====:",$requireData);
+        $requireData['website_id'] =  Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteTsbb($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 列表数据
+     */
+    public function getWebsiteTsbbList()
+    {
+        $requireData = $this->request->all();
+        var_dump("====:",$requireData);
+        $requireData['website_id'] =  Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteTsbbList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 详情页
+     */
+    public function getWebsiteTsbbDetail()
+    {
+        $requireData = $this->request->all();
+        var_dump("====:", $requireData);
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteTsbbDetail($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /*
+     *  c端  获取商城首页-根据栏目id
+     *
+     * */
+    public function getWebsiteCatidshop()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'last_route' =>'required|string',
-                'all_route' =>'required|string',
+                'catid' =>'required',
             ],
             [
-                'last_route.required' => 'last_route不能为空',
-                'last_route.string' => 'last_route必须为字符串',
-                'all_route.required' => 'all_route不能为空',
-                'all_route.string' => 'all_route必须为字符串',
+                'catid.required' => 'catid不能为空',
             ]
         );
         if ($validator->fails()){
@@ -1208,23 +1297,36 @@ class WebController extends AbstractController
         }
         $requireData['website_id'] =  Context::get("SiteId")?? 0;
         // return Result::success($requireData);
-        $result = $this->newsServiceClient->checkWebsiteRoute($requireData);
+        $result = $this->newsServiceClient->getWebsiteCatidshop($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
     /*
-     *  c端  获取商城首页-根据栏目id
-     *
-     * */
-    public function getWebsiteCatidshop()
+    *c端-招聘 职位分类
+    * @return array
+    */
+    public function getPositionList()
     {
+        $requireData = $this->request->all();
+        $result = $this->newsServiceClient->getPositionList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /*
+    *c端-招聘 职位列表
+    * @return array
+    */
+    public function getWebsiteLevelJob(){
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'catid' =>'required',
+                'job_level' =>'required|integer',
+                'pageSize' =>'required|integer',
             ],
             [
-                'catid.required' => 'catid不能为空',
+                'job_level.required' => '推荐等级不能为空',
+                'job_level.integer' => '推荐等级必须为整数',
+                'pageSize.required' => '每页数量不能为空',
+                'pageSize.integer' => '每页数量必须为整数',
             ]
         );
         if ($validator->fails()){
@@ -1232,8 +1334,20 @@ class WebController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['website_id'] =  Context::get("SiteId")?? 0;
-        // return Result::success($requireData);
-        $result = $this->newsServiceClient->getWebsiteCatidshop($requireData);
+        $result = $this->newsServiceClient->getWebsiteLevelJob($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 农网导航首页数据
+     * @return array
+     */
+    public function getWebsiteNwHomeList()
+    {
+        $requireData = $this->request->all();
+        var_dump("====:",$requireData);
+        $requireData['website_id'] =  Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteNwHomeList($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 }

app/Controller/WebsiteController.php

@@ -6,6 +6,7 @@ namespace App\Controller;
 
 use App\JsonRpc\WebsiteServiceInterface;
 use App\Tools\PublicData;
+use GrahamCampbell\ResultType\Success;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
@@ -14,6 +15,7 @@ use Hyperf\Context\Context;
 use Phper666\JWTAuth\JWT;
 use DateTime;
 use App\JsonRpc\UserServiceInterface;
+use PhpParser\Node\Stmt\Return_;
 
 /**
  * Class WebsiteController
@@ -75,7 +77,7 @@ class WebsiteController extends AbstractController
         $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id']) ? json_encode($requireData['website_column_arr_id']) : '';
         var_dump($requireData);
         $result = $this->websiteServiceClient->createWebsite($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -144,7 +146,7 @@ class WebsiteController extends AbstractController
         $requireData['website_column_id'] = isset($requireData['website_column_arr_id']) ? end($requireData['website_column_arr_id']) : '';
         $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id']) ? json_encode($requireData['website_column_arr_id']) : '';
         $result = $this->websiteServiceClient->updateWebsite((int)$requireData['id'], $requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -1293,102 +1295,7 @@ class WebsiteController extends AbstractController
         }
     }
 
-    /**
-     * 获取模板皮肤分类
-     * @return void
-     */
-    public function getTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $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'
-            ],
-            [
-                'name.required' => '模板类型不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->addTemplateClass($data);
-        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',
-            ],
-            [
-                'name.required' => '模板类型不能为空',
-                'name.id' => '模板类型ID不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'id' => $requireData['id'],
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->upTemplateClass($data);
-        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'
-            ],
-            [
-                'name.required' => '类型id不能为空'
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'id' => $requireData['id']
-        ];
-        $result = $this->websiteServiceClient->delTemplateClass($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
+    
 
     /**
      * 获取分类下的模板
@@ -2322,4 +2229,533 @@ class WebsiteController extends AbstractController
     }
     // --底部基础信息-----------fr----------------------end
 
+    /**
+     * 获取站点信息
+     * @return array
+     */
+    public function getSiteInfo()
+    {
+        $id = Context::get("SiteId");
+        $result = $this->websiteServiceClient->getWebsiteInfo(intval($id));
+        if($result['code']==200){
+            $result['data']['website_url'] = isset($result['data']['website_url']) && $result['data']['website_url']?json_decode($result['data']['website_url']):'';
+            $result['data']['website_column_arr_id'] = isset($result['data']['website_column_arr_id']) && $result['data']['website_column_arr_id']?json_decode($result['data']['website_column_arr_id']):'';
+            $result['data']['city_arr_id'] = isset($result['data']['city_arr_id']) && $result['data']['city_arr_id']?json_decode($result['data']['city_arr_id']):'';
+            return Result::success($result['data']);
+        }else{
+            return Result::error($result['message']);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getAdminSiteInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required|numeric'
+            ],
+            [
+                'website_id.required' => '网站id不能为空'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteInfo(intval($requireData['website_id']));
+        if($result['code']==200){
+            $result['data']['website_url'] = isset($result['data']['website_url']) && $result['data']['website_url']?json_decode($result['data']['website_url']):'';
+            $result['data']['website_column_arr_id'] = isset($result['data']['website_column_arr_id']) && $result['data']['website_column_arr_id']?json_decode($result['data']['website_column_arr_id']):'';
+            $result['data']['city_arr_id'] = isset($result['data']['city_arr_id']) && $result['data']['city_arr_id']?json_decode($result['data']['city_arr_id']):'';
+            return Result::success($result['data']);
+        }else{
+            return Result::error($result['message']);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getSiteCategory()
+    {
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->websiteServiceClient->getWebsiteAllCategory($requireData);
+        return $result['code']==200?Result::success(PublicData::buildCategoryTree($result['data'])):Result::error($result['message']);
+    }
+
+    /**
+     * @return array
+     */
+    public function getFooterCategoryList()
+    {
+        $requireData['website_id'] = Context::get("SiteId");
+        var_dump("ceshi:",$requireData);
+        $result = $this->websiteServiceClient->getFooterCategoryList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    // --自助建站-----------20250522fr----------------------start
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function getStaticResourceList(){
+        $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 $requireData;
+        $result = $this->websiteServiceClient->getStaticResourceList($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 底部导航详细内容
+     * @return array
+     */
+    public function getFooterContentInfo(){
+        $requireData = $this->request->all();
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'content_id' => 'required',
+                    ],
+                    [
+                        'content_id.required' => '内容id不能为空',
+                    ]
+                );
+                if ($validator->fails()){
+                    $errorMessage = $validator->errors()->first();
+                    return Result::error($errorMessage);
+                }
+        $result = $this->websiteServiceClient->getFooterContentInfo($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 底部导航详情页/列表页
+     * @return array
+     */
+    public function getFooterContentList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'fcat_id' => 'required',
+                'type' => 'required',
+            ],
+            [
+                'website_id.required' => '底部导航id',
+                'type.required' => '类型不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getFooterContentList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 添加静态资源
+     * @return array
+     */
+    public function addStaticResource()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'img_url' =>'required',
+                'img_size' =>'required',
+            ],
+            [
+                'img_url.required' => '图片地址不能为空',
+                'img_size.numeric' => '图片尺寸不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->addStaticResource($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除静态资源
+     * @return array
+     */
+    public function delStaticResource()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delStaticResource($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取尺寸列表
+     * @return array
+     */
+    public function getSizeList()
+    {
+        $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);
+        }
+        $result = $this->websiteServiceClient->getSizeList($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加尺寸
+     * @return array
+     */
+    public function addSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'width' =>'required|integer',
+                'height' =>'required|integer',
+            ],
+            [
+                'width.required' => '尺寸宽度不能为空',
+                'width.integer' => '尺寸宽度必须是整数类型',
+                'height.required' => '尺寸高度不能为空',
+                'height.integer' => '尺寸高度必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->addSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 修改尺寸
+     * @return array
+     */
+    public function upSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+               'width' =>'required|integer',
+               'height' =>'required|integer',
+            
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+               'width.required' => '尺寸宽度不能为空',
+               'width.integer' => '尺寸宽度必须是整数类型',
+               'height.required' => '尺寸高度不能为空',
+               'height.integer' => '尺寸高度必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除尺寸
+     * @return array
+     */
+    public function delSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取网站模板信息
+     * @return array
+     */
+    public function getSizeInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getSizeInfo($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+
+    }
+    // --自助建站-----------20250522fr----------------------end
+    /**
+     * 获取网站路由白名单列表
+     * @return array    
+     */
+    public function getWhiteRouterList(){
+        $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 $requireData;
+            $result = $this->websiteServiceClient->getWhiteRouterList($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加白名单
+     * @return array
+     */
+    public function addWhiteRouter(){
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'function_name' =>'required',
+                'router_url' =>'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'function_name.required' => '功能名称不能为空',
+                'router_url.required' => '路由地址不能为空',
+            ]
+
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->addWhiteRouter($requireData);    
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除白名单
+     * @return array
+     */
+    public function delWhiteRouter(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数类型',
+            ]   
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->delWhiteRouter($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取白名单信息
+     * @return array
+     */
+    public function getWhiteRouterInfo(){
+        $requireData = $this->request->all();       
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer'
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'id.integer' => '网站id必须是整数类型'
+            ]
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $result = $this->websiteServiceClient->getWhiteRouterInfo($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 修改白名单
+     * @return array
+     */
+    public function upWhiteRouter(){
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+                'website_id' =>'required',
+                'function_name' =>'required',
+                'router_url' =>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'website_id.required' => '网站id不能为空',
+                'function_name.required' => '功能名称不能为空',
+                'router_url.required' => '路由地址不能为空',
+            ]
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);    
+            }
+            $result = $this->websiteServiceClient->upWhiteRouter($requireData);
+            Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 克隆网站
+     * @return array
+     */
+    public function cloneWebsite()
+    {
+        $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->cloneWebsite($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取网站名称简称
+     * @return array
+     */
+    public function getWebsiteAdkey(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_name' =>'required',
+            ],
+            [
+                'website_name.required' => '网站名称不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteAdkey($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 静态资源-修改图片别名
+     * @return array
+     */
+    public function upStaticResource(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'img_alias' =>'required',
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'img_alias.required' => '网站名称简称不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upStaticResource($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }
+

app/JsonRpc/AdService.php

@@ -107,5 +107,14 @@ class AdService extends AbstractServiceClient implements AdServiceInterface
         return $this->__request(__FUNCTION__, compact('id'));
     }
 
+    /**
+     * @param int $id
+     * @return mixed
+     */
+    public function addTwinAdPlace(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 
 }

app/JsonRpc/AdServiceInterface.php

@@ -63,4 +63,10 @@ interface AdServiceInterface
      * @return mixed
      */
     public function getAdPlaceInfo(int $id);
+
+    /**
+     * @param int $id
+     * @return mixed
+     */
+    public function addTwinAdPlace(array $data);
 }

app/JsonRpc/FormService.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\JsonRpc;
+
+use Hyperf\RpcClient\AbstractServiceClient;
+use App\Model\GlobalTable;
+use App\Tools\Result;
+
+class FormService extends AbstractServiceClient implements FormServiceInterface
+{
+    /**
+     * 定义对应服务提供者的服务名称
+     * @var string
+     */
+    protected string $serviceName = 'FormService';
+    /**
+     * 定义对应服务提供者的服务协议
+     * @var string
+     */
+    protected string $protocol = 'jsonrpc-http';
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addGlobalTable(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getGlobalTableList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getGlobalTable(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function upGlobalTable(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function delGlobalTable(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+}

app/JsonRpc/FormServiceInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\JsonRpc;
+
+interface FormServiceInterface
+{
+    /**
+     * @param array $data
+     */
+    public function addGlobalTable(array $data);
+    /**
+     * @param array $data
+     */
+    public function getGlobalTableList(array $data);
+    /**
+     * @param array $data
+     */
+    public function getGlobalTable(array $data);
+    /**
+     * @param array $data
+     */
+    public function upGlobalTable(array $data);
+    /**
+     * @param array $data
+     */
+    public function delGlobalTable(array $data);
+    
+}

app/JsonRpc/NewsService.php

@@ -519,6 +519,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteLevelJob(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed
@@ -718,4 +726,49 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteTsbb(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteTsbbList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteTsbbDetail(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteNwHomeList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getCompanyList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function upCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function checkCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getCompanyInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -375,9 +375,38 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteJobSelect(array $data);
+
     /**
      * @param array $data
      * @return mixed
      */
+    public function getWebsiteTsbb(array $data);
+    public function getWebsiteTsbbList(array $data);
+    public function getWebsiteTsbbDetail(array $data);
+
     public function getWebsiteCatidshop(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteLevelJob(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteNwHomeList(array $data);
+    // 企业管理
+    // 获取企业列表
+    public function getCompanyList(array $data);
+    // 添加企业
+    public function addCompany(array $data);
+    // 更新企业
+    public function upCompany(array $data);
+    // 删除企业
+    public function delCompany(array $data);
+    // 审核企业
+    public function checkCompany(array $data);
+    // 获取企业信息
+    public function getCompanyInfo(array $data);
 }

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)
     {
@@ -332,4 +370,21 @@ 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);
+    }
+    public function saveWebsiteTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $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);
@@ -170,4 +197,15 @@ 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);
+    // 5.保存到草稿箱
+    public function saveWebsiteTemplate(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
@@ -707,5 +672,161 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data); 
     }
-   
+
+   /*
+    * @param array $data
+    * @return mixed
+    */
+    public function getStaticResourceList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+
+    public function getWebsiteTsbb(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getFooterCategoryList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getFooterContentList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addStaticResource(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     */
+    public function getFooterContentInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delStaticResource(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWhiteRouter(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function cloneWebsite(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAdkey(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upStaticResource(array $data)
+    {
+        return $this->__request(__FUNCTION__, $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
@@ -463,5 +441,82 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteRoute(array $data);
-    
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTsbb(array $data);
+    public function getStaticResourceList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getFooterCategoryList(array $data);
+    public function addStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getFooterContentList(array $data);
+    public function delStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeInfo(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getFooterContentInfo(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWhiteRouterList(array $data);
+    public function addWhiteRouter(array $data);
+    public function delWhiteRouter(array $data);
+    public function getWhiteRouterInfo(array $data);
+    public function upWhiteRouter(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAdkey(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function cloneWebsite(array $data);
+
+
 }

app/Middleware/Auth/FooMiddleware.php

@@ -54,6 +54,7 @@ class FooMiddleware implements MiddlewareInterface
 
         $header = $request->getHeaders();
         try {
+
             if($header &&  isset($header['token']) && $header['token'][0]!='null' && $header['token'][0]!='' && isset($header['token'][0])){
 //                var_dump("token类型：",$header['token'][0]);
                 $ver = $this->JWT->getClaimsByToken($header['token'][0]);
@@ -86,7 +87,7 @@ class FooMiddleware implements MiddlewareInterface
                         );
                     }
                     Context::set("SiteId",$result['data']['id']);
-                    if($ver['type_id']!=10000){
+                    if(in_array($ver['type_id'],[1,2,3,4])){
                         $userInfo = $this->userController->getUserInfo($ver['uid']);
                         if($userInfo['code'] == 200 && isset($userInfo['data']) && !empty($userInfo['data']['sszq'])){
                             $sszq = $userInfo['data']['sszq'];
@@ -119,7 +120,7 @@ class FooMiddleware implements MiddlewareInterface
 
                     }
                 }
-//                var_dump("中间件：",$ver);
+               var_dump("中间件：",$ver);
                 Context::set("UserId",$ver['uid']);
                 Context::set("TypeId",$ver['type_id']);
                 if ($ver) {

app/Middleware/Auth/PublicMiddleware.php

@@ -39,7 +39,7 @@ class PublicMiddleware implements MiddlewareInterface
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-
+//        var_dump("fuck:",$request->all());
         $header = $request->getHeaders();
         try {
           
@@ -50,6 +50,7 @@ class PublicMiddleware implements MiddlewareInterface
                 ];
 
                 $result = $this->websiteServiceClient->getWebsiteId($data);
+                var_dump($result);
                 if(!isset($result['data']['id']) || !$result['data']['id']){
                     return $this->response->json(
                         [

app/Middleware/Auth/WebMiddleware.php

@@ -42,8 +42,13 @@ class WebMiddleware implements MiddlewareInterface
 
         $header = $request->getHeaders();
         try {
-          
-            if($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
+            if($header &&  isset($header['siteid']) && $header['siteid'][0]!='null' && isset($header['siteid'][0])){
+                Context::set("SiteId",intval($header['siteid'][0]));
+                if ($header['siteid'][0]) {
+                    return $handler->handle($request);
+                }
+            }
+            elseif($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
                 $origin = $header['origin'][0];
                 $logindevice = explode("//", $origin);
                 $data = [

app/Task/TsbbTask.php

@@ -0,0 +1,40 @@
+<?php
+
+declare (strict_types = 1);
+
+namespace App\Task;
+use App\JsonRpc\NewsServiceInterface;
+use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Di\Annotation\Inject;
+use Psr\Log\LoggerInterface;
+
+class TsbbTask
+{
+    /**
+     * @var NewsServiceInterface
+     */
+    #[Inject]
+    private $newsServiceClient;
+    /**
+     * @Inject
+     * @var StdoutLoggerInterface
+     */
+    private $logger;
+    public function __construct(LoggerInterface $logger)
+    {
+        date_default_timezone_set('Asia/Shanghai');
+        $this->logger = $logger;
+    }
+    public function __invoke()
+    {
+        var_dump("TsbbTask================");
+        $this->logger->info('TsbbTask================');
+        $requireData = [
+            'website_id' => 50,
+        ];
+        var_dump("#############");
+        $this->newsServiceClient->getWebsiteTsbb($requireData);;
+
+    }
+
+}

config/api/ad.php

@@ -23,6 +23,8 @@ Router::addGroup(
         Router::post('/updateAdPlace', [AdController::class, 'updateAdPlace']);
         //删除广告位
         Router::post('/delAdPlace', [AdController::class, 'delAdPlace']);
+        //孪生站广告位
+        Router::post('/addTwinAdPlace', [AdController::class, 'addTwinAdPlace']); 
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/form.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+
+use App\Middleware\Auth\FooMiddleware;
+use Hyperf\HttpServer\Router\Router;
+use App\Controller\FormController;
+
+Router::addGroup(
+    '/form', function () {
+        //添加全局表单
+        Router::post('/addGlobalTable', [FormController::class, 'addGlobalTable']);
+        //修改全局表单
+        Router::post('/upGlobalTable', [FormController::class, 'upGlobalTable']);
+        //查看全局表单 
+        Router::get('/getGlobalTable', [FormController::class, 'getGlobalTable']);
+        //全局表单列表 
+        Router::get('/getGlobalTableList', [FormController::class, 'getGlobalTableList']);
+        //删除全局表单
+        Router::post('/delGlobalTable', [FormController::class, 'delGlobalTable']);
+    },
+    ['middleware' => [FooMiddleware::class]]
+);

config/api/public.php

@@ -45,14 +45,26 @@ Router::addGroup(
         Router::post('/modZhinengbumen', [PublicController::class, 'modZhinengbumen']);
         Router::post('/getPidZhinengbumen', [PublicController::class, 'getPidZhinengbumen']);
 
+        // 风格
+        //获取风格列表
+        Router::get('/getTemplateClassList', [PublicController::class, 'getTemplateClassList']);
+        //添加风格
+        Router::post('/addTemplateClass', [PublicController::class, 'addTemplateClass']);
+        //更新风格
+        Router::post('/upTemplateClass', [PublicController::class, 'upTemplateClass']);
+        //删除风格
+        Router::post('/delTemplateClass', [PublicController::class, 'delTemplateClass']);
+
+        // 皮肤
         //获取风格名称
         Router::post('/getTemplateClass', [PublicController::class, 'getTemplateClass']);
-        //获取风格列表
+        //获取皮肤列表
         Router::post('/getTemplateList', [PublicController::class, 'getTemplateList']);
         Router::post('/addTemplate', [PublicController::class, 'addTemplate']);
         Router::post('/getTemplateInfo', [PublicController::class, 'getTemplateInfo']);
         Router::post('/delTemplate', [PublicController::class, 'delTemplate']);
         Router::post('/updateTemplate', [PublicController::class, 'updateTemplate']);
+
         //获取板块
         Router::post('/addSector', [PublicController::class, 'addSector']);
         Router::post('/getSectorList', [PublicController::class, 'getSectorList']);
@@ -66,7 +78,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']);
 
         //黑名单列表-违禁词
@@ -77,6 +88,32 @@ 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']);
+        // 自助建站-5.保存到草稿箱
+        Router::post('/saveWebsiteTemplate', [PublicController::class, 'saveWebsiteTemplate']);
+
+        
+        // 企业管理
+        // 获取企业列表
+        Router::get('/getCompanyList', [PublicController::class, 'getCompanyList']);
+        // 添加企业
+        Router::post('/addCompany', [PublicController::class, 'addCompany']);
+        // 更新企业
+        Router::post('/upCompany', [PublicController::class, 'upCompany']);
+        // 删除企业
+        Router::post('/delCompany', [PublicController::class, 'delCompany']);
+        // 审核企业
+        Router::post('/checkCompany', [PublicController::class, 'checkCompany']);
+        // 获取企业信息
+        Router::get('/getCompanyInfo', [PublicController::class, 'getCompanyInfo']);
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/web.php

@@ -6,6 +6,7 @@ use App\Controller\WebController;
 use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\WebMiddleware;
 use App\Middleware\Auth\FooMiddleware;
+use App\Controller\WebsiteController;
 Router::addGroup(
     '/web', function () {
                 Router::get('/getWebsiteCategory', [WebController::class, 'getWebsiteCategory']);
@@ -92,8 +93,18 @@ Router::addGroup(
                 Router::get('/getWebsiteJobInfo', [WebController::class, 'getWebsiteJobInfo']);
                 // 申请职位
                 // Router::get('/getWebsiteJobApply', [WebController::class, 'getWebsiteJobApply']);
-                // 沟通简历
-                // Router::get('/getWebsiteJobResume', [WebController::class, 'getWebsiteJobResume']);
+                // c端-招聘 职位分类
+                Router::get('/getPositionList', [WebController::class, 'getPositionList']);
+                // c端-招聘 推荐等级职位
+                Router::get('/getWebsiteLevelJob', [WebController::class, 'getWebsiteLevelJob']);
+                //贴身宝贝
+                Router::get('/getWebsiteTsbb', [WebController::class, 'getWebsiteTsbb']);
+                //列表页
+                Router::get('/getWebsiteTsbbList', [WebController::class, 'getWebsiteTsbbList']);
+                //详情页
+                Router::get('/getWebsiteTsbbDetail', [WebController::class, 'getWebsiteTsbbDetail']);
+                //农网导航
+                Router::get('/getWebsiteNwHomeList', [WebController::class, 'getWebsiteNwHomeList']);
                 
             },
     ['middleware' => [WebMiddleware::class]]
@@ -111,3 +122,13 @@ Router::addGroup(
     ['middleware' => [FooMiddleware::class]]
 );
 // --招工招聘交互-----------fr----------------------end
+Router::addGroup(
+    '/web', function () {
+        // 获取底部所有信息
+        Router::get('/getAdminWebsiteFootAll', [WebController::class, 'getAdminWebsiteFootAll']);
+        //获取网站基本信息
+        Router::get('/getAdminSiteInfo', [WebsiteController::class, 'getAdminSiteInfo']);
+
+    }
+
+);

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']);
         //获取分类下模板列表
@@ -124,6 +117,29 @@ Router::addGroup(
         Router::post('/getWebsiteTemplateclassintel', [WebsiteController::class, 'getWebsiteTemplateclassintel']);
         //获取网站选择的模板下的板块
         Router::post('/getWebsiteSectorList', [WebsiteController::class, 'getWebsiteSectorList']);
+
+
+        // 获取所有的静态资源
+        Router::get('/getStaticResourceList', [WebsiteController::class, 'getStaticResourceList']);
+        // 添加静态资源
+        Router::post('/addStaticResource', [WebsiteController::class, 'addStaticResource']);
+        // 删除静态资源
+        Router::post('/delStaticResource', [WebsiteController::class, 'delStaticResource']);
+        // 修改静态资源
+        Router::post('/upStaticResource', [WebsiteController::class, 'upStaticResource']);
+
+        // 获取尺寸列表
+        Router::get('/getSizeList', [WebsiteController::class, 'getSizeList']);
+        // 添加尺寸
+        Router::post('/addSize', [WebsiteController::class, 'addSize']);
+        // 删除尺寸
+        Router::post('/delSize', [WebsiteController::class, 'delSize']);
+        // 修改尺寸
+        Router::post('/upSize', [WebsiteController::class, 'upSize']);
+        // 获取尺寸详情
+        Router::get('/getSizeInfo', [WebsiteController::class, 'getSizeInfo']);
+        // 获取网站名称简称
+        Router::get('/getWebsiteAdkey', [WebsiteController::class, 'getWebsiteAdkey']);
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start
@@ -131,6 +147,16 @@ Router::addGroup(
         Router::post('/upWebFootInfo', [WebsiteController::class, 'upWebFootInfo']);
         Router::post('/addWebFootInfo', [WebsiteController::class, 'addWebFootInfo']);
         // --网站底部基础信息-----------fr----------------------end
+        // --网站路由白名单-----------fr----------------------start
+        Router::get('/getWhiteRouterList', [WebsiteController::class, 'getWhiteRouterList']);
+        Router::post('/addWhiteRouter', [WebsiteController::class, 'addWhiteRouter']);
+        Router::post('/delWhiteRouter', [WebsiteController::class, 'delWhiteRouter']);
+        Router::get('/getWhiteRouterInfo', [WebsiteController::class, 'getWhiteRouterInfo']);
+        Router::post('/upWhiteRouter', [WebsiteController::class, 'upWhiteRouter']);
+        // 克隆网站
+        Router::post('/cloneWebsite', [WebsiteController::class, 'cloneWebsite']);
+
+        // --网站路由白名单-----------fr----------------------end
     },
     ['middleware' => [FooMiddleware::class]]
 );
@@ -144,3 +170,20 @@ 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']);
+
+},
+    ['middleware' => [\App\Middleware\Auth\WebMiddleware::class]]
+);

config/autoload/amqp.php

@@ -16,7 +16,7 @@ return [
         'pool' => [
             'min_connections' => 1,
             'max_connections' => 1, // 限制最大连接数为1
-            'connect_timeout' => 10.0,
+            'connect_timeout' => 1000.0,
             'wait_timeout' => 3.0,
             'heartbeat' => -1,
             

config/autoload/crontab.php

@@ -8,11 +8,17 @@ return [
     // 是否开启定时任务
     'enable' => true,
     'crontab' => [
+//        (new Crontab())
+//            ->setName('HistoryTodayTask')
+//            ->setRule('0 0 0  * * *') // 每天凌晨执行一次
+//            ->setCallback([App\Task\HistoryTodayTask::class, '__invoke'])
+//            ->setMemo('获取历史上的今天')
+//            ->setTimezone('Asia/Shanghai'),
         (new Crontab())
-            ->setName('HistoryTodayTask')
-            ->setRule('0 0 0  * * *') // 每天凌晨执行一次
-            ->setCallback([App\Task\HistoryTodayTask::class, '__invoke'])
-            ->setMemo('获取历史上的今天')
+            ->setName('tsbbTask') // 任务名称
+            ->setRule('* * 1 * * *') // 每天凌晨1点执行
+            ->setCallback([App\Task\TsbbTask::class, '__invoke']) // 替换为你的任务类
+            ->setMemo('贴身宝贝') // 描述
             ->setTimezone('Asia/Shanghai'),
     ],
 ];

config/autoload/services.php

@@ -85,7 +85,7 @@ return [
                 'package_length_field' => 'length',
             ],
             'options' => [
-                'connect_timeout' => 50.0, // 连接超时时间，单位为秒
+                'connect_timeout' => 500.0, // 连接超时时间，单位为秒
                 'read_timeout' => 100.0, // 读取超时时间，单位为秒
                 'write_timeout' => 100.0, // 写入超时时间，单位为秒
             ],
@@ -153,6 +153,16 @@ return [
                 ['host' => '127.0.0.1', 'port' => 9510],
             ],
         ],
+        [
+            //全局表单服务
+            'name' => 'FormService',
+            'service' => \App\JsonRpc\FormServiceInterface::class,
+
+            // 直接对指定的节点进行消费，通过下面的 nodes 参数来配置服务提供者的节点信息
+            'nodes' => [
+                ['host' => '127.0.0.1', 'port' => 9509],
+            ],
+        ],
     ],
 
 ];

config/routes.php

@@ -39,3 +39,4 @@ require __DIR__ . '/api/order.php';
 require __DIR__ . '/api/collector.php';
 require __DIR__ . '/api/footer.php';
 require __DIR__ . '/api/client.php';
+require __DIR__ . '/api/form.php';