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

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);
         
@@ -1210,4 +1211,29 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->checkWebsiteRoute($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/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

@@ -375,4 +375,9 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteJobSelect(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCatidshop(array $data);
 }

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/autoload/services.php

@@ -76,6 +76,27 @@ return [
             'nodes' => [
                 ['host' => '127.0.0.1', 'port' => 9505],
             ],
+            'settings' => [
+                'open_length_check' => true,
+                'package_max_length' => 15 * 1024 * 1024, // 最大包长度
+                'package_length_type' => 'N',
+                'package_body_offset' => 8,
+                'package_length_offset' => 4,
+                'package_length_field' => 'length',
+            ],
+            'options' => [
+                'connect_timeout' => 50.0, // 连接超时时间，单位为秒
+                'read_timeout' => 100.0, // 读取超时时间，单位为秒
+                'write_timeout' => 100.0, // 写入超时时间，单位为秒
+            ],
+            'pool' => [
+                'min_connections' => 1,
+                'max_connections' => 30,
+                'connect_timeout' => 100.0, // 连接池连接超时时间，单位为秒
+                'wait_timeout' => 30.0, // 等待连接池可用连接的超时时间，单位为秒
+                'heartbeat' => -1, // 心跳检测间隔，-1 表示禁用心跳检测
+                'max_idle_time' => 60.0, // 连接的最大空闲时间，单位为秒
+            ],
         ],
         [
             //友情链接服务