----代码冲突

app/Controller/WebController.php

@@ -1211,6 +1211,43 @@ class WebController extends AbstractController
         $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
      *

app/Controller/WebsiteController.php

@@ -2323,15 +2323,51 @@ class WebsiteController extends AbstractController
     }
     // --底部基础信息-----------fr----------------------end
 
+    /**
+     * 获取站点信息
+     * @return array
+     */
+    public function getSiteInfo()
+    {
+        $id = Context::get("SiteId");
+        $result = $this->websiteServiceClient->getWebsiteInfo($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->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");
+        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()
-    {
+    public function getStaticResourceList(){
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -2355,6 +2391,53 @@ class WebsiteController extends AbstractController
         $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
@@ -2428,4 +2511,5 @@ class WebsiteController extends AbstractController
         Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     // --自助建站-----------20250522fr----------------------end
-}
+}
+

app/JsonRpc/NewsService.php

@@ -718,4 +718,21 @@ 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);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -375,9 +375,15 @@ 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);
+
 }

app/JsonRpc/WebsiteService.php

@@ -707,6 +707,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data); 
     }
+
    /*
     * @param array $data
     * @return mixed
@@ -715,14 +716,41 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         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

app/JsonRpc/WebsiteServiceInterface.php

@@ -463,24 +463,31 @@ 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 getFooterContentInfo(array $data);
     public function getStaticResourceInfo(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]);

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 {
           

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 = [

config/api/web.php

@@ -94,7 +94,12 @@ Router::addGroup(
                 // Router::get('/getWebsiteJobApply', [WebController::class, 'getWebsiteJobApply']);
                 // c端-招聘 职位分类
                 Router::get('/getPositionList', [WebController::class, 'getPositionList']);
-                
+                //贴身宝贝
+                Router::get('/getWebsiteTsbb', [WebController::class, 'getWebsiteTsbb']);
+                //列表页
+                Router::get('/getWebsiteTsbbList', [WebController::class, 'getWebsiteTsbbList']);
+                //详情页
+                Router::get('/getWebsiteTsbbDetail', [WebController::class, 'getWebsiteTsbbDetail']);
             },
     ['middleware' => [WebMiddleware::class]]
 );

config/api/website.php

@@ -154,3 +154,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]]
+);