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

lyh
app/Console/Commands/Import/ProjectImport.php
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
app/Http/Logic/Bside/BaseLogic.php
app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsCategoryLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Http/Logic/Bside/Product/CategoryLogic.php
app/Http/Logic/Bside/Product/KeywordLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
--- a/app/Console/Commands/Import/ProjectImport.php
查看文件 @17b582e
+++ b/app/Console/Commands/Import/ProjectImport.php
查看文件 @17b582e
@@ -183,7 +183,7 @@ class ProjectImport extends Command
     protected function get_code_type($file)
     {
         $list = array('GBK', 'UTF-8');
-        $str = file_get_contents($file);
+        $str = curl_c($file,false);
         foreach ($list as $item) {
             $tmp = mb_convert_encoding($str, $item, $item);
             if (md5($tmp) == md5($str)) {
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @17b582e
@@ -379,7 +379,7 @@ class BTemplateLogic extends BaseLogic
             }
         }
         $this->addUpdateNotify($type,$route);
-        return $this->curlDelRoute($route);
+        return $this->curlDelRoute(['route'=>$route,'new_route'=>$route]);
     }
     /**
--- a/app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
查看文件 @17b582e
@@ -113,7 +113,7 @@ class CustomTemplateLogic extends BaseLogic
         }
         //通知
         $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$info['url']);
-        $this->curlDelRoute($info['url']);
+        $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$info['url']]);
         return $this->success();
     }
@@ -213,7 +213,7 @@ class CustomTemplateLogic extends BaseLogic
         }
         if($info['url'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
-            $this->curlDelRoute($info['url']);
+            $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
         }
         return true;
     }
@@ -259,7 +259,7 @@ class CustomTemplateLogic extends BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id' => $id], ['id', 'url']);
-        $this->curlDelRoute($info['url']);
+        $this->curlDelRoute(['route'=>$info['url']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
查看文件 @17b582e
@@ -357,12 +357,12 @@ class VisualizationLogic extends BaseLogic
                 $newsInfo = $newsModel->read(['id'=>$source_id],['url']);
                 $route = $newsInfo['url'];
             }else{
-                $type = 0;
+                $type = 'all';
                 $route = 'all';
             }
         }
         $this->addUpdateNotify($type,$route);
-        return $this->curlDelRoute($route);
+        return $this->curlDelRoute(['route'=>$route,'new_route'=>$route]);
     }
     /**
--- a/app/Http/Logic/Bside/BaseLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/BaseLogic.php
查看文件 @17b582e
@@ -169,8 +169,10 @@ class BaseLogic extends Logic
      * @method :post
      * @time   :2023/11/30 14:43
      */
-    public function curlDelRoute($route){
-        $url = $this->user['domain'].'api/delHtml/?project_id='.$this->user['project_id'].'&route='.$route;
+    public function curlDelRoute($data){
+        $data['project_id'] = $this->user['project_id'];
+        $str = http_build_query($data);
+        $url = $this->user['domain'].'api/delHtml/?'.$str;
         curlGet($url);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/Blog/BlogCategoryLogic.php
查看文件 @17b582e
@@ -113,7 +113,7 @@ class BlogCategoryLogic extends BaseLogic
         $info = $this->model->read(['id'=>$id],['id','alias']);
         if($info['alias'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
-            $this->curlDelRoute($info['alias']);
+            $this->curlDelRoute(['route'=>$info['alias'],'new_route'=>$route]);
         }
         return true;
     }
@@ -306,7 +306,7 @@ class BlogCategoryLogic extends BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','alias']);
-        $this->curlDelRoute($info['alias']);
+        $this->curlDelRoute(['route'=>$info['alias']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @17b582e
@@ -63,7 +63,7 @@ class BlogLogic extends BaseLogic
         $info = $this->model->read(['id'=>$id],['id','url']);
         if($info['url'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
-            $this->curlDelRoute($info['url']);
+            $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
         }
         return true;
     }
@@ -155,7 +155,7 @@ class BlogLogic extends BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','url']);
-        $this->curlDelRoute($info['url']);
+        $this->curlDelRoute(['route'=>$info['url']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/News/NewsCategoryLogic.php
查看文件 @17b582e
@@ -123,7 +123,7 @@ class NewsCategoryLogic extends BaseLogic
         $info = $this->model->read(['id'=>$id],['id','alias']);
         if($info['alias'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
-            $this->curlDelRoute($info['alias']);
+            $this->curlDelRoute(['route'=>$info['alias'],'new_route'=>$route]);
         }
         return true;
     }
@@ -287,7 +287,7 @@ class NewsCategoryLogic extends BaseLogic
         //删除路由映射
         RouteMap::delRoute(RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
         $info = $this->model->read(['id'=>$id],['id','alias']);
-        $this->curlDelRoute($info['alias']);
+        $this->curlDelRoute(['route'=>$info['alias']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @17b582e
@@ -95,7 +95,7 @@ class NewsLogic extends BaseLogic
         $info = $this->model->read(['id' => $id], ['id', 'url']);
         if ($info['url'] != $route) {
             $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
-            $this->curlDelRoute($info['url']);
+            $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
         }
         return true;
     }
@@ -267,7 +267,7 @@ class NewsLogic extends BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id' => $id], ['id', 'url']);
-        $this->curlDelRoute($info['url']);
+        $this->curlDelRoute(['route'=>$info['url']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @17b582e
@@ -233,7 +233,7 @@ class CategoryLogic extends  BaseLogic
         $info = $this->model->read(['id'=>$id],['id','route']);
         if($info['route'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
-            $this->curlDelRoute($info['route']);
+            $this->curlDelRoute(['route'=>$info['route'],'new_route'=>$route]);
         }
         return true;
     }
@@ -278,7 +278,7 @@ class CategoryLogic extends  BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute($info['route']);
+        $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Product/KeywordLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/Product/KeywordLogic.php
查看文件 @17b582e
@@ -185,7 +185,7 @@ class KeywordLogic extends  BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute($info['route']);
+        $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @17b582e
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @17b582e
@@ -294,7 +294,7 @@ class ProductLogic extends  BaseLogic
         $info = $this->model->read(['id'=>$id]);
         if($info['route'] != $route){
             $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
-            $this->curlDelRoute($info['route']);
+            $this->curlDelRoute(['route'=>$info['route'],'new_route'=>$route]);
         }
         return $route;
     }
@@ -341,7 +341,7 @@ class ProductLogic extends  BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute($info['route']);
+        $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
     }
@@ -648,6 +648,32 @@ class ProductLogic extends  BaseLogic
                 'description' => $data[10]??''
             ];
+            //处理描述切换栏
+            $describe = [];
+            if($data[11]){
+                //处理描述切换栏中的图片
+                $describe = json_decode($data[11],true);
+
+                foreach ($describe as &$v_desc){
+
+                    preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $v_desc['text'], $result_desc);
+
+                    if($result_desc[2]??[]){
+                        foreach ($result_desc[2] as $vdesc_img){
+                            $v_desc['text'] = str_replace($vdesc_img,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vdesc_img)),$v_desc['text']);
+                        }
+                    }
+
+                    //处理描述切换栏中的视频
+                    preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $v_desc['text'], $result_desc_video);
+                    if($result_desc_video[2]??[]){
+                        foreach ($result_desc_video[2] as $vdesc_video){
+                            $v_desc['text'] = str_replace($vdesc_video,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vdesc_video)),$v_desc['text']);
+                        }
+                    }
+                }
+            }
+
             $id = $this->model->addReturnId(
                 [
                     'project_id' => $project_id,
@@ -659,6 +685,7 @@ class ProductLogic extends  BaseLogic
                     'keyword_id' => $keyword_id,
                     'intro' => $intro,
                     'content' => $content,
+                    'describe' => Arr::a2s($describe),
                     'seo_mate' => Arr::a2s($seo_mate),
                     'created_uid' => $user_id,
                     'status' => Product::STATUS_ON