1

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' => '联系电话不能为空',
@@ -1723,6 +1723,8 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['user_id'] = Context::get("UserId");
+        $requireData['type_id'] = Context::get("TypeId");
         $result = $this->newsServiceClient->updateComplaintStatus($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/PublicController.php

@@ -1394,59 +1394,84 @@ class PublicController extends AbstractController
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
+            var_dump($errorMessage);
             return $this->response->json(
                 [
                     'id'=>uniqid(),
+                    'target'=>"采集失败",
+                    'desc'=>$errorMessage,
                     'error'=>$errorMessage
                 ]
             );
         }
-        $categoryInfo = $this->newsServiceClient->getCategoryInfo(['id'=>$requireData['catid']]);
-        if($categoryInfo['code']!=200){
+
+        $arr_catid = explode(',',$requireData['catid']);
+        $arr_web_site_id = explode(',',$requireData['web_site_id']);
+        if(count($arr_catid) != count($arr_web_site_id)){
             return $this->response->json(
                 [
                     'id'=>uniqid(),
-                    'error'=>"栏目不存在"
+                    'target'=>"采集失败",
+                    'desc'=>"网站栏目不匹配",
+                    'error'=>"网站栏目不匹配"
                 ]
             );
         }
-        if($categoryInfo['data']['pid']!=0){
-            $pid_arr = json_decode($categoryInfo['data']['pid_arr'],true);
-            $requireData['cat_arr_id'] = array_push($pid_arr,intval($requireData['catid']));
-            $requireData['cat_arr_id'] = isset($pid_arr) ? json_encode($pid_arr) : '';
-        }else{
-            $requireData['cat_arr_id'] = json_encode([intval($requireData['catid'])]);
+//        var_dump($arr_catid,$arr_web_site_id);
+//        die();
+        if($arr_catid){
+            foreach ($arr_catid as $key=>$val){
+                $categoryInfo = $this->newsServiceClient->getCategoryInfo(['id'=>$val]);
+                if($categoryInfo['code']!=200){
+                    return $this->response->json(
+                        [
+                            'id'=>uniqid(),
+                            'error'=>"栏目不存在"
+                        ]
+                    );
+                }
+                if($categoryInfo['data']['pid']!=0){
+                    $pid_arr = json_decode($categoryInfo['data']['pid_arr'],true);
+                    $requireData['cat_arr_id'] = array_push($pid_arr,intval($val));
+                    $requireData['cat_arr_id'] = isset($pid_arr) ? json_encode($pid_arr) : '';
+                }else{
+                    $requireData['cat_arr_id'] = json_encode([intval($val)]);
+                }
+                $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
+                $requireData['ip'] = $loginIp;
+                $requireData['admin_user_id'] = 0;
+                $requireData['level'] = isset($requireData['level']) &&  $requireData['level'] ? $requireData['level'] : 0;
+                $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits'] ? $requireData['hits'] : 0;
+                $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original'] ? $requireData['is_original'] : 0;
+                $requireData['status'] = isset($requireData['status']) &&  $requireData['status'] ? $requireData['status'] : 1;
+                $requireData['imgurl'] = '';
+                $requireData['user_type'] = 10000;
+                $requireData['level'] = "[0]";
+                $requireData['nav_add_pool_id'] = [];
+                $requireData['city_id'] = 0;
+                $requireData['city_arr_id'] = "[]";
+                $requireData['department_arr_id'] = "[]";
+                $requireData['department_id'] = 0;
+                $requireData['islink'] = 0;
+                $requireData['linkurl'] = "";
+                $requireData['keyword'] = "";
+                $requireData['introduce'] = "";
+                $requireData['is_survey'] = 0;
+                $requireData['survey_name'] = "";
+                $requireData['suvey_array'] = "";
+                $requireData['survey_type'] = 0;
+                $requireData['commend_id'] = "[]";
+                $requireData['catid'] = $val;
+                $requireData['web_site_id'] = $arr_web_site_id[$key];
+                $result = $this->newsServiceClient->addArticle($requireData);
+                $data = [
+                    'id'=>$result['data']['id'],
+                    'target'=>$categoryInfo['data']['name'],
+                    'desc'=>$requireData['title'],
+                ];
+            }
         }
-        $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
-        $requireData['ip'] = $loginIp;
-        $requireData['admin_user_id'] = 0;
-        $requireData['level'] = isset($requireData['level']) &&  $requireData['level'] ? $requireData['level'] : 0;
-        $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits'] ? $requireData['hits'] : 0;
-        $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original'] ? $requireData['is_original'] : 0;
-        $requireData['status'] = isset($requireData['status']) &&  $requireData['status'] ? $requireData['status'] : 1;
-        $requireData['imgurl'] = '';
-        $requireData['user_type'] = 10000;
-        $requireData['level'] = "[0]";
-        $requireData['nav_add_pool_id'] = [];
-        $requireData['city_id'] = 0;
-        $requireData['city_arr_id'] = "[]";
-        $requireData['department_arr_id'] = "[]";
-        $requireData['department_id'] = 0;
-        $requireData['islink'] = 0;
-        $requireData['linkurl'] = "";
-        $requireData['keyword'] = "";
-        $requireData['introduce'] = "";
-        $requireData['is_survey'] = 0;
-        $requireData['survey_name'] = "";
-        $requireData['suvey_array'] = "";
-        $requireData['survey_type'] = 0;
-        $requireData['commend_id'] = "[]";
-        $result = $this->newsServiceClient->addArticle($requireData);
-        $data = [
-            'id'=>$result['data']['id'],
-            'target'=>$categoryInfo['data']['name'],
-            'desc'=>$requireData['title'],
-        ];
+
         return $this->response->json(
             $data
         );

app/Controller/WebController.php

@@ -258,7 +258,8 @@ class WebController extends AbstractController
             'website_id'=>Context::get("SiteId"),
             'pid' => $requireData['pid'],
             'placeid' => $requireData['placeid'],
-            'num' => $requireData['num']
+            'num' => $requireData['num'],
+            'type' => $requireData['type'] ?? null
         ];    
         $result=$this->websiteServiceClient->getWebsiteModelCategory($data);
         
@@ -1211,6 +1212,7 @@ class WebController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+
     /**
      * 贴身宝贝
      * @return array
@@ -1240,9 +1242,35 @@ class WebController extends AbstractController
     public function getWebsiteTsbbDetail()
     {
         $requireData = $this->request->all();
-        var_dump("====:",$requireData);
-        $requireData['website_id'] =  Context::get("SiteId");
+        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,
+            [
+                'catid' =>'required',
+            ],
+            [
+                'catid.required' => 'catid不能为空',
+            ]
+        );
+        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->getWebsiteCatidshop($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 }

app/Controller/WebsiteController.php

@@ -14,6 +14,7 @@ use Hyperf\Context\Context;
 use Phper666\JWTAuth\JWT;
 use DateTime;
 use App\JsonRpc\UserServiceInterface;
+use PhpParser\Node\Stmt\Return_;
 
 /**
  * Class WebsiteController
@@ -2321,6 +2322,7 @@ class WebsiteController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     // --底部基础信息-----------fr----------------------end
+
     /**
      * 获取站点信息
      * @return array
@@ -2338,12 +2340,20 @@ class WebsiteController extends AbstractController
             return Result::error($result['message']);
         }
     }
+
+    /**
+     * @return array
+     */
     public function getSiteCategory()
     {
         $requireData['website_id'] = Context::get("SiteId");
         $result = $this->websiteServiceClient->getAdminWebsiteCategory($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * @return array
+     */
     public function getFooterCategoryList()
     {
         $requireData['website_id'] = Context::get("SiteId");
@@ -2351,6 +2361,58 @@ class WebsiteController extends AbstractController
         $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
@@ -2377,26 +2439,77 @@ class WebsiteController extends AbstractController
         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,
+            [
+                'website_id' =>'required|numeric',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.numeric' => '网站id必须是数字类型',
+            ]
+        );
+        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 getFooterContentInfo()
+    public function delStaticResource()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'content_id' => 'required',
+                'id' =>'required|integer',
             ],
             [
-                'content_id.required' => '内容id不能为空',
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数类型',
             ]
         );
-        if ($validator->fails()){
+        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']);
+        $result = $this->websiteServiceClient->delStaticResource($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function getStaticResourceInfo()
+    {
+        $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->getStaticResourceInfo($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    // --自助建站-----------20250522fr----------------------end
 }
+

app/JsonRpc/NewsService.php

@@ -511,6 +511,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCatidshop(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/NewsServiceInterface.php

@@ -383,4 +383,7 @@ interface NewsServiceInterface
     public function getWebsiteTsbb(array $data);
     public function getWebsiteTsbbList(array $data);
     public function getWebsiteTsbbDetail(array $data);
+
+    public function getWebsiteCatidshop(array $data);
+
 }

app/JsonRpc/WebsiteService.php

@@ -708,15 +708,24 @@ 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
@@ -725,20 +734,36 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
     /**
      * @param array $data
      * @return array|mixed
      */
-    public function getFooterContentList(array $data)
+    public function getFooterContentList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addStaticResource(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
     /**
      * @param array $data
-     * @return array|mixed
      */
-    public function getFooterContentInfo(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 getStaticResourceInfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/WebsiteServiceInterface.php

@@ -469,21 +469,25 @@ interface WebsiteServiceInterface
      * @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 getFooterContentInfo(array $data);
+    public function getStaticResourceInfo(array $data);
 
 }

app/Middleware/Auth/FooMiddleware.php

@@ -120,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) {

config/api/web.php

@@ -59,8 +59,10 @@ Router::addGroup(
                 Router::get('/checkWebsiteRoute', [WebController::class, 'checkWebsiteRoute']);
 
                 // 商城
-                // 获取商城首页
+                // 获取商城首页-根据level获取
                 Router::get('/getWebsiteshop', [WebController::class, 'getWebsiteshop']);
+                // 获取商城首页-根据栏目id获取
+                Router::get('/getWebsiteCatidshop', [WebController::class, 'getWebsiteCatidshop']);
                 // 获取商城栏目
                 Router::get('/getWebsiteshopCat', [WebController::class, 'getWebsiteshopCat']);
                 // 获取商城分类列表

config/api/website.php

@@ -124,6 +124,16 @@ 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::get('/getStaticResourceInfo', [WebsiteController::class, 'getStaticResourceInfo']);
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start