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

@@ -29,22 +29,24 @@ class Temp extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $data_project = [1, 2, 3, 4, 15, 77, 101, 162, 452, 475];
-        $data_news = [40, 50, 452, 475];
-        $data_blog = [452];
+        $data_project = [162];
 
 
         foreach ($data_project as $project_id) {
         foreach ($data_project as $project_id) {
             $project = ProjectServer::useProject($project_id);
             $project = ProjectServer::useProject($project_id);
             if ($project) {
             if ($project) {
                 $list = Product::get();
                 $list = Product::get();
                 foreach ($list as $item) {
                 foreach ($list as $item) {
-                    $seo = json_decode($item->seo_mate, true);
+                    $seo = $item->seo_mate;
                     if ($seo) {
                     if ($seo) {
-                        $seo['title'] = substr(strip_tags($seo['title']), 0, 70);
-                        $seo['keyword'] = substr(strip_tags($seo['keyword']), 0, 255);
-                        $seo['description'] = substr(strip_tags($seo['description']), 0, 200);
+                        $seo['title'] = substr(strip_tags($seo['title']??''), 0, 70);
+                        $seo['keyword'] = substr(strip_tags($seo['keyword']??''), 0, 255);
+                        $seo['description'] = substr(strip_tags($seo['description']??''), 0, 200);
                         $item->seo_mate = Arr::a2s($seo);
                         $item->seo_mate = Arr::a2s($seo);
-                        $item->save();
+                        try {
+                            $item->save();
+                        }catch (\Exception $e){
+                            continue;
+                        }
                     }
                     }
                 }
                 }
             }
             }

@@ -197,7 +197,7 @@ class KeywordLogic extends  BaseLogic
      */
      */
     public function importProductKeyword($project_id,$keyword){
     public function importProductKeyword($project_id,$keyword){
         $return = [];
         $return = [];
-        $keyword_arr = explode(',',$keyword);
+        $keyword_arr = explode('^v6sp$',$keyword);
         foreach ($keyword_arr as $v){
         foreach ($keyword_arr as $v){
             if($v){
             if($v){
                 $keyword_info = $this->model->read(['title'=>$v]);
                 $keyword_info = $this->model->read(['title'=>$v]);