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

gx数据



查看合并请求 !1433

@@ -166,7 +166,12 @@ class LyhImportTest extends Command
             $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,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['thumb'] = json_encode($thumb,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['gallery'] = json_encode($gallery,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['gallery'] = json_encode($gallery,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-            $id = $productModel->addReturnId($saveData);
+            try {
+                $id = $productModel->addReturnId($saveData);
+            }catch (\Exception $e){
+                @file_put_contents(storage_path('logs/lyh_error.log'), var_export('未导入成功--标题：'.$val[0], true) . PHP_EOL, FILE_APPEND);
+                continue;
+            }
             //设置关联关系
             //设置关联关系
             if($cateInfo !== false){
             if($cateInfo !== false){
                 CategoryRelated::saveRelated($id,[$cateInfo['id']]);
                 CategoryRelated::saveRelated($id,[$cateInfo['id']]);
@@ -219,7 +224,7 @@ class LyhImportTest extends Command
                     'product_id'=>$id,
                     'product_id'=>$id,
                     'column_id'=>1,
                     'column_id'=>1,
                     'text_type'=>1,
                     'text_type'=>1,
-                    'content'=>json_encode(['content'=>$val[7]])
+                    'content'=>json_encode(['content'=>$val[7]],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
                 ];
                 ];
                 $detailModel->addReturnId($detail);
                 $detailModel->addReturnId($detail);
             }
             }
@@ -231,7 +236,7 @@ class LyhImportTest extends Command
                     'product_id'=>$id,
                     'product_id'=>$id,
                     'column_id'=>1,
                     'column_id'=>1,
                     'text_type'=>1,
                     'text_type'=>1,
-                    'content'=>json_encode(['content'=>$val[8]])
+                    'content'=>json_encode(['content'=>$val[8]],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
                 ];
                 ];
                 $detailModel->addReturnId($detail);
                 $detailModel->addReturnId($detail);
             }
             }
@@ -249,12 +254,9 @@ class LyhImportTest extends Command
                             'product_id'=>$id,
                             'product_id'=>$id,
                             'column_id'=>1,
                             'column_id'=>1,
                             'text_type'=>1,
                             'text_type'=>1,
-                            'content'=>json_encode(['content'=>$faqContent])
+                            'content'=>json_encode(['content'=>$faqContent],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
                         ];
                         ];
                         $detailModel->addReturnId($detailFaqInfo);
                         $detailModel->addReturnId($detailFaqInfo);
-                    }else{
-                        @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 .'SEOQandA数据有问题：' . $val[9].PHP_EOL;
                     }
                     }
                 }catch(\Exception $e){
                 }catch(\Exception $e){
                     echo 'fqs';
                     echo 'fqs';
@@ -277,9 +279,6 @@ class LyhImportTest extends Command
                             'content'=>json_encode(['content'=>$faqContent])
                             'content'=>json_encode(['content'=>$faqContent])
                         ];
                         ];
                         $detailModel->addReturnId($detailFaqInfo);
                         $detailModel->addReturnId($detailFaqInfo);
-                    }else{
-                        @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].PHP_EOL;
                     }
                     }
                 }catch(\Exception $e){
                 }catch(\Exception $e){
                     continue;
                     continue;