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

lyh
app/Console/Commands/Import/ProjectImport.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Services/CosService.php
--- a/app/Console/Commands/Import/ProjectImport.php
查看文件 @832d21b
+++ b/app/Console/Commands/Import/ProjectImport.php
查看文件 @832d21b
@@ -50,6 +50,18 @@ class ProjectImport extends Command
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import start' . PHP_EOL;
+        $is_gbk = 0;
+        $file_code_type = $this->get_code_type($task->file_url);
+        if ($file_code_type === false) {
+            echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import fail, error: 文件编码格式错误' . PHP_EOL;
+            $task->status = ImportTask::STATUS_COM;//导入完成
+            $task->save();
+            return true;
+        } elseif ($file_code_type === 'GBK') {
+            $is_gbk = 1;
+            setlocale(LC_ALL, 'zh_CN');
+        }
+
         //读取csv文件
         $line_of_text = [];
         try {
@@ -67,7 +79,6 @@ class ProjectImport extends Command
         $total_count = 0; //总条数
         $success_count = 0;  //成功导入条数
-        setlocale(LC_ALL,'zh_CN');
         if (count($line_of_text) > 1) {
             $task->status = ImportTask::STATUS_ING;//导入中
             $task->save();
@@ -78,9 +89,11 @@ class ProjectImport extends Command
                 foreach ($line_of_text as $k => $v) {
                     if ($k > 0 && isset($v[0]) && $v[0]) {
-                        foreach ($v as $kk=>$vv){
+                        if ($is_gbk) {
+                            foreach ($v as $kk => $vv) {
                                 $v[$kk] = mb_convert_encoding($vv, 'utf-8', 'gbk');
                             }
+                        }
                         $total_count += 1;
                         try {
@@ -109,11 +122,25 @@ class ProjectImport extends Command
         $task->status = ImportTask::STATUS_COM;//导入完成
         $task->total_count = $total_count;
-        $task->success_count = $success_count;
+        $task->success_count += $success_count;
         $task->save();
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL;
         sleep(2);
     }
+
+    //判断编码格式
+    function get_code_type($file)
+    {
+        $list = array('GBK', 'UTF-8');
+        $str = file_get_contents($file);
+        foreach ($list as $item) {
+            $tmp = mb_convert_encoding($str, $item, $item);
+            if (md5($tmp) == md5($str)) {
+                return $item;
+            }
+        }
+        return false;
+    }
 }
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @832d21b
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @832d21b
@@ -270,6 +270,9 @@ class BlogLogic extends BaseLogic
      */
     public function importBlog($project_id, $user_id, $data)
     {
+        $blog = $this->model->read(['name' => $data[0]]);
+        if (!$blog) {
+
             $category_id = '';
             if ($data[2]) {
                 //处理分类
@@ -277,8 +280,6 @@ class BlogLogic extends BaseLogic
                 $category_id = $blogCategoryLogic->importBlogCategory($project_id, $user_id, $data[2]);
             }
-        $blog = $this->model->read(['name' => $data[0]]);
-        if (!$blog) {
             $id = $this->model->addReturnId(
                 [
                     'name' => $data[0],
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @832d21b
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @832d21b
@@ -269,6 +269,9 @@ class NewsLogic extends BaseLogic
      */
     public function importNews($project_id, $user_id, $data)
     {
+        $news = $this->model->read(['name' => $data[0]]);
+        if (!$news) {
+
             $category_id = '';
             if ($data[2]) {
                 //处理分类
@@ -276,8 +279,6 @@ class NewsLogic extends BaseLogic
                 $category_id = $newsCategoryLogic->importNewsCategory($project_id, $user_id, $data[2]);
             }
-        $news = $this->model->read(['name' => $data[0]]);
-        if (!$news) {
             $id = $this->model->addReturnId(
                 [
                     'name' => $data[0],
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @832d21b
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @832d21b
@@ -381,6 +381,9 @@ class ProductLogic extends  BaseLogic
      */
     public function importProduct($project_id, $user_id, $data)
     {
+        $product = $this->model->read(['title' => $data[0]]);
+        if (!$product) {
+
             $category_id = '';
             if ($data[2]) {
                 //处理分类
@@ -419,6 +422,31 @@ class ProductLogic extends  BaseLogic
                 }
             }
+            $intro = '';
+            if($data[5]){
+                //处理短描述中的图片
+                $pattern = '<img src="(.*?)">';
+                preg_match_all($pattern, $data[5], $result_intro);
+                if($result_intro[1]){
+                    foreach ($result_intro[1] as $vi_img){
+                        $data[5] = str_replace($vi_img,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vi_img)),$data[5]);
+                    }
+                }
+                $intro = $data[5];
+            }
+
+            $content = '';
+            if($data[6]){
+                //处理内容中的图片
+                $pattern = '<img src="(.*?)">';
+                preg_match_all($pattern, $data[6], $result_content);
+                if($result_content[1]){
+                    foreach ($result_content[1] as $vc_img){
+                        $data[6] = str_replace($vc_img,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vc_img)),$data[6]);
+                    }
+                }
+                $content = $data[6];
+            }
             //处理seo
             $seo_mate = [
@@ -427,19 +455,17 @@ class ProductLogic extends  BaseLogic
                 'description' => $data[10]??''
             ];
-        $product = $this->model->read(['title' => $data[0]]);
-        if (!$product) {
             $id = $this->model->addReturnId(
                 [
                     'project_id' => $project_id,
                     'title' => $data[0],
                     'thumb' => $thumb,
                     'gallery' => Arr::a2s($gallery),
-                    'attrs' => $data[4] ? $data[4] : Arr::a2s([]),
+                    'attrs' => trim($data[4]) ? $data[4] : Arr::a2s([]),
                     'category_id' => $category_id,
                     'keyword_id' => $keyword_id,
-                    'intro' => $data[5] ?? '',
-                    'content' => $data[6] ?? '',
+                    'intro' => $intro,
+                    'content' => $content,
                     'seo_mate' => Arr::a2s($seo_mate),
                     'created_uid' => $user_id,
                     'status' => Product::STATUS_ON
--- a/app/Services/CosService.php
查看文件 @832d21b
+++ b/app/Services/CosService.php
查看文件 @832d21b
@@ -74,7 +74,6 @@ class CosService
      */
     public static function uploadRemote($project_id,$image_type,$file_url)
     {
-        return '';
         $ext = explode('.',$file_url);
         $filename = uniqid().rand(10000,99999).'.'.end($ext);