Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -49,7 +49,7 @@ class OptimizeController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             $rankDataModel = new RankData();
             $rankDataModel = new RankData();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>'','updated_date'=>date('Y-m-d')],['first_page_num','indexed_pages_num']);
+                $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>''],['first_page_num','indexed_pages_num']);
                 $v['first_page_num'] = $data['first_page_num'] ?? 0;
                 $v['first_page_num'] = $data['first_page_num'] ?? 0;
                 $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
                 $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
                 $v['g'] = $this->getGNum($v['id']);
                 $v['g'] = $this->getGNum($v['id']);

@@ -696,9 +696,7 @@ class ProductLogic extends  BaseLogic
         }else{
         }else{
             $product = $this->model->read(['title' => $data[0]]);
             $product = $this->model->read(['title' => $data[0]]);
         }
         }
-
         if (!$product) {
         if (!$product) {
-
             $category_id = '';
             $category_id = '';
             $category_arr = [];
             $category_arr = [];
             if ($data[2]??'') {
             if ($data[2]??'') {
@@ -817,9 +815,9 @@ class ProductLogic extends  BaseLogic
                 $seo_description = substr(strip_tags($data[10]),0,200);
                 $seo_description = substr(strip_tags($data[10]),0,200);
             }
             }
             $seo_mate = [
             $seo_mate = [
-                'title' => $seo_title,
-                'keyword' => $seo_keywords,
-                'description' => $seo_description
+                'title' => $seo_title ?? '',
+                'keyword' => $seo_keywords ?? '',
+                'description' => $seo_description ?? ''
             ];
             ];
             //处理参数
             //处理参数
             $attrs = [];
             $attrs = [];
@@ -877,7 +875,7 @@ class ProductLogic extends  BaseLogic
                     'intro' => $intro,
                     'intro' => $intro,
                     'content' => $content,
                     'content' => $content,
                     'describe' => Arr::a2s($describe),
                     'describe' => Arr::a2s($describe),
-                    'seo_mate' => Arr::a2s($seo_mate),
+//                    'seo_mate' => Arr::a2s($seo_mate ?? []),
                     'created_uid' => $user_id,
                     'created_uid' => $user_id,
                     'status' => Product::STATUS_ON
                     'status' => Product::STATUS_ON
                 ]
                 ]