合并分支 'lyh-server' 到 'master'

gx数据



查看合并请求 !1431

@@ -140,7 +140,6 @@ class LyhImportTest extends Command
         $cateModel = new Category();
         $cateModel = new Category();
         $productModel = new Product();
         $productModel = new Product();
         $detailModel = new Detail();
         $detailModel = new Detail();
-        $columnModel = new Column();
         $extentInfoModel = new ExtendInfo();
         $extentInfoModel = new ExtendInfo();
         foreach ($line_of_text as $k => $val){
         foreach ($line_of_text as $k => $val){
             if($k < 1){
             if($k < 1){
@@ -161,12 +160,12 @@ class LyhImportTest extends Command
             $saveData['project_id'] = $project_id;
             $saveData['project_id'] = $project_id;
             $saveData['status'] = 1;
             $saveData['status'] = 1;
             $saveData['intro'] = $val[6] ?? '';
             $saveData['intro'] = $val[6] ?? '';
-            $seo = ['seo_title'=>$val[0]];
-            $saveData['seo_mate'] = json_encode($seo,true);
+            $seo = ['title'=>$val[0]];
+            $saveData['seo_mate'] = json_encode($seo,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $thumb = ['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])];
             $thumb = ['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])];
             $gallery = [['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])]];
             $gallery = [['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])]];
-            $saveData['thumb'] = json_encode($thumb,true);
-            $saveData['gallery'] = json_encode($gallery,true);
+            $saveData['thumb'] = json_encode($thumb,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $saveData['gallery'] = json_encode($gallery,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $id = $productModel->addReturnId($saveData);
             $id = $productModel->addReturnId($saveData);
             //设置关联关系
             //设置关联关系
             if($cateInfo !== false){
             if($cateInfo !== false){
@@ -238,7 +237,7 @@ class LyhImportTest extends Command
             }
             }
             if(!empty($val[9])){
             if(!empty($val[9])){
                 try {
                 try {
-                    $faqsDetail = json_decode($val[9],true);
+                    $faqsDetail = json_decode($val[9],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
                     if(!empty($faqsDetail) && is_array($faqsDetail)){
                     if(!empty($faqsDetail) && is_array($faqsDetail)){
                         $faqContent = '<div>';
                         $faqContent = '<div>';
                         foreach ($faqsDetail as $faq_Val){
                         foreach ($faqsDetail as $faq_Val){
@@ -255,7 +254,7 @@ class LyhImportTest extends Command
                         $detailModel->addReturnId($detailFaqInfo);
                         $detailModel->addReturnId($detailFaqInfo);
                     }else{
                     }else{
                         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('产品标题：'. $val[0] . PHP_EOL .'faqs数据有问题：' . $val[9], true) . PHP_EOL, FILE_APPEND);
                         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('产品标题：'. $val[0] . PHP_EOL .'faqs数据有问题：' . $val[9], true) . PHP_EOL, FILE_APPEND);
-                        echo date('Y-m-d H:i:s') . '产品标题：'. $val[0] . PHP_EOL .'faqs数据有问题：' . $val[9];
+                        echo date('Y-m-d H:i:s') . '产品标题：'. $val[0] . PHP_EOL .'SEOQandA数据有问题：' . $val[9].PHP_EOL;
                     }
                     }
                 }catch(\Exception $e){
                 }catch(\Exception $e){
                     echo 'fqs';
                     echo 'fqs';
@@ -280,7 +279,7 @@ class LyhImportTest extends Command
                         $detailModel->addReturnId($detailFaqInfo);
                         $detailModel->addReturnId($detailFaqInfo);
                     }else{
                     }else{
                         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('产品标题：'. $val[0] . PHP_EOL .'faqs数据有问题：' . $val[10], true) . PHP_EOL, FILE_APPEND);
                         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('产品标题：'. $val[0] . PHP_EOL .'faqs数据有问题：' . $val[10], true) . PHP_EOL, FILE_APPEND);
-                        echo date('Y-m-d H:i:s') . '产品标题：'. $val[0] . PHP_EOL .'SEOQandA_Product数据有问题：' . $val[10];
+                        echo date('Y-m-d H:i:s') . '产品标题：'. $val[0] . PHP_EOL .'SEOQandA_Product数据有问题：' . $val[10].PHP_EOL;
                     }
                     }
                 }catch(\Exception $e){
                 }catch(\Exception $e){
                     continue;
                     continue;