Merge remote-tracking branch 'origin/master' into akun

+<?php
+/**
+ * @remark :
+ * @name   :ReplaceHtml.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/10 17:20
+ */
+
+namespace App\Console\Commands\ReplaceHtml;
+
+use App\Models\Template\BTemplate;
+use App\Models\Template\TemplateReplaceHtmlLog;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use App\Models\Template\TemplateReplaceHtml;
+
+class ReplaceHtml extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'replace_html';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '替换html代码生成子任务';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * @return bool
+     */
+    public function handle()
+    {
+        while (true){
+            $replaceHtmlModel = new TemplateReplaceHtml();
+            $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
+            if(!empty($replaceHtmlList)){
+                foreach ($replaceHtmlList as $k => $v){
+                    ProjectServer::useProject($v['project_id']);
+                    echo '开始,任务id:'.$v['id'].PHP_EOL;
+                    $this->createReplaceHtmlLog($v);
+                    //修改当前主任务状态为待执行
+                    $replaceHtmlModel->edit(['status'=>$replaceHtmlModel::STATUS_START],['id'=>$v['id']]);
+                    echo '结束'.PHP_EOL;
+                    DB::disconnect('custom_mysql');
+                }
+            }
+            sleep(5);
+            return true;
+        }
+    }
+
+    /**
+     * @remark :生成子任务
+     * @name   :createReplaceHtmlLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/10 17:26
+     */
+    public function createReplaceHtmlLog($info){
+        //获取当前页面所有数据
+        $saveData = [];
+        $bTemplateModel = new BTemplate();
+        $condition = ['source'=>$info['source'],'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
+        $bTemplateList = $bTemplateModel->list($condition,'id',['id']);
+        foreach ($bTemplateList as $v){
+            $saveData[] = [
+                'replace_id'=>$info['id'],
+                'project_id'=>$info['project_id'],
+                'status'=>0,
+                'old_html'=>$info['old_html'],
+                'html'=>$info['html'],
+                'source'=>$info['source'],
+                'source_id'=>$v['id'],
+                'is_custom'=>$info['is_custom'],
+                'is_list'=>$info['is_list'],
+                'created_at'=>date('Y-m-d H:i:s'),
+                'updated_at'=>date('Y-m-d H:i:s')
+            ];
+        }
+        if(!empty($saveData)){
+            $templateHtmlLogModel = new TemplateReplaceHtmlLog();
+            $templateHtmlLogModel->insert($saveData);
+        }
+        return true;
+    }
+
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :ReplaceHtmlLog.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/10 17:53
+ */
+
+namespace App\Console\Commands\ReplaceHtml;
+
+use App\Models\Template\BTemplate;
+use App\Models\Template\TemplateReplaceHtml;
+use App\Models\Template\TemplateReplaceHtmlLog;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class ReplaceHtmlLog extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'replace_html_log';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '替换html代码';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * @return bool
+     */
+    public function handle()
+    {
+        while (true){
+            $replaceHtmlModel = new TemplateReplaceHtml();
+            $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS_START]);
+            foreach ($replaceHtmlList as $value){
+                echo '开始主任务id:'.$value['id'].PHP_EOL;
+                $replaceHtmlLogModel = new TemplateReplaceHtmlLog();
+                $replaceHtmlLogList = $replaceHtmlLogModel->list(['replace_id'=>$value['id'],'status'=>$replaceHtmlLogModel::STATUS]);
+                ProjectServer::useProject($value['project_id']);
+                foreach ($replaceHtmlLogList as $v){
+                    echo date('Y-m-d H:i:s') . '子任务id :'.$v['id'] . PHP_EOL;
+                    $this->replaceHtml($v);
+                    $replaceHtmlLogModel->edit(['status'=>$replaceHtmlLogModel::STATUS_END],['id'=>$v['id']]);
+                }
+                DB::disconnect('custom_mysql');
+                //修改当前主任务状态为待执行
+                $replaceHtmlModel->edit(['status'=>$replaceHtmlModel::STATUS_END],['id'=>$value['id']]);
+                echo '结束'.PHP_EOL;
+            }
+        }
+        sleep(5);
+        return true;
+    }
+
+    /**
+     * @remark :替换html
+     * @name   :replaceHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/10 17:56
+     */
+    public function replaceHtml($info){
+        $bTemplateModel = new BTemplate();
+        $condition = ['source'=>$info['source'],'source_id'=>$info['source_id'],
+            'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
+        $old_html = $info['old_html'];
+        $html = $info['html'];
+        if($info['template_id'] == 0){
+            $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
+        }else{
+            $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, '$old_html', '$html')")]);
+        }
+        return true;
+    }
+}

@@ -53,7 +53,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>775]);
+        $list = $projectModel->list(['id'=>688]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

+<?php
+/**
+ * @remark :
+ * @name   :V6UpdateLogController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/9 16:04
+ */
+
+namespace App\Http\Controllers\Aside\Com;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Com\V6UpdateLogLogic;
+use App\Models\Com\V6UpdateLog;
+
+class V6UpdateLogController extends BaseController
+{
+    /**
+     * @remark :更新日志
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 16:05
+     */
+    public function lists(V6UpdateLog $logModel){
+        $lists = $logModel->lists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :保存数据
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 16:23
+     */
+    public function save(V6UpdateLogLogic $logic){
+        $this->request->validate([
+            'version_id' => 'required',
+            'remark' => 'required',
+            'updated_date' => 'required',
+        ], [
+            'version_id.required' => '版本号version_id不能为空',
+            'remark.required' => '更新内容不能为空',
+            'updated_date.required' => '更新时间不能为空',
+        ]);
+        $data = $logic->saveV6UpdateLog();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :删除数据
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 16:30
+     */
+    public function del(V6UpdateLogLogic $logic){
+        $this->request->validate([
+            'id' => 'required',
+        ], [
+            'id.required' => 'id不能为空',
+        ]);
+        $logic->delV6UpdateLog();
+        $this->response('success');
+    }
+}

@@ -12,14 +12,30 @@ namespace App\Http\Controllers\Aside\Template;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
+use App\Models\Manage\Manage;
+use App\Models\Project\Project;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Models\Template\TemplateReplaceHtmlLog;
-use App\Services\ProjectServer;
-use Illuminate\Support\Facades\DB;
 
 
 class ReplaceHtmlController extends BaseController
 class ReplaceHtmlController extends BaseController
 {
 {
     /**
     /**
+     * @remark :获取所有页面类型
+     * @name   :pageType
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 17:06
+     */
+    public function pageType(ReplaceHtmlLogic $logic){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        $data = $logic->sourceTypeInfo($this->param['project_id']);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+    /**
      * @remark :替换同一种类型的html代码
      * @remark :替换同一种类型的html代码
      * @name   :replaceTemplateMainHtml
      * @name   :replaceTemplateMainHtml
      * @author :lyh
      * @author :lyh
@@ -28,22 +44,18 @@ class ReplaceHtmlController extends BaseController
      */
      */
     public function replaceTemplateMainHtml(ReplaceHtmlLogic $logic){
     public function replaceTemplateMainHtml(ReplaceHtmlLogic $logic){
         $this->request->validate([
         $this->request->validate([
-            'old_html'=>'required',
+            'name'=>'required',
             'html'=>'required',
             'html'=>'required',
-            'type'=>'required',
-            'is_list'=>'required',
-            'is_custom'=>'required',
+            'old_html'=>'required',
             'project_id'=>'required',
             'project_id'=>'required',
         ],[
         ],[
-            'old_html.required' => '需替换的html不能为空',
+            'name.required' => '需替换页面标识不能为空',
             'html.required' => 'html不能为空',
             'html.required' => 'html不能为空',
-            'type.required' => '类型type不能为空',
-            'is_custom.required' => '类型is_custom不能为空',
-            'is_list.required' => '类型is_list不能为空',
+            'old_html.required' => '替换前的html不能为空',
             'project_id.required' => 'project_id不能为空',
             'project_id.required' => 'project_id不能为空',
         ]);
         ]);
-        $logic->replaceHtml();
-        $this->response('success');
+        $data = $logic->replaceTemplateMainHtml();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -53,25 +65,21 @@ class ReplaceHtmlController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/5/8 10:28
      * @time   :2024/5/8 10:28
      */
      */
-    public function replaceTemplateLog(TemplateReplaceHtml $replaceModel){
-        $this->request->validate([
-            'project_id'=>'required',
-        ],[
-            'project_id.required' => 'project_id不能为空',
-        ]);
-        ProjectServer::useProject($this->param['project_id']);
+    public function replaceTemplateLog(TemplateReplaceHtml $replaceModel,ReplaceHtmlLogic $logic){
         $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
-            $templateLogModel = new TemplateReplaceHtmlLog();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]);
+                $v['project_name'] = (new Project())->getProjectName($v['project_id']);
+                $v['operator_name'] = (new Manage())->getName($v['operator_id']);
+                $v['source_name'] =  $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
-        DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
+
+
     /**
     /**
      * @remark :还原
      * @remark :还原
      * @name   :reductionHtml
      * @name   :reductionHtml
@@ -85,7 +93,7 @@ class ReplaceHtmlController extends BaseController
         ],[
         ],[
             'id.required' => 'id不能为空',
             'id.required' => 'id不能为空',
         ]);
         ]);
-        $logic->reductionHtml();
-        $this->response('success');
+        $data = $logic->reductionHtml();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -96,8 +96,8 @@ class BlogCategoryController extends BaseController
      */
      */
     public function save(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
     public function save(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
         $request->validated();
         $request->validated();
-        $blogCategoryLogic->categorySave();
-        $this->response('success');
+        $data = $blogCategoryLogic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 
 

@@ -37,7 +37,8 @@ class BlogController extends BaseController
             $user = new User();
             $user = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
-                $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_BLOG,$v['id']);
+                $v['route'] = $v['url'];
+                $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_BLOG,$v['id']);;
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_BLOG,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_BLOG,BTemplate::IS_DETAIL,$template_id,$v['id']);
@@ -198,8 +199,8 @@ class BlogController extends BaseController
      */
      */
     public function save(BlogRequest $request,BlogLogic $blogLogic){
     public function save(BlogRequest $request,BlogLogic $blogLogic){
         $request->validated();
         $request->validated();
-        $blogLogic->blogSave();
-        $this->response('success');
+        $data = $blogLogic->blogSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -30,8 +30,8 @@ class BlogLabelController extends BaseController
      */
      */
     public function add(BlogLabelRequest $request,BlogLabelLogic $blogLabelLogic){
     public function add(BlogLabelRequest $request,BlogLabelLogic $blogLabelLogic){
         $request->validated();
         $request->validated();
-        $blogLabelLogic->add_blog_label();
-        $this->response('success');
+        $data = $blogLabelLogic->add_blog_label();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -63,8 +63,8 @@ class BlogLabelController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $blogLabelLogic->edit_blog_label();
-        $this->response('success');
+        $data = $blogLabelLogic->edit_blog_label();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -135,8 +135,8 @@ class CustomModuleCategoryController extends BaseController
             'module_id.required' => '所选模块id不能为空',
             'module_id.required' => '所选模块id不能为空',
             'pid.required' => '上级不能为空'
             'pid.required' => '上级不能为空'
         ]);
         ]);
-        $logic->categorySave();
-        $this->response('success');
+        $data = $logic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -204,8 +204,8 @@ class CustomModuleContentController extends BaseController
             'route.required' => '分类路由不能为空',
             'route.required' => '分类路由不能为空',
             'module_id.required' => '所选模块id不能为空'
             'module_id.required' => '所选模块id不能为空'
         ]);
         ]);
-        $logic->contentSave();
-        $this->response('success');
+        $data = $logic->contentSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -264,7 +264,7 @@ class CustomModuleContentController extends BaseController
      * @time   :2024/4/28 16:31
      * @time   :2024/4/28 16:31
      */
      */
     public function copyModuleContent(CustomModuleContentLogic $logic){
     public function copyModuleContent(CustomModuleContentLogic $logic){
-        $logic->copyModuleContentInfo();
-        $this->response('success');
+        $data = $logic->copyModuleContentInfo();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -67,8 +67,8 @@ class CustomModuleController extends BaseController
         ],[
         ],[
             'name.required' => '模块名称不能为空',
             'name.required' => '模块名称不能为空',
         ]);
         ]);
-        $logic->customModuleSave();
-        $this->response('success');
+        $data = $logic->customModuleSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -85,8 +85,8 @@ class NavController extends BaseController
      */
      */
     public function save(NavRequest $request,NavLogic $logic){
     public function save(NavRequest $request,NavLogic $logic){
         $request->validated();
         $request->validated();
-        $logic->navSave();
-        $this->response('success');
+        $data = $logic->navSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 
 

@@ -96,8 +96,8 @@ class NewsCategoryController extends BaseController
      */
      */
     public function save(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
     public function save(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
         $request->validated();
         $request->validated();
-        $newsCategoryLogic->newsCategorySave();
-        $this->response('success');
+        $data = $newsCategoryLogic->newsCategorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -41,6 +41,7 @@ class NewsController extends BaseController
             $user = new User();
             $user = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
+                $v['route'] = $v['url'];
                 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']);
                 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
@@ -190,8 +191,8 @@ class NewsController extends BaseController
      */
      */
     public function save(NewsRequest $newsRequest,NewsLogic $newsLogic){
     public function save(NewsRequest $newsRequest,NewsLogic $newsLogic){
         $newsRequest->validated();
         $newsRequest->validated();
-        $newsLogic->newsSave();
-        $this->response('success');
+        $data = $newsLogic->newsSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
 
 

@@ -126,8 +126,8 @@ class CategoryController extends BaseController
     public function save(CategoryRequest $request, CategoryLogic $logic)
     public function save(CategoryRequest $request, CategoryLogic $logic)
     {
     {
         $request->validated();
         $request->validated();
-        $logic->categorySave();
-        $this->response('success');
+        $data = $logic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -378,8 +378,8 @@ class ProductController extends BaseController
     public function save(ProductRequest $request, ProductLogic $logic)
     public function save(ProductRequest $request, ProductLogic $logic)
     {
     {
         $request->validated();
         $request->validated();
-        $logic->productSave();
-        $this->response('success');
+        $data = $logic->productSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**
@@ -574,8 +574,8 @@ class ProductController extends BaseController
             $contents .= $pre_suf_array['prefix_title'][0].' '.implode(', ',$tm_ky).', '.$pre_suf_array['suffix_l'][0]."\r\n";
             $contents .= $pre_suf_array['prefix_title'][0].' '.implode(', ',$tm_ky).', '.$pre_suf_array['suffix_l'][0]."\r\n";
             $new_content = htmlentities($contents);
             $new_content = htmlentities($contents);
         }
         }
-        if (FALSE == empty($data['new_content'])){
-            $productInfo['describe'] = $new_content . $productInfo['$data'];
+        if (!empty($new_content)){
+            $productInfo['content'] = $new_content . $productInfo['content'];
         }
         }
         $this->response('success',Code::SUCCESS,$productInfo);
         $this->response('success',Code::SUCCESS,$productInfo);
     }
     }

@@ -74,8 +74,8 @@ class CustomTemplateController extends BaseController
      */
      */
     public function save(CustomTemplateRequest $customTemplateRequest,CustomTemplateLogic $customTemplateLogic){
     public function save(CustomTemplateRequest $customTemplateRequest,CustomTemplateLogic $customTemplateLogic){
         $customTemplateRequest->validated();
         $customTemplateRequest->validated();
-        $customTemplateLogic->customTemplateSave();
-        $this->response('success');
+        $data = $customTemplateLogic->customTemplateSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

+<?php
+/**
+ * @remark :
+ * @name   :V6UpdateLogLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/9 16:06
+ */
+
+namespace App\Http\Logic\Aside\Com;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Com\V6UpdateLog;
+
+class V6UpdateLogLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new V6UpdateLog();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :保存数据
+     * @name   :saveV6UpdateLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 16:25
+     */
+    public function saveV6UpdateLog(){
+        $this->param['operator_id'] = $this->manager['id'];
+        try {
+            if(isset($this->param['id']) && !empty($this->param['id'])){
+                $id = $this->param['id'];
+                $this->model->edit($this->param,['id'=>$id]);
+            }else{
+                $id = $this->model->addReturnId($this->param);
+            }
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
+        }
+        return $this->success(['id'=>$id]);
+    }
+
+    /**
+     * @remark :删除更新记录
+     * @name   :delV6UpdateLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 16:32
+     */
+    public function delV6UpdateLog(){
+        try {
+            $this->model->del($this->param);
+        }catch (\Exception $e){
+            $this->fail('删除失败，请联系管理员');
+        }
+        return $this->success();
+    }
+}

@@ -10,7 +10,10 @@
 namespace App\Http\Logic\Aside\Template;
 namespace App\Http\Logic\Aside\Template;
 
 
 use App\Http\Logic\aside\BaseLogic;
 use App\Http\Logic\aside\BaseLogic;
+use App\Http\Logic\Aside\Project\ProjectLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -26,32 +29,122 @@ class ReplaceHtmlLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 18:03
+     */
+    public function getTemplateId($typeInfo){
+        //获取当前template_id
+        $bSettingModel = new Setting();
+        $templateInfo = $bSettingModel->read(['project_id'=>$this->param['project_id']]);
+        if($templateInfo === false){
+            $this->fail('请先选择模版');
+        }
+        $template_id = $templateInfo['template_id'];
+        if($typeInfo['is_custom'] == 1){//扩展模块
+            return $this->getCustomTemplateId($typeInfo,$template_id);
+        }
+        //获取当前项目详情
+        $projectInfo = (new ProjectLogic())->getProjectInfo($this->param['project_id']);
+        //查看当前页面是否为定制
+        if($projectInfo['is_customized'] == BTemplate::IS_VISUALIZATION) {//定制项目
+            $type = $this->getCustomizedType($typeInfo['source'], $typeInfo['is_list']);//获取定制界面类型
+            //查看当前页面是否定制，是否开启可视化
+            $page_array = (array)$projectInfo['is_visualization']->page_array;//获取所有定制界面
+            if (in_array($type, $page_array)) {//当前页面是定制界面
+                $template_id = 0;
+            }
+        }
+        return $this->success($template_id);
+    }
+
+    /**
+     * @remark :获取扩展模块的templateId
+     * @name   :getCustomTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/10 14:53
+     */
+    public function getCustomTemplateId($typeInfo,$template_id){
+        $customModuleModel = new CustomModule();
+        $moduleInfo = $customModuleModel->read(['id'=>$typeInfo['type']],['list_customized','detail_customized']);
+        if($moduleInfo === false){
+            $this->fail('当前扩展模块不存在或已被删除');
+        }
+        if($typeInfo['is_list'] == 1 && $moduleInfo['list_customized'] == 1){
+            $template_id = 0;
+        }
+        if($typeInfo['is_list'] == 0 && $moduleInfo['detail_customized'] == 1){
+            $template_id = 0;
+        }
+        return $this->success($template_id);
+    }
+
+    /**
+     * @remark :定制页面头部类型---根据source获取type类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/16 11:20
+     */
+    public function getCustomizedType($source,$is_list){
+        $type = BTemplate::TYPE_HOME;
+        if($source == BTemplate::SOURCE_PRODUCT){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_PRODUCT_LIST;
+            }else{
+                $type = BTemplate::TYPE_PRODUCT_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_BLOG){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_BLOG_LIST;
+            }else{
+                $type = BTemplate::TYPE_BLOG_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_NEWS){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_NEWS_LIST;
+            }else{
+                $type = BTemplate::TYPE_NEWS_DETAIL;
+            }
+        }
+        return $type;
+    }
+
+    /**
      * @remark :替换可视化的html代码（按类型）
      * @remark :替换可视化的html代码（按类型）
      * @name   :replaceHtml
      * @name   :replaceHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2024/5/7 15:52
      * @time   :2024/5/7 15:52
      */
      */
-    public function replaceHtml(){
+    public function replaceTemplateMainHtml(){
+        $data = $this->sourceTypeInfo($this->param['project_id']);
+        $typeInfo = $data[$this->param['name']];
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
-        //TODO::生成一条任务记录
-        $replaceId = $this->saveReplaceHtml($this->param);
-        //查询当前类型所有装修的记录
-        $condition = ['source'=>$this->param['type'],'is_custom'=>$this->param['is_custom'],'is_list'=>$this->param['is_list'],
-            'template_id'=>$this->param['template_id']];
-        $list = $this->model->list($condition);
-        foreach ($list as $v){
-            if($v['type'] == 0){
-                $main_html = str_replace($this->param['old_html'],$this->param['html'],$v['main_html']);
-                $this->model->edit(['main_html'=>$main_html],['id'=>$v['id']]);
-            }else{
-                $html = str_replace($this->param['old_html'],$this->param['html'],$v['html']);
-                $this->model->edit(['html'=>$html],['id'=>$v['id']]);
+        $bTemplateModel = new BTemplate();
+        if($typeInfo['source'] == 0){//所有页面
+            $bSettingModel = new Setting();
+            $templateInfo = $bSettingModel->read(['project_id'=>$this->param['project_id']]);
+            if($templateInfo === false){
+                $this->fail('请先选择模版');
             }
             }
-            $this->saveReplaceHtmlLog($replaceId,$v['id']);
+            $template_id = $templateInfo['template_id'];
+            $condition = ['template_id'=>$template_id,'main_html'=>['like','%'.$this->param['old_html'].'%']];
+            $total_num = $bTemplateModel->formatQuery($condition)->count();
+        }else{
+            $template_id = $this->getTemplateId($typeInfo);
+            $condition = ['source'=>$typeInfo['source'],'is_custom'=>$typeInfo['is_custom'], 'is_list'=>$typeInfo['is_list'],
+                'template_id'=>$template_id,'main_html'=>['like','%'.$this->param['old_html'].'%']];
+            $total_num = $bTemplateModel->formatQuery($condition)->count();
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-        return $this->success();
+        $replaceId = $this->saveReplaceHtml($this->param,$typeInfo,$template_id,$total_num);
+        return $this->success(['id'=>$replaceId]);
     }
     }
 
 
     /**
     /**
@@ -61,70 +154,108 @@ class ReplaceHtmlLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2024/5/8 9:23
      * @time   :2024/5/8 9:23
      */
      */
-    public function saveReplaceHtml($data,$template_id){
+    public function saveReplaceHtml($param,$typeInfo,$template_id,$total_num){
         $logData = [
         $logData = [
-            'type'=>$data['type'],
-            'is_custom'=>$data['is_custom'],
-            'is_list'=>$data['is_list'],
+            'source'=>$typeInfo['source'],
+            'is_custom'=>$typeInfo['is_custom'],
+            'is_list'=>$typeInfo['is_list'],
             'template_id'=>$template_id,
             'template_id'=>$template_id,
-            'old_html'=>$data['old_html'],
-            'html'=>$data['html'],
+            'status'=>$this->model::STATUS,
+            'old_html'=>$param['old_html'],
+            'html'=>$param['html'],
+            'project_id'=>$param['project_id'],
+            'total_num'=>$total_num,
+            'operator_id'=>$this->manager['id']
         ];
         ];
         return $this->model->addReturnId($logData);
         return $this->model->addReturnId($logData);
     }
     }
 
 
     /**
     /**
-     * @remark :保存每条替换记录
-     * @name   :saveReplaceHtmlLog
+     * @remark :生成还原记录
+     * @name   :reductionHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/8 10:35
+     */
+    public function reductionHtml(){
+        $info = $this->model->read(['id'=>$this->param['id'],'status'=>$this->model::STATUS_END]);
+        if($info === false){
+            $this->fail('当前数据不存在');
+        }
+        if($info['source'] == 0){//当前数据是替换的所有页面
+            $data = $this->sourceTypeInfo($info['project_id']);
+            $typeInfo = $data[$this->param['name']];
+            if($typeInfo['source'] != 0){//回滚页面
+                $info['source'] = $typeInfo['source'];
+                $info['is_custom'] = $typeInfo['is_custom'];
+                $info['is_list'] = $typeInfo['is_list'];
+                $replaceId = $this->saveResultReplaceHtml($info);
+                return $this->success(['id'=>$replaceId]);
+            }
+        }
+        $replaceId = $this->saveResultReplaceHtml($info);
+        return $this->success(['id'=>$replaceId]);
+    }
+
+    /**
+     * @remark :保存还原的html
+     * @name   :saveResultReplaceHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2024/5/8 9:37
+     * @time   :2024/5/10 10:01
      */
      */
-    public function saveReplaceHtmlLog($replace_id,$replace_template_id){
+    public function saveResultReplaceHtml($info){
         $logData = [
         $logData = [
-            'replace_id'=>$replace_id,
-            'replace_template_id'=>$replace_template_id,
-            'uid'=>$this->user['manager_id'],
+            'source'=>$info['source'],
+            'is_custom'=>$info['is_custom'],
+            'is_list'=>$info['is_list'],
+            'template_id'=>$info['template_id'],
+            'status'=>$this->model::STATUS,
+            'old_html'=>$info['html'],
+            'html'=>$info['old_html'],
+            'project_id'=>$info['project_id'],
+            'is_rollback'=>1,
+            'rollback_id'=>$info['id'],
+            'operator_id'=>$this->manager['id']
         ];
         ];
-        $replaceHtmlModel = new TemplateReplaceHtmlLog();
-        return $replaceHtmlModel->add($logData);
+        return $this->model->addReturnId($logData);
     }
     }
 
 
     /**
     /**
-     * @remark :还原所有记录
-     * @name   :reductionHtml
+     * @remark :替换类型
+     * @name   :sourceTypeInfo
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2024/5/8 10:35
+     * @time   :2024/5/9 17:15
      */
      */
-    public function reductionHtml(){
-        ProjectServer::useProject($this->param['project_id']);
-        //获取当前数据详情
-        $info = $this->model->read(['id'=>$this->param['id']]);
-        if($info === false){
-            $this->fail('当前数据不存在');
-        }
-        $replaceLogModel = new TemplateReplaceHtmlLog();
-        $logList = $replaceLogModel->list(['replace_id'=>$this->param['id']]);
-        $replaceArr = [];
-        foreach ($logList as $v){
-            $replaceArr[] = $v['replace_template_id'];
+    public function sourceTypeInfo($project_id){
+        $data = $this->model->sourceType();
+        ProjectServer::useProject($project_id);
+        $customModule = new CustomModule();
+        $moduleList = $customModule->list(['project_id'=>$project_id],'id',['id','name']);
+        foreach ($moduleList as $value){
+            $data[$value['name'].'详情'] = ['source'=>$value['id'],'is_list'=>0,'is_custom'=>1];
+            $data[$value['name'].'列表'] = ['source'=>$value['id'],'is_list'=>1,'is_custom'=>1];
         }
         }
-        if(!empty($replaceArr)){
-            //查询可视化数据
-            $bTemplateModel = new BTemplate();
-            $templateList = $bTemplateModel->list(['id'=>['in',$replaceArr]]);
-            foreach ($templateList as $value){
-                if($v['type'] == 0){
-                    $main_html = str_replace($info['html'],$info['old_html'],$value['main_html']);
-                    $this->model->edit(['main_html'=>$main_html],['id'=>$v['id']]);
-                }else{
-                    $html = str_replace($info['html'],$info['old_html'],$value['html']);
-                    $this->model->edit(['html'=>$html],['id'=>$v['id']]);
-                }
+        DB::disconnect('custom_mysql');
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :根据类型获取名称
+     * @name   :getSourceName
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/10 16:55
+     */
+    public function getSourceName($source,$is_list,$is_custom,$project_id){
+        $arr = ['source'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom];
+        $data = $this->sourceTypeInfo($project_id);
+        foreach ($data as $k => $v){
+            if($v == $arr){
+                return $this->success($k);
             }
             }
         }
         }
-        DB::disconnect('custom_mysql');
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -65,13 +65,14 @@ class CustomTemplateLogic extends BaseLogic
     public function customTemplateSave(){
     public function customTemplateSave(){
         $this->param['url'] = str_replace_url($this->param['url']);
         $this->param['url'] = str_replace_url($this->param['url']);
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
             $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示
             $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示
             if($is_upgrade == 0 || $six_read == 1) {
             if($is_upgrade == 0 || $six_read == 1) {
-                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $this->param['id'], $this->user['project_id']);
+                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
             }
             }
             $this->editCustomRoute($this->param['url']);
             $this->editCustomRoute($this->param['url']);
-            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+            $rs = $this->model->edit($this->param,['id'=>$id]);
         }else{
         }else{
             if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
             if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
                 $this->fail('404页面已存在');
                 $this->fail('404页面已存在');
@@ -85,7 +86,7 @@ class CustomTemplateLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('保存失败，请联系管理员');
             $this->fail('保存失败，请联系管理员');
         }
         }
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**

@@ -36,10 +36,11 @@ class BlogCategoryLogic extends BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']);
+                $id = $this->param['id'];
+                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
                 $route = $this->param['alias'];
                 $route = $this->param['alias'];
                 $this->param['operator_id'] = $this->user['id'];
                 $this->param['operator_id'] = $this->user['id'];
-                $this->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
             }else{
                 //路由拼接
                 //路由拼接
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
@@ -58,7 +59,7 @@ class BlogCategoryLogic extends BaseLogic
         }
         }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**

@@ -42,11 +42,8 @@ class BlogLabelLogic extends BaseLogic
         $this->param['create_id'] = $this->user['id'];
         $this->param['create_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['project_id'] = $this->user['project_id'];
-        $rs = $this->model->add($this->param);
-        if($rs ===  false){
-            $this->fail('error');
-        }
-        return $this->success();
+        $id = $this->model->addReturnId($this->param);
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -62,7 +59,7 @@ class BlogLabelLogic extends BaseLogic
         if($rs ===  false){
         if($rs ===  false){
             $this->fail('error');
             $this->fail('error');
         }
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
     }
 
 
     /**
     /**

@@ -34,13 +34,14 @@ class BlogLogic extends BaseLogic
         try {
         try {
             $this->param = $this->paramProcessing($this->param);
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
+                $id = $this->param['id'];
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 if($is_upgrade == 0 || $six_read == 1){
                 if($is_upgrade == 0 || $six_read == 1){
-                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                 }
                 }
                 $route = $this->param['url'];
                 $route = $this->param['url'];
-                $this->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
             }else{
                 $this->param['sort'] = $this->setNewsSort();
                 $this->param['sort'] = $this->setNewsSort();
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
@@ -54,7 +55,7 @@ class BlogLogic extends BaseLogic
         }
         }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -402,6 +403,7 @@ class BlogLogic extends BaseLogic
                         $this->model->edit(['category_id'=>$category_ids],['id'=>$id]);
                         $this->model->edit(['category_id'=>$category_ids],['id'=>$id]);
                     }
                     }
                 }
                 }
+                DB::connection('custom_mysql')->commit();
                 //对应添加关联表
                 //对应添加关联表
             }catch (\Exception $e){
             }catch (\Exception $e){
                 DB::connection('custom_mysql')->rollBack();
                 DB::connection('custom_mysql')->rollBack();

@@ -98,11 +98,11 @@ class CustomModuleCategoryLogic extends BaseLogic
     public function categorySave(){
     public function categorySave(){
         $this->param = $this->handleParam($this->param);
         $this->param = $this->handleParam($this->param);
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
-            $this->categoryEdit();
+            $data = $this->categoryEdit();
         }else{
         }else{
-            $this->categoryAdd();
+            $data = $this->categoryAdd();
         }
         }
-        return $this->success();
+        return $this->success($data);
     }
     }
 
 
     /**
     /**
@@ -141,7 +141,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -152,7 +152,6 @@ class CustomModuleCategoryLogic extends BaseLogic
      * @time   :2023/12/5 10:55
      * @time   :2023/12/5 10:55
      */
      */
     public function categoryEdit(){
     public function categoryEdit(){
-
         $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
         $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
             $this->param['id'], $this->user['project_id']);
             $this->param['id'], $this->user['project_id']);
         $this->editRoute($this->param['id'],$route);
         $this->editRoute($this->param['id'],$route);
@@ -160,7 +159,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请连续管理员');
             $this->fail('系统错误，请连续管理员');
         }
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
     }
 
 
     /**
     /**
@@ -262,7 +261,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         $param = $this->setContentParams($info);
         $param = $this->setContentParams($info);
         $save_id = $this->model->insertGetId($param);
         $save_id = $this->model->insertGetId($param);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
-        $this->response('success');
+        $this->success(['id'=>$save_id]);
     }
     }
 
 
     /**
     /**

@@ -121,7 +121,7 @@ class CustomModuleContentLogic extends BaseLogic
         }
         }
         //保存扩展字段
         //保存扩展字段
         $this->saveExtendInfo($id,$extend);
         $this->saveExtendInfo($id,$extend);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -149,7 +149,7 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/12/7 15:04
      * @time   :2023/12/7 15:04
      */
      */
     public function contentAdd(){
     public function contentAdd(){
-        try {
+//        try {
             $this->param['sort'] = $this->setNewsSort();
             $this->param['sort'] = $this->setNewsSort();
             $id = $this->model->addReturnId($this->param);
             $id = $this->model->addReturnId($this->param);
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
@@ -157,9 +157,9 @@ class CustomModuleContentLogic extends BaseLogic
             $this->addUpdateNotify(RouteMap::SOURCE_MODULE,$route);
             $this->addUpdateNotify(RouteMap::SOURCE_MODULE,$route);
             $this->curlDelRoute(['new_route'=>$route]);
             $this->curlDelRoute(['new_route'=>$route]);
             $this->edit(['route' => $route], ['id' => $id]);
             $this->edit(['route' => $route], ['id' => $id]);
-        }catch (\Exception $e){
-            $this->fail('系统错误，请联系管理员');
-        }
+//        }catch (\Exception $e){
+//            $this->fail('系统错误，请联系管理员');
+//        }
         return $id;
         return $id;
     }
     }
 
 
@@ -405,7 +405,7 @@ class CustomModuleContentLogic extends BaseLogic
         $param = $this->setContentParams($info);
         $param = $this->setContentParams($info);
         $save_id = $this->model->insertGetId($param);
         $save_id = $this->model->insertGetId($param);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
-        $this->response('success');
+        return $this->success(['id'=>$save_id]);
     }
     }
 
 
     /**
     /**

@@ -48,11 +48,11 @@ class CustomModuleLogic extends BaseLogic
     public function customModuleSave(){
     public function customModuleSave(){
         $this->param = $this->handleParam($this->param);
         $this->param = $this->handleParam($this->param);
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
-            $this->moduleEdit();
+            $data = $this->moduleEdit();
         }else{
         }else{
-            $this->moduleAdd();
+            $data['id'] = $this->model->addReturnId($this->param);
         }
         }
-        return $this->success();
+        return $this->success($data);
     }
     }
 
 
     /**
     /**
@@ -71,21 +71,6 @@ class CustomModuleLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :新增
-     * @name   :moduleAdd
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/5 9:39
-     */
-    public function moduleAdd(){
-        $rs = $this->model->add($this->param);
-        if($rs === false){
-            $this->fail('系统错误，请联系管理员');
-        }
-        return $this->success();
-    }
-
-    /**
      * @remark :编辑
      * @remark :编辑
      * @name   :moduleEdit
      * @name   :moduleEdit
      * @author :lyh
      * @author :lyh
@@ -97,7 +82,7 @@ class CustomModuleLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
     }
 
 
     /**
     /**

@@ -94,15 +94,16 @@ class NavLogic extends  BaseLogic
         $data['image'] = str_replace_url(isset($this->param['image']) ? $this->param['image'] : '');
         $data['image'] = str_replace_url(isset($this->param['image']) ? $this->param['image'] : '');
         $data['remark_image'] = str_replace_url(isset($this->param['remark_image']) ? $this->param['remark_image'] : '');
         $data['remark_image'] = str_replace_url(isset($this->param['remark_image']) ? $this->param['remark_image'] : '');
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
             $this->handleEditParam();//验证是否可编辑分类
             $this->handleEditParam();//验证是否可编辑分类
-            $this->model->edit($data,['id'=>$this->param['id']]);
+            $this->model->edit($data,['id'=>$id]);
         }else{
         }else{
             $data['project_id'] = $this->user['project_id'];
             $data['project_id'] = $this->user['project_id'];
-            $this->model->add($data);
+            $id = $this->model->addReturnId($data);
         }
         }
         //编辑菜单后,通知更新
         //编辑菜单后,通知更新
         $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all');
         $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all');
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**

@@ -47,10 +47,11 @@ class NewsCategoryLogic extends BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $this->param['id'], $this->user['project_id']);
+                $id = $this->param['id'];
+                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
                 $route = $this->param['alias'];
                 $route = $this->param['alias'];
                 $this->param['operator_id'] = $this->user['id'];
                 $this->param['operator_id'] = $this->user['id'];
-                $this->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
             }else{
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
                     $this->param['alias'] = Translate::tran($this->param['name'], 'en');
                     $this->param['alias'] = Translate::tran($this->param['name'], 'en');
@@ -67,7 +68,7 @@ class NewsCategoryLogic extends BaseLogic
         }
         }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**

@@ -65,14 +65,15 @@ class NewsLogic extends BaseLogic
         try {
         try {
             $this->param = $this->paramProcessing($this->param);
             $this->param = $this->paramProcessing($this->param);
             if (isset($this->param['id']) && !empty($this->param['id'])) {
             if (isset($this->param['id']) && !empty($this->param['id'])) {
+                $id = $this->param['id'];
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 if($is_upgrade == 0 || $six_read == 1) {
                 if($is_upgrade == 0 || $six_read == 1) {
-                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
                 }
                 }
                 //是否更新路由
                 //是否更新路由
                 $route = $this->param['url'];
                 $route = $this->param['url'];
-                $this->edit($this->param, ['id' => $this->param['id']]);
+                $this->edit($this->param, ['id' => $id]);
             } else {
             } else {
                 $this->param['sort'] = $this->setNewsSort();
                 $this->param['sort'] = $this->setNewsSort();
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
@@ -87,7 +88,7 @@ class NewsLogic extends BaseLogic
         }
         }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -227,10 +228,6 @@ class NewsLogic extends BaseLogic
             $str = ','.implode(',',$category).',';
             $str = ','.implode(',',$category).',';
         }
         }
         return $str;
         return $str;
-//        foreach ($category as $v){
-//            $str .= $v.',';
-//        }
-//        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
     }
 
 
     /**
     /**
@@ -444,10 +441,11 @@ class NewsLogic extends BaseLogic
                         $newsInfo = $this->model->read(['id'=>$id],['id','category_id']);
                         $newsInfo = $this->model->read(['id'=>$id],['id','category_id']);
                         $category_ids = explode(',',trim($newsInfo['category_id'],','));
                         $category_ids = explode(',',trim($newsInfo['category_id'],','));
                         $category_ids_arr = array_values(array_unique(array_merge($category_ids,$this->param['category_id'])));
                         $category_ids_arr = array_values(array_unique(array_merge($category_ids,$this->param['category_id'])));
-                        $category_ids = ','.implode(',',$category_ids_arr).',';
-                        $this->model->edit(['category_id'=>$category_ids],['id'=>$id]);
+                        $category_ids_str = ','.implode(',',$category_ids_arr).',';
+                        $this->model->edit(['category_id'=>$category_ids_str],['id'=>$id]);
                     }
                     }
                 }
                 }
+                DB::connection('custom_mysql')->commit();
             }catch (\Exception $e){
             }catch (\Exception $e){
                 DB::connection('custom_mysql')->rollBack();
                 DB::connection('custom_mysql')->rollBack();
                 $this->fail('系统错误，请联系管理员');
                 $this->fail('系统错误，请联系管理员');

@@ -114,29 +114,23 @@ class CategoryLogic extends  BaseLogic
      * @time   :2023/8/21 17:14
      * @time   :2023/8/21 17:14
      */
      */
     public function categorySave(){
     public function categorySave(){
-        DB::beginTransaction();
-        try {
-            $this->param = $this->saveHandleParam($this->param);
-            if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $this->param['id'], $this->user['project_id']);
-                $route = $this->param['route'];
-                $this->model->edit($this->param,['id'=>$this->param['id']]);
-            }else{
-                $this->param['project_id'] = $this->user['project_id'];
-                $id = $this->model->addReturnId($this->param);
-                $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
-                $this->edit(['route'=>$route],['id'=>$id]);
-            }
-            //清除缓存
-            Common::del_user_cache('product_category',$this->user['project_id']);
-            DB::commit();
-        } catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('系统错误，请联系管理员');
+        $this->param = $this->saveHandleParam($this->param);
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
+            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
+            $route = $this->param['route'];
+            $this->model->edit($this->param,['id'=>$id]);
+        }else{
+            $this->param['project_id'] = $this->user['project_id'];
+            $id = $this->model->addReturnId($this->param);
+            $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
+            $this->edit(['route'=>$route],['id'=>$id]);
         }
         }
+        //清除缓存
+        Common::del_user_cache('product_category',$this->user['project_id']);
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**
@@ -147,14 +141,14 @@ class CategoryLogic extends  BaseLogic
      * @time   :2023/12/22 17:28
      * @time   :2023/12/22 17:28
      */
      */
     public function saveHandleParam($param){
     public function saveHandleParam($param){
-        if(isset($this->param['describe_image']) && !empty($this->param['describe_image'])){
-            foreach ($this->param['describe_image'] as $k => $v){
+        if(isset($param['describe_image']) && !empty($param['describe_image'])){
+            foreach ($param['describe_image'] as $k => $v){
                 $v = str_replace_url($v);
                 $v = str_replace_url($v);
-                $this->param['describe_image'][$k] = $v;
+                $param['describe_image'][$k] = $v;
             }
             }
-            $this->param['describe_image'] = json_encode($this->param['describe_image']);
+            $param['describe_image'] = json_encode($param['describe_image']);
         }else{
         }else{
-            $this->param['describe_image'] = json_encode([]);
+            $param['describe_image'] = json_encode([]);
         }
         }
         return $this->success($param);
         return $this->success($param);
     }
     }

@@ -45,7 +45,7 @@ class ProductLogic extends  BaseLogic
         $category_ids = $this->handleCategory();
         $category_ids = $this->handleCategory();
         //处理其他字段
         //处理其他字段
         $this->param = $this->handleSaveParam($this->param);
         $this->param = $this->handleSaveParam($this->param);
-        try {
+//        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
@@ -66,13 +66,13 @@ class ProductLogic extends  BaseLogic
             CategoryRelated::saveRelated($id, $category_ids);
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
             $this->saveExtendInfo($id,$extend);
-        }catch (\Exception $e){
-            Log::info('错误信息---'.$e->getMessage());
-            $this->fail('系统错误请联系管理员');
-        }
+//        }catch (\Exception $e){
+//            Log::info('错误信息---'.$e->getMessage());
+//            $this->fail('系统错误,请联系管理员');
+//        }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
     }
 
 
     /**
     /**

@@ -280,7 +280,7 @@ class TranslateLogic extends BaseLogic
 //            $this->fail('系统错误请联系管理员');
 //            $this->fail('系统错误请联系管理员');
 //        }
 //        }
         $this->handleRoute($this->param['url']);
         $this->handleRoute($this->param['url']);
-        return $this->success($rs);
+        return $this->success();
     }
     }
 
 
     /**
     /**

+<?php
+/**
+ * @remark :
+ * @name   :V6UpdateLog.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/9 16:08
+ */
+
+namespace App\Models\Com;
+
+use App\Models\Base;
+
+/**
+ * @remark :
+ * @name   :V6UpdateLog
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/9 16:09
+ */
+class V6UpdateLog extends Base
+{
+    protected $table = 'gl_v6_update_log';
+}

@@ -15,20 +15,7 @@ class Project extends Base
 {
 {
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_project';
     protected $table = 'gl_project';
-    public static $domainEndSlash = 1;   //斜杠结尾
-    public static $projectLocationZero = 0;  //普通项目
-    public static $projectLocationDangerous = 1;  //危险项目
-    public static $storageTypeZero = 0;  //默认腾讯压缩存储桶
-    public static $storageTypeOne = 1;  //非压缩存储桶
-    //项目标识集合
-    public static $blockItems = "blockitems";  //html循环项父级标识
-    public static $blockAttrItems = "[blockitems]";  //html循环项父级属性标识
-    public static $blockItem = "blockitem";  //html循环项标识
-    public static $blockAttrItem = "[blockitem]";  //html循环项属性标识
-    public static $productListBlock = "productlistblock";  //html产品列表标识
-    public static $newListBlock = "newlistblock";  //html新闻列表标识
-    public static $blogListBlock = "bloglistblock";  //html博客列表标识
-    public static $productCategoryListBlock = "productcategorylistblock";  //html产品分类列表标识
+
     const DATABASE_NAME_FIX = 'gl_data_';
     const DATABASE_NAME_FIX = 'gl_data_';
 
 
     const CUSTOMIZED_ONE = 1;//定制项目
     const CUSTOMIZED_ONE = 1;//定制项目

@@ -14,6 +14,29 @@ use App\Models\Base;
 class TemplateReplaceHtml extends Base
 class TemplateReplaceHtml extends Base
 {
 {
     protected $table = 'gl_replace_html';
     protected $table = 'gl_replace_html';
-    //连接数据库
-    protected $connection = 'custom_mysql';
+
+    const STATUS = 0;
+    const STATUS_START = 1;
+    const STATUS_END = 2;
+
+    /**
+     * @remark :默认类型
+     * @name   :sourceType
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 17:07
+     */
+    public function sourceType(){
+        return [
+            '所有页面'=>['source'=>0,'is_list'=>0,'is_custom'=>0],
+            '首页'=>['source'=>1,'is_list'=>0,'is_custom'=>0],
+            '产品详情'=>['source'=>2,'is_list'=>0,'is_custom'=>0],
+            '产品列表'=>['source'=>2,'is_list'=>1,'is_custom'=>0],
+            '新闻详情'=>['source'=>4,'is_list'=>0,'is_custom'=>0],
+            '新闻列表'=>['source'=>4,'is_list'=>1,'is_custom'=>0],
+            '博客详情'=>['source'=>3,'is_list'=>0,'is_custom'=>0],
+            '博客列表'=>['source'=>3,'is_list'=>1,'is_custom'=>0],
+//            '单页面'=>['source'=>9,'is_list'=>0,'is_custom'=>0],
+        ];
+    }
 }
 }

@@ -14,6 +14,8 @@ use App\Models\Base;
 class TemplateReplaceHtmlLog extends Base
 class TemplateReplaceHtmlLog extends Base
 {
 {
     protected $table = 'gl_replace_html_log';
     protected $table = 'gl_replace_html_log';
-    //连接数据库
-    protected $connection = 'custom_mysql';
+
+    const STATUS = 0;
+    const STATUS_START = 1;
+    const STATUS_END = 2;
 }
 }

-<?php
-
-
-namespace App\Services\Html;
-
-
-use App\Models\Blog\Blog;
-use App\Models\News\News;
-use App\Models\Product\Category;
-use App\Models\Product\CategoryRelated;
-use App\Models\Product\Keyword;
-use App\Models\Product\Product;
-use App\Models\RouteMap\RouteMap;
-use App\Models\WebSetting\SettingNum;
-use App\Models\WebSetting\WebSetting;
-use App\Models\WebSetting\WebSettingAmp;
-use App\Models\WebSetting\WebSettingSeo;
-
-class AmpService
-{
-    /**
-     * 获取首页html
-     * @param $project
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-     * @author Akun
-     * @date 2024/03/14 15:04
-     */
-    public static function getIndexHtml($project)
-    {
-        //站点配置
-        $project_config = self::getProjectConfig($project->id);
-
-        //产品所有分类
-        $category = self::getProductsCategory($project->id);
-
-        //排序最前的3个产品
-        $products = self::getProductsList($project->id, 1, 3)['data'];
-
-        //排序最前的3篇新闻
-        $news = self::getNewsBlogList($project->id, 1, 1, 3)['data'];
-
-        //排序最前的3篇博客
-        $blogs = AmpService::getNewsBlogList($project->id, 2, 1, 3)['data'];
-
-        //当前页面地址
-        $current_url = self::getCurrentUrl($project->domain);
-
-        return view('amp/index', compact('project_config', 'category', 'products', 'news', 'blogs', 'current_url'));
-    }
-
-    /**
-     * 获取路由页html
-     * @param $project
-     * @param $route
-     * @param $source
-     * @param $page
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-     * @author Akun
-     * @date 2024/03/14 15:05
-     */
-    public static function getHtmlByRoute($project, $route, $source, $page)
-    {
-        //站点配置
-        $project_config = self::getProjectConfig($project->id);
-
-        //产品所有分类
-        $category = self::getProductsCategory($project->id);
-
-        //固定菜单页面
-        if ($route == '404') {
-            //404页面
-            $current_url = self::getCurrentUrl($project->domain, '/404/');
-            return view('amp/404', compact('project_config', 'category', 'current_url'));
-        } elseif ($route == 'contact-us') {
-            //contact-us页面
-            $current_url = self::getCurrentUrl($project->domain, '/contact-us/');
-            return view('amp/contact', compact('project_config', 'category', 'current_url'));
-        } elseif ($route == 'about-us') {
-            //about-us页面
-            $current_url = self::getCurrentUrl($project->domain, '/aboout-us/');
-            return view('amp/about', compact('project_config', 'category', 'current_url'));
-        } elseif ($route == 'products') {
-            //产品列表
-            $products = self::getProductsList($project->id, $page, 8);
-
-            //当前分类详情
-            $category_info = self::getCategoryInfo($project->id, 0);
-
-            $current_url = self::getCurrentUrl($project->domain, '/' . $category_info['route'] . '/' . ($page > 1 ? $page . '/' : ''));
-
-            return view('amp/products', compact('project_config', 'category', 'products', 'category_info', 'page', 'current_url'));
-        } elseif ($route == 'news') {
-            //新闻列表
-            $news = self::getNewsBlogList($project->id, 1, $page, 5);
-
-            $current_url = self::getCurrentUrl($project->domain, '/news/' . ($page > 1 ? $page . '/' : ''));
-            return view('amp/news', compact('project_config', 'category', 'news', 'page', 'current_url'));
-        } elseif ($route == 'blog') {
-            //博客列表
-            $blogs = self::getNewsBlogList($project->id, 2, $page, 5);
-
-            $current_url = self::getCurrentUrl($project->domain, '/blog/' . ($page > 1 ? $page . '/' : ''));
-            return view('amp/blogs', compact('project_config', 'category', 'blogs', 'page', 'current_url'));
-        } elseif (strpos($route, 'top-search') !== false) {
-            //top-search页面
-            $pageService = new PageService();
-            $search_list = $pageService->getProductKeywordsByLetter($project, $route, $page);
-
-            //处理路由后缀为-tag的关键词
-            foreach ($search_list['pageInfo']['pageListData'] as &$v) {
-                if (substr($v['route'], -4, 4) == '-tag') {
-                    $v['route'] = substr($v['route'], 0, -4);
-                }
-            }
-
-            //俄语站没有首字母筛选
-            if ($project->serve_id == 3) {
-                $search_list['keywordsLabel'] = [];
-            }
-
-            $total_page = count($search_list['pageInfo']['pageNum']);
-            $search_list['pageInfo']['center_pages'] = page_init($page, $total_page);
-            $search_list['pageInfo']['prev'] = max($page - 1, 1);
-            $search_list['pageInfo']['next'] = min($page + 1, $total_page);
-
-            $current_url = self::getCurrentUrl($project->domain, '/' . $route . '/' . ($page > 1 ? $page . '/' : ''));
-            return view('amp/top_search', compact('project_config', 'category', 'search_list', 'page', 'route', 'current_url'));
-        } else {
-            //剩下的页面：产品分类，产品详情，新闻详情，关键词详情
-            $map = ['route' => $route];
-            if ($source) {
-                $map['source'] = $source;
-            }
-            $route_info = RouteMap::where($map)->orderByRaw("FIELD(source, 'product_category','product','news','blog','product_keyword')")->first();
-            if (!$route_info) {
-                //特殊情况：关键词后缀为-tag
-                $map['route'] = $route . '-tag';
-                $map['source'] = 'product_keyword';
-                $route_info = RouteMap::where($map)->first();
-            }
-            if (!$route_info) {
-                $current_url = self::getCurrentUrl($project->domain, '/404/');
-                return view('amp/404', compact('project_config', 'category', 'current_url'));
-            }
-
-            switch ($route_info->source) {
-                case 'product_category':
-                    //产品列表
-                    $products = self::getProductsList($project->id, $page, 8, $route_info->source_id);
-
-                    //当前分类详情
-                    $category_info = self::getCategoryInfo($project->id, $route_info->source_id);
-
-                    $current_url = self::getCurrentUrl($project->domain, '/' . $category_info['route'] . '/' . ($page > 1 ? $page . '/' : ''));
-                    return view('amp/products', compact('project_config', 'category', 'products', 'category_info', 'page', 'current_url'));
-                case 'product':
-                    //获取产品详情
-                    $product_info = self::getProductInfo($project->id, $route_info->source_id);
-
-                    //获取关联产品
-                    $relate_products = self::getRelateProducts($project->id, $product_info['id'], $product_info['category_id'], 8);
-
-                    $current_url = self::getCurrentUrl($project->domain, '/' . $product_info['route'] . '/');
-                    return view('amp/product_info', compact('project_config', 'category', 'product_info', 'relate_products', 'current_url'));
-                case 'news':
-                    //新闻详情
-                    $news_info = self::getNewsBlogInfo($project->id, 1, $route_info->source_id);
-
-                    $current_url = self::getCurrentUrl($project->domain, '/news/' . $news_info['url'] . '/');
-                    return view('amp/news_info', compact('project_config', 'category', 'news_info', 'current_url'));
-                case 'blog':
-                    //博客详情
-                    $blog_info = self::getNewsBlogInfo($project->id, 2, $route_info->source_id);
-
-                    $current_url = self::getCurrentUrl($project->domain, '/blog/' . $blog_info['url'] . '/');
-                    return view('amp/blog_info', compact('project_config', 'category', 'blog_info', 'current_url'));
-                case 'product_keyword':
-                    //获取关键词详情
-                    $tag_info = self::getTagInfo($project->id, $route_info->source_id);
-
-                    //获取关联产品和热门产品
-                    $pageService = new PageService();
-                    $products = $pageService->getRecommendAndHotProducts($project, $tag_info['route']) ?: [];
-
-                    //获取关联新闻
-                    $news = self::getNewsBlogList($project->id, 1, 1, 2)['data'];
-
-                    //随机获取关键词列表
-                    $relate_tags = self::getRelateTags($project->id);
-
-                    $current_url = self::getCurrentUrl($project->domain, '/' . $tag_info['route'] . '/');
-                    return view('amp/tag', compact('project_config', 'category', 'tag_info', 'products', 'news', 'relate_tags', 'current_url'));
-                default:
-                    $current_url = self::getCurrentUrl($project->domain, '/404/');
-                    return view('amp/404', compact('project_config', 'category', 'current_url'));
-            }
-        }
-    }
-
-    /**
-     * 拼接当前页面完整路径
-     * @param $domain
-     * @param $path
-     * @return string
-     * @author Akun
-     * @date 2024/03/15 15:48
-     */
-    public static function getCurrentUrl($domain, $path = '')
-    {
-        $host_array = explode('.', $domain);
-        if (count($host_array) <= 2) {
-            array_unshift($host_array, 'm');
-        } else {
-            $host_array[0] = 'm';
-        }
-        $amp_domain = implode('.', $host_array);
-
-        return 'https://' . $amp_domain . $path;
-    }
-
-    /**
-     * 获取站点amp配置
-     * @param $project_id
-     * @return mixed
-     * @author Akun
-     * @date 2024/01/26 16:07
-     */
-    public static function getProjectConfig($project_id)
-    {
-        $config_amp = WebSettingAmp::where('project_id', $project_id)->first();
-
-        $config_index = WebSetting::where('project_id', $project_id)->first();
-
-        $config_seo = WebSettingSeo::where('project_id', $project_id)->first();
-
-        $show_news = News::where('project_id', $project_id)->where('status', 1)->count('id');
-
-        $show_blogs = Blog::where('project_id', $project_id)->where('status', 1)->count('id');
-
-        return [
-            'show_news' => $show_news,
-            'show_blogs' => $show_blogs,
-            'top_backgroundcolor' => $config_amp->top_backgroundcolor ?? '',
-            'web_icon' => $config_amp->web_icon ?? '',
-            'top_logo' => $config_amp->top_logo ?? [],
-            'index_banner' => $config_amp->index_banner ?? [],
-            'index_intro' => $config_amp->index_intro ?? '',
-            'company_image' => $config_amp->company_image ?? [],
-            'company_about' => $config_amp->company_about ?? '',
-            'company_email' => $config_amp->company_email ?? '',
-            'company_address' => $config_amp->company_address ?? '',
-            'company_tel' => $config_amp->company_tel ?? '',
-            'third_code' => $config_amp->third_code ?? '',
-            'index_title' => $config_index->title ?? '',
-            'index_description' => $config_index->remark ?? '',
-            'index_keywords' => $config_index->keyword ?? '',
-            'single_page_suffix' => $config_seo->single_page_suffix ?? '',
-            'tab_suffix' => $config_seo->tab_suffix ?? '',
-            'tab_prefix' => $config_seo->tab_prefix ?? '',
-            'product_cate_suffix' => $config_seo->product_cate_suffix ?? '',
-            'product_cate_prefix' => $config_seo->product_cate_prefix ?? '',
-            'product_suffix' => $config_seo->product_suffix ?? '',
-            'product_prefix' => $config_seo->product_prefix ?? '',
-        ];
-    }
-
-    /**
-     * 获取分类列表
-     * @param $project_id
-     * @return array
-     * @author Akun
-     * @date 2024/01/29 11:25
-     */
-    public static function getProductsCategory($project_id)
-    {
-        $category = [];
-        $result = Category::where('project_id', $project_id)->where('title', '!=', 'Featured Products')->where('status', 1)->orderBy("sort", "desc")->orderBy("id", "desc")->get();
-        if ($result->count() > 0) {
-            $result_tree = list_to_tree($result->toArray());
-            foreach ($result_tree as $cate) {
-                if ($cate['title'] == 'Products' || $cate['title'] == 'products') {
-                    foreach ($cate['_child'] as $child) {
-                        $category[] = $child;
-                    }
-                } else {
-                    $category[] = $cate;
-                }
-            }
-        }
-
-
-        return $category;
-    }
-
-    /**
-     * 获取分类详情
-     * @param $project_id
-     * @param $category_id
-     * @return array
-     * @author Akun
-     * @date 2024/01/29 11:31
-     */
-    public static function getCategoryInfo($project_id, $category_id)
-    {
-        if ($category_id > 0) {
-            $category_info = Category::where('project_id', $project_id)->where('id', $category_id)->first();
-        } else {
-            $category_info = Category::where('project_id', $project_id)->whereIn('title', ['Products', 'products'])->first();
-            if ($category_info) {
-                $category_info->id = 0;
-            } else {
-                return [
-                    'id' => 0,
-                    'route' => 'products',
-                    'title' => 'Products',
-                    'keywords' => '',
-                    'describe' => '',
-                    'seo_title' => '',
-                    'seo_keywords' => '',
-                    'seo_description' => '',
-                ];
-            }
-        }
-
-        return [
-            'id' => $category_info->id ?? 0,
-            'route' => $category_info->route ?? '',
-            'title' => $category_info->title ?? '',
-            'keywords' => $category_info->keywords ?? '',
-            'describe' => $category_info->describe ?? '',
-            'seo_title' => $category_info->seo_title ?? '',
-            'seo_keywords' => $category_info->seo_keywords ?? '',
-            'seo_description' => $category_info->seo_des ?? '',
-        ];
-    }
-
-    /**
-     * 根据分类id获取产品id
-     * @param $category_id
-     * @return mixed
-     * @author Akun
-     * @date 2024/01/29 11:26
-     */
-    public static function getProductIdByCategory($category_id)
-    {
-        return CategoryRelated::where('cate_id', $category_id)->pluck('product_id')->toArray();
-    }
-
-    /**
-     * 获取产品列表
-     * @param int $project_id
-     * @param int $page
-     * @param int $limit
-     * @param int $category_id
-     * @param string $search
-     * @return array
-     * @author Akun
-     * @date 2024/01/26 16:07
-     */
-    public static function getProductsList($project_id, $page = 1, $limit = 20, $category_id = 0, $search = '')
-    {
-        $total_page = 0;
-        $products = [];
-
-        $model = Product::where('project_id', $project_id)->where('status', 1);
-        //根据分类id获取关联的产品id
-        if ($category_id > 0) {
-            $product_ids = self::getProductIdByCategory($category_id);
-            if ($product_ids) {
-                $model = $model->whereIn('id', $product_ids);
-            }
-        } else {
-            //获取所有产品需要排除掉Featured Products分类
-            $fp_cate_id = Category::where('title', 'Featured Products')->value('id');
-            $model->where('category_id', '!=', ',' . $fp_cate_id . ',');
-        }
-        //搜索条件
-        if ($search) {
-            if (strpos($search, '\\') !== false) {
-                $search = str_replace('\\', '\\\\', $search);
-            }
-            $model = $model->where('title', 'like', "%$search%");
-        }
-
-        $count = $model->count('id');
-        if ($count > 0) {
-            $total_page = (int)ceil($count / $limit);
-
-            //获取产品自定义排序规则
-            $sort_rule = self::getProductSortRule($project_id);
-            foreach ($sort_rule as $rk => $rv) {
-                $model = $model->orderBy($rk, $rv);
-            }
-
-            $result = $model->select(['id', 'title', 'thumb', 'intro', 'content', 'route'])->offset(($page - 1) * $limit)->limit($limit)->get();
-            if ($result->count() > 0) {
-                foreach ($result as $value) {
-                    $thumb = [];
-                    if ($value->thumb) {
-                        $thumb_arr = json_decode($value->thumb, true);
-                        $thumb = [
-                            'alt' => (isset($thumb_arr['alt']) && $thumb_arr['alt']) ? $thumb_arr['alt'] : $value->title,
-                            'url' => getImageUrl($thumb_arr['url'] ?? '')
-                        ];
-                    }
-                    $intro = $value->intro ?: $value->content;
-                    $intro = strip_tags(special2str($intro));
-                    $products[] = [
-                        'id' => $value->id,
-                        'title' => $value->title,
-                        'thumb' => $thumb,
-                        'route' => $value->route,
-                        'intro' => strlen($intro) > 200 ? substr($intro, 0, 200) . '...' : $intro,
-                    ];
-                }
-            }
-        }
-
-        $pre = max($page - 1, 1);
-        $next = min($page + 1, $total_page);
-        $center_pages = page_init($page, $total_page);
-
-        return ['data' => $products, 'total_page' => $total_page, 'prev' => $pre, 'next' => $next, 'center_pages' => $center_pages];
-    }
-
-    /**
-     * 获取产品自定义排序规则
-     * @param $project_id
-     * @return array|string[]
-     * @author Akun
-     * @date 2024/03/21 11:13
-     */
-    public static function getProductSortRule($project_id)
-    {
-        $order_list = [];
-        $orderDataFirst = SettingNum::where('project_id', $project_id)->where('type', 10)->first();
-        if ($orderDataFirst && $orderDataFirst->data) {
-            $orderData = json_decode($orderDataFirst->data, true);
-            foreach ($orderData as $key => $orderDataItem) {
-                $orderKey = $key == "created_at" ? "send_time" : $key;
-                $order_list[$orderKey] = $orderDataItem;
-                if ($key != "id") {
-                    $order_list['id'] = 'desc';
-                }
-            }
-        } else {
-            $order_list = [
-                'sort' => 'desc',
-                'id' => 'desc'
-            ];
-        }
-
-        return $order_list;
-    }
-
-    /**
-     * 获取产品详情
-     * @param $project_id
-     * @param $id
-     * @return array
-     * @author Akun
-     * @date 2024/01/30 9:22
-     */
-    public static function getProductInfo($project_id, $id)
-    {
-        $gallery = [];
-        $seo = [
-            'title' => '',
-            'keywords' => '',
-            'description' => ''
-        ];
-        $product_info = Product::where('project_id', $project_id)->where('status', 1)->where('id', $id)->first();
-        if ($product_info) {
-            if ($product_info->gallery) {
-                $gallery_arr = json_decode($product_info->gallery, true);
-                foreach ($gallery_arr as $vg) {
-                    $gallery[] = [
-                        'alt' => (isset($vg['alt']) && $vg['alt']) ? $vg['alt'] : $product_info->title,
-                        'url' => getImageUrl($vg['url'] ?? '')
-                    ];
-                }
-            }
-
-            if ($product_info->seo_mate) {
-                $seo_arr = json_decode($product_info->seo_mate, true);
-                $seo['title'] = $seo_arr['title'] ?? '';
-                $seo['keywords'] = $seo_arr['keywords'] ?? '';
-                $seo['description'] = $seo_arr['description'] ?? '';
-            }
-        }
-
-        return [
-            'id' => $product_info->id ?? 0,
-            'route' => $product_info->route ?? '',
-            'gallery' => $gallery,
-            'title' => $product_info->title ?? '',
-            'intro' => $product_info->intro ?? '',
-            'content' => $product_info->content ?? '',
-            'seo' => $seo,
-            'category_id' => $product_info->category_id ?? ''
-        ];
-    }
-
-    /**
-     * 获取关联产品
-     * @param $project_id
-     * @param $id
-     * @param $category_id
-     * @param $limit
-     * @return array
-     * @author Akun
-     * @date 2024/01/30 9:34
-     */
-    public static function getRelateProducts($project_id, $id, $category_id, $limit = 2)
-    {
-        if (is_string($category_id)) {
-            $category_id = explode(',', $category_id);
-        }
-
-        $relate_ids = CategoryRelated::whereIn('cate_id', $category_id)->where('product_id', '!=', $id)->limit($limit)->pluck('product_id')->toArray();
-
-        $relate_products = [];
-        if ($relate_ids) {
-            $result = Product::where('project_id', $project_id)->whereIn('id', $relate_ids)->where('status', 1)->orderBy('sort', 'desc')->limit(8)->get();
-            if ($result->count() == 0) {
-                $result = Product::where('project_id', $project_id)->where('status', 1)->inRandomOrder()->take(8)->get();
-            }
-            if ($result->count() > 0) {
-                foreach ($result as $value) {
-                    $thumb = '';
-                    if ($value->thumb) {
-                        $thumb_arr = json_decode($value->thumb, true);
-                        $thumb = [
-                            'alt' => (isset($thumb_arr['alt']) && $thumb_arr['alt']) ? $thumb_arr['alt'] : $value->title,
-                            'url' => getImageUrl($thumb_arr['url'] ?? '')
-                        ];
-                    }
-                    $relate_products[] = [
-                        'id' => $value->id,
-                        'route' => $value->route,
-                        'title' => $value->title,
-                        'thumb' => $thumb
-                    ];
-                }
-            }
-        }
-
-        return $relate_products;
-    }
-
-    /**
-     * 获取新闻博客列表
-     * @param $project_id
-     * @param int $type
-     * @param int $page
-     * @param int $limit
-     * @return array
-     * @author Akun
-     * @date 2024/01/26 16:38
-     */
-    public static function getNewsBlogList($project_id, $type = 1, $page = 1, $limit = 10)
-    {
-        $total_page = 0;
-        $news = [];
-
-        if ($type == 1) {
-            $model = new News();
-        } else {
-            $model = new Blog();
-        }
-        $count = $model->where('project_id', $project_id)->where('status', 1)->count('id');
-        if ($count > 0) {
-            $total_page = (int)ceil($count / $limit);
-
-            $result = $model->select(['id', 'name', 'image', 'remark', 'text', 'release_at', 'created_at', 'url'])->where('project_id', $project_id)->where('status', 1)->orderBy('sort', 'desc')->orderBy('id', 'desc')->offset(($page - 1) * $limit)->limit($limit)->get();
-            if ($result->count() > 0) {
-                foreach ($result as $value) {
-                    $remark = $value->remark ?: $value->text;
-                    $remark = strip_tags(special2str($remark));
-                    $news[] = [
-                        'type' => $type,
-                        'id' => $value->id,
-                        'name' => $value->name,
-                        'url' => $value->url,
-                        'image' => getImageUrl($value->image),
-                        'remark' => strlen($remark) > 200 ? substr($remark, 0, 200) . '...' : $remark,
-                        'release_at' => $value->release_at ? $value->release_at : $value->created_at
-                    ];
-                }
-            }
-        }
-
-        $pre = max($page - 1, 1);
-        $next = min($page + 1, $total_page);
-        $center_pages = page_init($page, $total_page);
-
-
-        return ['data' => $news, 'total_page' => $total_page, 'prev' => $pre, 'next' => $next, 'center_pages' => $center_pages];
-    }
-
-    /**
-     * 获取新闻博客详情
-     * @param $project_id
-     * @param $type
-     * @param $id
-     * @return array
-     * @author Akun
-     * @date 2024/01/30 11:17
-     */
-    public static function getNewsBlogInfo($project_id, $type, $id)
-    {
-        if ($type == 1) {
-            $model = new News();
-        } else {
-            $model = new Blog();
-        }
-
-        $news_info = $model->where('project_id', $project_id)->where('status', 1)->where('id', $id)->first();
-
-        $release_at = '';
-        if (isset($news_info->release_at) && $news_info->release_at) {
-            $release_at = $news_info->release_at;
-        } elseif (isset($news_info->created_at) && $news_info->created_at) {
-            $release_at = $news_info->created_at;
-        }
-
-        return [
-            'id' => $news_info->id ?? 0,
-            'name' => $news_info->name ?? '',
-            'sort' => $news_info->sort ?? 0,
-            'url' => $news_info->url ?? 0,
-            'text' => $news_info->text ?? '',
-            'image' => getImageUrl($news_info->image ?? ''),
-            'seo_title' => $news_info->seo_title ?? '',
-            'seo_keywords' => $news_info->seo_keywords ?? '',
-            'seo_description' => $news_info->seo_description ?? '',
-            'release_at' => $release_at
-        ];
-    }
-
-    /**
-     * 获取关键词详情
-     * @param $project_id
-     * @param $id
-     * @return array
-     * @author Akun
-     * @date 2024/01/30 16:17
-     */
-    public static function getTagInfo($project_id, $id)
-    {
-        $tag_info = Keyword::where('project_id', $project_id)->where('status', 1)->where('id', $id)->first();
-
-        return [
-            'id' => $tag_info->id ?? 0,
-            'route' => $tag_info->route ?? '',
-            'title' => $tag_info->title ?? '',
-            'keyword_title' => $tag_info->keyword_title ?? '',
-            'keyword_content' => $tag_info->keyword_content ?? '',
-            'seo_title' => $tag_info->seo_title ?? '',
-            'seo_keywords' => $tag_info->seo_keywords ?? '',
-            'seo_description' => $tag_info->seo_description ?? '',
-        ];
-    }
-
-    /**
-     * 获取关联关键词
-     * @param $project_id
-     * @return mixed
-     * @author Akun
-     * @date 2024/01/30 18:30
-     */
-    public static function getRelateTags($project_id)
-    {
-        return Keyword::select(['id', 'title', 'route'])->where('project_id', $project_id)->where('status', 1)->inRandomOrder()->take(10)->get()->toArray();
-    }
-}

-<?php
-
-
-namespace App\Services\Html;
-
-use App\Helper\Translate;
-use App\Models\Com\UpdateProgress;
-use App\Models\Project\DeployBuild;
-use App\Models\Project\DeployOptimize;
-use App\Models\Project\DomainInfo;
-use App\Models\Project\Project;
-use App\Models\RouteMap\RouteMap;
-use App\Models\WebSetting\Proofreading;
-use App\Models\WebSetting\WebLanguage;
-use App\Models\WebSetting\WebProofreading;
-use App\Models\WebSetting\WebSetting;
-use App\Models\WebSetting\WebSettingCountry;
-use App\Models\WebSetting\WebSettingHtml;
-use App\Models\WebSetting\WebSettingText;
-use App\Models\WebSetting\WebTemplateCommon;
-use App\Services\ProjectServer;
-use Illuminate\Support\Facades\Redis;
-use phpQuery;
-
-/**
- * 生成静态页相关
- */
-class CommonService
-{
-
-    /**
-     * 翻译
-     */
-    public function webHtmlTranslate($project,$content, $lang,$domain)
-    {
-       //翻译过滤器
-       $lang = $lang == "zh-ct" ? "zh-TW" : $lang;
-       $tlsList =  Translate::$tls_list;
-       if (isset($tlsList[$lang])){
-           $main_lang = $project->main_lang_id;
-           $mainLangInfo = WebLanguage::getProjectMainLang($main_lang);
-           $master_lang = $mainLangInfo ? $mainLangInfo->short : 'en';
-           //翻译
-           if ($master_lang != 'en') {
-               $result = Translate::translate($content, $lang, $master_lang);
-               $content = $result[0]['texts'] ?? '';
-           } else {
-               $content = Translate::tran($content, $lang);
-           }
-           // 翻译有时会返回空数据 再翻译一次  FIXME 后续需要重新封装
-           if (empty($content)) {
-               $result = Translate::translate($content, $lang, $master_lang);
-               $content = $result[0]['texts'] ?? '';
-           }
-
-           //翻译校对
-           $content =  $this->translationProofread($project,$content,$lang,$domain);
-       }
-       return $content;
-    }
-
-    /**
-     * 翻译校对
-     */
-    public function translationProofread($project, $content, $lang,$domain)
-    {
-        $webProofreading = Proofreading::where("project_id",$project->id)->where("alias",$lang)->get();
-        if (!empty($webProofreading)){
-            foreach ($webProofreading as $item){
-                $content = str_ireplace($item->text,$item->translate,$content);
-            }
-        }
-        return $content;
-    }
-
-    /**
-     * 处理第三方代码
-     */
-    public function thirdPartyCodeHandle($project,$content,$route,$routeMap=null): string
-    {
-        if (Redis::get("project_".$project->id."_third_party_code") != null){
-            $webSettingHtml = json_decode(Redis::get("project_".$project->id."_third_party_code"));
-        }else{
-            $webSettingHtml = WebSettingHtml::where("project_id",$project->id)->first();
-            Redis::set("project_".$project->id."_third_party_code", json_encode($webSettingHtml));
-            Redis::expire("project_".$project->id."_third_party_code", WebSetting::$redisExpireTime);
-        }
-        $phpQueryDom = phpQuery::newDocument($content);
-        //网站icon
-        $webIcon = WebSetting::where("project_id",$project->id)->first();
-        if (!empty($webIcon)){
-            $iconDom = $phpQueryDom->find("link[rel=icon]");
-            if (count($iconDom) >= 1){
-                if (isset($webIcon->web_site_icon) && !empty($webIcon->web_site_icon) && $webIcon->web_site_icon != "" && $webIcon->web_site_icon != 0){
-                    $iconDom->attr("href",$webIcon->web_site_icon);
-                }else{
-                    $iconDom->attr("href","");
-                }
-            }
-        }
-        //第三方代码（网页顶部，中间，底部），以后启用位置
-        if (!empty($webSettingHtml)) {
-            $phpQueryDom->find('head')->append($webSettingHtml->head_html?:'');
-            $phpQueryDom->find('body')->append($webSettingHtml->body_html?:'');
-            $phpQueryDom->find('html')->append($webSettingHtml->footer_html?:'');
-        }
-        //A端添加的网站追踪代码
-        $deployOptimize = DeployOptimize::where("project_id",$project->id)->first();
-        if (!empty($deployOptimize)){
-            if (isset($deployOptimize->meta) && !empty($deployOptimize->meta)){
-                $phpQueryDom->find('head')->append($deployOptimize->meta);
-            }
-        }
-        //首页头部独立样式
-        if ($route == "index"){
-            $phpQueryDom->find('header')->attr("headerprivate","");
-        }
-        //处理header顶部搜索跳转链接
-        $phpQueryDom->find('header form')->attr("action", "/search/");
-        //C端访问埋点
-        $isBodyEnd = $phpQueryDom->find('body')->eq(0);
-        if (count($isBodyEnd)>=1){
-            $phpQueryDom->find('body')->append("<script src='https://ecdn6.globalso.com/public/customerVisit.min.js'></script>");
-        }else{
-            $phpQueryDom->find('html')->append("<script src='https://ecdn6.globalso.com/public/customerVisit.min.js'></script>");
-        }
-        $data = date("Y-m-d H:i:s");
-        $phpQueryDom->find('html')->append("<!-- Globalso Cache file was created on ".$data." -->");
-        //这个功能其他类型页面移到面包屑导航处理
-        if ($route == "index" || (!empty($routeMap) && $routeMap->source == RouteMap::SOURCE_PAGE)){
-            $phpQueryDom->find('head')->append('<script>var currentPage = "'.$route.'"</script>');
-        }
-        if ($route == "search"){
-            //暂时先去掉小语种按钮显示
-            $phpQueryDom->find(".change-language")->remove();
-            $phpQueryDom->find('head')->append('<meta name="robots" content="noindex, nofollow"/>');
-        }
-        $phpQueryDom->find('body')->attr("unevents","");
-        $content = $phpQueryDom->htmlOuter();
-        unset($phpQueryDom);
-        phpQuery::unloadDocuments();
-        //处理全部内容，如果有上线正式域名，则把所有的测试域名替换为正式域名
-        $projectDomainInfo = DomainInfo::where("project_id",$project->id)->first();
-        if (!empty($projectDomainInfo)){
-            $deployBuild = DeployBuild::where("project_id",$project->id)->first();
-            if (!empty($deployBuild)){
-                $parsedUrl = parse_url($deployBuild->test_domain);
-                $domain = $projectDomainInfo->domain;
-                $testDomain = $parsedUrl['host'];
-                if ($domain != '' && $testDomain != ''){
-                    $content = str_replace($testDomain,$domain,$content);
-                }
-            }
-        }
-        return  $content;
-    }
-
-    /**
-     * 处理锚文本
-     */
-    public function anchorTextHandle($project,$route,$content): string
-    {
-        $source = "";
-        //解析路由
-        if ($route != "index"){
-            $routerNewsMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();
-            if (!empty($routerNewsMap)){
-                $source = $routerNewsMap->source;
-            }
-        }else{
-            $source = "index";
-        }
-
-        //判断来源类型
-        switch ($source) {
-            case 'news_category' || 'news':
-                $num = 4;
-                break;
-            case 'product_category' || 'product':
-                $num = 2;
-                break;
-            case 'blog_category' || 'blog':
-                $num = 6;
-                break;
-            case 'page':
-                $num = 1;
-                break;
-            default:
-                $num = 1;
-        }
-
-        //网站设置锚文本
-        $webSetting = WebSetting::getWebSetting($project);
-        if (!empty($webSetting)){
-            $anchorIsEnable = $webSetting->anchor_is_enable;
-            if ($anchorIsEnable == 0){
-                $anchorSetting = $webSetting->anchor_setting;
-                $anchorSettingArr = explode(',', substr($anchorSetting, 1, -1));
-                foreach ($anchorSettingArr as $item){
-                    $itemArr = explode('"', substr($item, 1, -1));
-                    $tracingText[] = intval($itemArr[0]);
-                }
-                if (in_array($num, $tracingText)) {
-                    $webSettingText = WebSettingText::getWebSettingText($project);
-                    $phpQueryDom=phpQuery::newDocument($content);
-                    $mainElement = $phpQueryDom->find('main');
-                    $con = $mainElement->html();
-                    if (!empty($webSettingText)){
-                        foreach ($webSettingText as $v){
-                            $con = str_replace( $v->key_words, '<a target="_blank" href="'. $v->url.'">'. $v->key_words.'</a>', $con);
-                        }
-                    }
-                    $mainElement->html($con);
-                    return $phpQueryDom->htmlOuter();
-                }
-            }
-        }
-        return  $content;
-    }
-
-    /**
-     * 链接项目
-     */
-    public function connectProject($updateData)
-    {
-        $project = null;
-        $projectIn = Project::getProjectByDomain($updateData->domain);
-        if (!empty($projectIn)){
-            $project = Project::where("id",$projectIn->project_id)->first();
-            if (!empty($project)){
-                $project->domain = $updateData->domain;
-            }
-            ProjectServer::useProject($project->id);
-        }
-        return $project;
-    }
-
-    /**
-     * 获取小语种更新国家
-     */
-    public function getMinorLanguage($updateData)
-    {
-        $minorLanguage = [];
-        $updateProgressQuery = UpdateProgress::find($updateData->id);
-        if (!empty($updateProgressQuery)){
-            $extends = $updateProgressQuery->extends;
-            if (!empty($extends)){
-                $extends = json_decode($extends);
-                if (isset($extends->language) && !empty($extends->language)){
-                    $language = $extends->language;
-                    foreach ($language as $lang){
-                        $minorLanguage[] = (int)$lang;
-                    }
-                }
-            }
-        }
-        return WebSettingCountry::whereIn("id", $minorLanguage)->get();
-    }
-}

-<?php
-
-namespace App\Services\Html;
-
-
-
-use phpDocumentor\Reflection\Project;
-
-/**
- * 生成页面
- */
-class CreateHtmlService{
-    /**
-     * 获取页面
-     */
-    public function getHtml($projectId, $route, $lang = "", $page = null)
-    {
-        $project = Project::find($projectId);
-        $createPageService = new CreatePageService();
-        return $createPageService->getPageByLangRoutePage($project,$route,$page);
-    }
-}

-<?php
-
-
-namespace App\Services\Html;
-
-use App\Models\Blog\Blog;
-use App\Models\Collect\CollectTask;
-use App\Models\Com\Notify;
-use App\Models\Com\UpdateNotify;
-use App\Models\Com\UpdateProgress;
-use App\Models\CustomModule\CustomModuleContent;
-use App\Models\CustomModule\CustomModuleCategory;
-use App\Models\News\News;
-use App\Models\News\NewsCategory;
-use App\Models\Product\Category;
-use App\Models\Product\CategoryRelated;
-use App\Models\Product\Keyword;
-use App\Models\Product\Product;
-use App\Models\Project\CountryCustom;
-use App\Models\Project\DeployBuild;
-use App\Models\Project\Project;
-use App\Models\Project\UpdateMasterWebsiteModel;
-use App\Models\Project\UpdateMinorLanguagesModel;
-use App\Models\RouteMap\RouteMap;
-use App\Models\Template\BCustomTemplate;
-use App\Models\Template\BTemplate;
-use App\Models\Template\Setting;
-use App\Models\WebSetting\SettingNum;
-use App\Models\WebSetting\WebLanguage;
-use App\Repositories\StaticHtmlRepository;
-use Illuminate\Support\Facades\File;
-use phpQuery;
-use stdClass;
-
-/**
- * C端生成页面服务
- */
-class CreatePageService{
-
-    /**
-     * 获取升级项目小语种采集的页面
-     * @param $project
-     * @param $route
-     * @param $source
-     * @param $lang
-     * @return string
-     * @author Akun
-     * @date 2024/01/08 11:40
-     */
-    public function getMinorLanguagePage($project,$route,$source,$lang){
-        if($project['update_info']['is_language_update'] == 0){
-            return '';
-        }
-        if ($source == 'news' || $source == 'blog' || $source == 'product' || $source == 'page' || $source == 'module'){
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("source",$source)->first();
-        }elseif($source == ''){
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->whereIn("source",["product","page","module"])->orderBy('source','desc')->first();
-        }else{
-            return '';
-        }
-        if($routerMap) {
-            switch ($routerMap->source) {
-                //产品详情
-                case RouteMap::SOURCE_PRODUCT:
-                    $detail = Product::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-                    break;
-                //博客详情
-                case RouteMap::SOURCE_BLOG:
-                    $detail = Blog::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-                    break;
-                //新闻详情
-                case RouteMap::SOURCE_NEWS:
-                    $detail = News::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-                    break;
-                //自定义模块详情
-                case RouteMap::SOURCE_MODULE:
-                    $detail = Module::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-                    break;
-                default:
-                    //单页详情
-                    $detail = BCustomTemplate::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-            }
-            if($detail && $detail->six_read){
-                return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-            }else{
-                return '';
-            }
-        }else{
-            return '';
-        }
-    }
-
-    /**
-     * 根据语言，路由，分页数，获取页面内容
-     */
-    public function getPageByLangRoutePage($project,$route,$page=null,$source=""): string
-    {
-        $html = "";
-        $page = $page == null ? null : (int)$page;
-        $router = $route == "" ? "404" : $route;
-        $productKeywordRouter = new Keyword();
-        $productKeywordRouters = $productKeywordRouter->product_keyword_route;
-        if (in_array($router, $productKeywordRouters)) {
-            $html = $this->getProductKeywordListPage($project,$router,$page);
-            unset($productKeywordRouter);
-        } else {
-            //新增：products，news，blog 三个路由为C端固定路由，数据库路由表没有路由也可以访问或调数据
-            if ($router == "products" || $router == "news" || $router == "blog"){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$router)->first();
-                $routerMapRegular = new stdClass();
-                if (empty($routerMap)){
-                    if ($router == "products"){
-                        $routerMapRegular->source = RouteMap::SOURCE_PRODUCT_CATE;
-                        $routerMapRegular->route = "products";
-                    }
-                    if ($router == "news"){
-                        $routerMapRegular->source = RouteMap::SOURCE_NEWS_CATE;
-                        $routerMapRegular->route = "news";
-                    }
-                    if ($router == "blog"){
-                        $routerMapRegular->source = RouteMap::SOURCE_BLOG_CATE;
-                        $routerMapRegular->route = "blog";
-                    }
-                    $routerMapRegular->source_id = 0;
-                    $routerMapRegular->project_id = $project->id;
-                    $routerMap = $routerMapRegular;
-                    unset($routerMapRegular);
-                }
-            }else{
-                if ($project->update_info["is_update"] == 1){
-                    if ($source != ""){
-                        //$source可能值：news,blog,news_category,blog_category
-                        $routerMap = RouteMap::where("project_id",$project->id)->where("route",$router)->where("source",$source)->first();
-                    }else{
-                        //product_category,product,page,product_keyword,module_category,module
-                        $routerMap = RouteMap::where("project_id",$project->id)->where("route",$router)->whereIn("source",["product","product_category","page","module_category","module","product_keyword"])->orderByRaw("FIELD(source, 'product_category','product','module_category','module','page','product_keyword')")->first();
-                    }
-                    if (empty($routerMap)){
-                        $routerMap = RouteMap::where("project_id",$project->id)->where("route",$router)->first();
-                    }
-                }else{
-                    //6.0
-                    $routerMap = RouteMap::where("project_id",$project->id)->where("route",$router)->first();
-                }
-            }
-
-            if (!empty($routerMap)){
-                $type = $routerMap->source;
-                switch ($type) {
-                    //产品详情
-                    case RouteMap::SOURCE_PRODUCT:
-                        $html = $this->getProductPage($project,$routerMap);
-                        break;
-                    //产品列表
-                    case RouteMap::SOURCE_PRODUCT_CATE:
-                        $html = $this->getProductListPage($project,$routerMap,$page);
-                        break;
-                    //博客详情
-                    case RouteMap::SOURCE_BLOG:
-                        $html = $this->getBlogPage($project,$routerMap);
-                        break;
-                    //博客列表
-                    case RouteMap::SOURCE_BLOG_CATE:
-                        $html = $this->getBlogListPage($project,$routerMap,$page);
-                        break;
-                    //新闻详情
-                    case RouteMap::SOURCE_NEWS:
-                        $html = $this->getNewsPage($project,$routerMap);
-                        break;
-                    //新闻列表
-                    case RouteMap::SOURCE_NEWS_CATE:
-                        $html = $this->getNewsListPage($project,$routerMap,$page);
-                        break;
-                    //自定义模块列表
-                    case RouteMap::SOURCE_MODULE_CATE:
-                        $html = $this->getModuleListPage($project,$routerMap,$page);
-                        break;
-                    //自定义模块详情
-                    case RouteMap::SOURCE_MODULE:
-                        $html = $this->getModulePage($project,$routerMap);
-                        break;
-                    //聚合页
-                    case RouteMap::SOURCE_PRODUCT_KEYWORD:
-                        $html = $this->getProductKeywordPage($project,$routerMap);
-                        break;
-                    case RouteMap::SOURCE_PAGE:
-                        if ($router == RouteMap::SOURCE_INDEX){
-                            //首页
-                            $html = $this->getIndexPage($project,$routerMap);
-                        }else{
-                            //单页面
-                            $html = $this->getSinglePage($project,$routerMap);
-                        }
-                        break;
-                    default:
-                        $html = $this->getSinglePage($project,$routerMap);
-                }
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * 获取首页html
-     */
-    public function getIndexPage($project,$routerMap): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //首页模板
-        $info = Setting::where("project_id",$project->id)->first();
-        if (empty($info)){
-            return "";
-        }
-        $webIndexTemplate = BTemplate::where("project_id",$project->id)->where("template_id",$info->template_id)->where("source",1)->first();
-        if (!empty($webIndexTemplate)){
-            $html = $pageService->isAndGetVisualizationHtml($project,RouteMap::SOURCE_INDEX,$routerMap);
-            if ($html == ""){
-                //组装首页页面
-                $html = $pageService->assembleIndexPage($project,$webIndexTemplate);
-            }
-            //公共处理
-            $html = $pageService->publicHtmlHandle($html,$project->id);
-            $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_INDEX);
-            if ((int)$isVisual == 1 || $isVisual == null){
-                //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                $html = $pageService->generalTemplateProcessingForDataModules($html,$project->id);
-            }
-            //第三方
-            $html = $commonService->thirdPartyCodeHandle($project,$html,RouteMap::SOURCE_INDEX);
-            //TDK处理
-            $html = $tdkService->pageTdkHandle($project,$html,RouteMap::SOURCE_INDEX,$routerMap);
-            if (!empty($html)){
-                return  $this->pageUrlHandle($project,$routerMap,$html);
-            }else{
-                return "";
-            }
-        }else{
-            return "";
-        }
-    }
-
-    /**
-     * 获取产品列表页html
-     */
-    public function getProductListPage($project,$routerMap,$page): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //公共拼接页面方法
-        $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_PRODUCT_CATE,$routerMap);
-        //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-        $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_PRODUCT_CATE,$routerMap,$page);
-        //是否开启可视化
-        $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_PRODUCT_CATE);
-        if ((int)$isVisual == 1 || $isVisual == null){
-            //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-            $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-        }
-        $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_PRODUCT_CATE,$routerMap);
-        $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-        unset($pageService);
-        $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routerMap->route);
-        //处理URL等,处理html链接a标签href
-        if (!empty($html)){
-            return  $this->pageUrlHandle($project,$routerMap,$html,"",$page);
-        }else{
-            return "";
-        }
-    }
-
-    /**
-     * 获取产品页html
-     */
-    public function getProductPage($project,$routerMap,$lang=''): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $products_detail = Product::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->whereNotNull('route')->first();
-        if($project['update_info']['is_update'] && $products_detail && $products_detail->six_read){
-            return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-        }else{
-            $products_detail = $pageService->productDataHandle($project,$products_detail);
-            if (!empty($products_detail)){
-                //公共拼接页面方法
-                $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_PRODUCT,$routerMap);
-                //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-                $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,"product",$routerMap,null);
-                $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_PRODUCT);
-                if ((int)$isVisual == 1 || $isVisual == null){
-                    //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                    $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-                }
-                $webCustomHtml = $pageService->productsDetailTdkHandle($project,$webCustomHtml,$products_detail);
-                $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-                unset($pageService);
-                $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routerMap->route);
-                //处理URL等,处理html链接a标签href
-                if (!empty($html)){
-                    return  $this->pageUrlHandle($project,$routerMap,$html);
-                }else{
-                    return "";
-                }
-            }else{
-                return  "";
-            }
-        }
-    }
-
-    /**
-     * 获取产品关键词页html
-     */
-    public function getProductKeywordPage($project,$routerMap): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $keywordModel = new Keyword();
-        $tdkService = new TdkService();
-        $routePath = $routerMap->route;
-
-        //公共头部底部
-        $publicTemplate = $pageService->getPublicTemplate($project);
-        $headerHtml = $publicTemplate->headerHtml;
-        $footerHtml = $publicTemplate->footerHtml;
-        //关键词详情
-        $keywordsDetails = $pageService->getKeywordDetails($project, $routerMap->route);
-        if (!empty($keywordsDetails)){
-            if (!empty($keywordsDetails->embed_code)){
-                $videoUrl = $keywordsDetails->embed_code;
-                preg_match('/src="([^"]+)"/', $videoUrl, $matches);
-                $src = $matches[1];
-                $keywordsDetails->video = $src;
-            }
-            //随机获取关键词列表
-            $productsKeywordsList = $keywordModel->getProductsKeywordsList($project);
-            //调整为相关产品
-            $productsRecommendAndHot = $pageService->getRecommendAndHotProducts($project,$routePath);
-            //博客新闻数据
-            $blogT = $pageService->getProductsBlogNews($project);
-            $viewPath = isset($keywordsDetails->video) && !empty($keywordsDetails->video) ? "products/products_video_keywords" : "products/products_keywords";
-            $html = view($viewPath, compact("headerHtml", "footerHtml", "routePath", "productsKeywordsList", "productsRecommendAndHot", "blogT","keywordsDetails"))->__toString();
-            $html = $pageService->publicHtmlHandle($html, $project->id);
-            //生成静态页
-            $webCustomHtml = $commonService->thirdPartyCodeHandle($project, $html, $routerMap->route);
-            //TDK
-            unset($html,$productsKeywordsList,$productsRecommendAndHot,$blogT);
-            $html = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_PRODUCT_KEYWORD,$routerMap);
-            //处理URL等,处理html链接a标签href
-            if (!empty($html)){
-                return  $this->pageUrlHandle($project,$routerMap,$html);
-            }else{
-                return "";
-            }
-        }else{
-            return "";
-        }
-    }
-
-    /**
-     * 获取产品新闻列表页html
-     */
-    public function getNewsListPage($project,$routerMap,$page): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        $routePath = $routerMap->route;
-        //公共拼接页面方法
-        $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_NEWS_CATE,$routerMap);
-        //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-        $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_NEWS_CATE,$routerMap,$page);
-        $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_NEWS_CATE);
-        if ((int)$isVisual == 1 || $isVisual == null){
-            //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-            $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-        }
-        $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_NEWS_CATE,$routerMap);
-        $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-        unset($pageService);
-        $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routePath);
-        //处理URL等,处理html链接a标签href
-        if (!empty($html)){
-            return  $this->pageUrlHandle($project,$routerMap,$html,"",$page);
-        }else{
-            return "";
-        }
-
-    }
-
-    /**
-     * 自定义模块列表
-     */
-    public function getModuleListPage($project,$routerMap,$page): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        $routePath = $routerMap->route;
-        //公共拼接页面方法
-        $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_MODULE_CATE,$routerMap);
-        //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-        $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_MODULE_CATE,$routerMap,$page);
-        $moduleCategoryInfo = CustomModuleCategory::getModuleCategoryAndExtendById($project->id,$routerMap->source_id);
-        if (isset($moduleCategoryInfo->getExtend->list_visualization) && $moduleCategoryInfo->getExtend->list_visualization == 1){
-            //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-            $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-        }
-
-        $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_MODULE_CATE,$routerMap);
-        $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-        unset($pageService);
-        $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routePath);
-        //处理URL等,处理html链接a标签href
-        if (!empty($html)){
-            return  $this->pageUrlHandle($project,$routerMap,$html,"",$page);
-        }else{
-            return "";
-        }
-    }
-
-    /**
-     * 获取新闻页html
-     */
-    public function getNewsPage($project,$routerMap,$lang=''): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //页面路由
-        $routePath = $routerMap->route;
-        $news_detail = News::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-        if (!empty($news_detail)){
-            if($project['update_info']['is_update'] && $news_detail->six_read){
-                return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-            }else{
-                //公共拼接页面方法
-                $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_NEWS,$routerMap);
-                //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-                $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_NEWS,$routerMap,null);
-                $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_NEWS);
-                if ((int)$isVisual == 1 || $isVisual == null){
-                    //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                    $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-                }
-                //TDK处理
-                $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_NEWS,$routerMap);
-                //网页公共部分
-                $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-                unset($pageService);
-                $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routePath);
-                //处理URL等,处理html链接a标签href
-                if (!empty($html)){
-                    return  $this->pageUrlHandle($project,$routerMap,$html);
-                }else{
-                    return "";
-                }
-            }
-        }else{
-            return  "";
-        }
-    }
-
-    /**
-     * 自定义模块详情
-     */
-    public function getModulePage($project,$routerMap,$lang=''): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //页面路由
-        $routePath = $routerMap->route;
-        $module_detail = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-        if (!empty($module_detail)){
-            if($project['update_info']['is_update'] && $module_detail->six_read){
-                return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-            }else{
-                //公共拼接页面方法
-                $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_MODULE,$routerMap);
-                //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-                $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_MODULE,$routerMap,null);
-                $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$module_detail);
-                if (isset($moduleCategoryInfo->getExtend->detail_visualization) && $moduleCategoryInfo->getExtend->detail_visualization == 1){
-                    //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                    $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-                }
-                //TDK处理
-                $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_MODULE,$routerMap);
-                //网页公共部分
-                $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-                unset($pageService);
-                $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routePath);
-                //处理URL等,处理html链接a标签href
-                if (!empty($html)){
-                    return  $this->pageUrlHandle($project,$routerMap,$html);
-                }else{
-                    return "";
-                }
-            }
-        }else{
-            return  "";
-        }
-    }
-
-    /**
-     * 获取博客列表页html
-     */
-    public function getBlogListPage($project,$routerMap,$page): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //公共拼接页面方法
-        $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_BLOG_CATE,$routerMap);
-        //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-        $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_BLOG_CATE,$routerMap,$page);
-        $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_BLOG_CATE);
-        if ((int)$isVisual == 1 || $isVisual == null){
-            //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-            $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-        }
-        $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_BLOG_CATE,$routerMap);
-        $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-        unset($pageService);
-        $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routerMap->route);
-        //处理URL等,处理html链接a标签href
-        if (!empty($html)){
-            return  $this->pageUrlHandle($project,$routerMap,$html,"",$page);
-        }else{
-            return "";
-        }
-    }
-
-    /**
-     * 获取博客页html
-     */
-    public function getBlogPage($project,$routerMap,$lang=''): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        $blog_detail = Blog::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",1)->first();
-        if (!empty($blog_detail)){
-            if($project['update_info']['is_update'] && $blog_detail->six_read){
-                return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-            }else{
-                //公共拼接页面方法
-                $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_BLOG,$routerMap);
-                //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
-                $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_BLOG,$routerMap,null);
-                $isVisual = $pageService->isOpenVisualization($project,RouteMap::SOURCE_BLOG);
-                if ((int)$isVisual == 1 || $isVisual == null){
-                    //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                    $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
-                }
-                $webCustomHtml = $tdkService->pageTdkHandle($project,$webCustomHtml,RouteMap::SOURCE_BLOG,$routerMap);
-                $webCustomHtml = $pageService->publicHtmlHandle($webCustomHtml,$project->id);
-                unset($pageService);
-                //生成静态页
-                $html = $commonService->thirdPartyCodeHandle($project,$webCustomHtml,$routerMap->route);
-                //处理URL等,处理html链接a标签href
-                if (!empty($html)){
-                    return  $this->pageUrlHandle($project,$routerMap,$html);
-                }else{
-                    return "";
-                }
-            }
-        }else{
-            return  "";
-        }
-    }
-
-    /**
-     * 获取单页面html
-     */
-    public function getSinglePage($project,$routerMap,$lang=''): string
-    {
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $tdkService = new TdkService();
-        //页面路由
-        $routePath = $routerMap->route;
-        $webCustom = BCustomTemplate::where("id",$routerMap->source_id)->where("status",1)->first();
-        if (!empty($webCustom)){
-            if($project['update_info']['is_update'] && $webCustom->six_read){
-                return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
-            }else{
-                //公共拼接页面方法
-                $content = $pageService->publicMontagePage($project,RouteMap::SOURCE_PAGE,$routerMap);
-                //公共左侧导航处理
-                $phpQueryDom=phpQuery::newDocument($content);
-                $pageService->leftNavSideNavHandle($project,RouteMap::SOURCE_PAGE,$phpQueryDom,$routerMap);
-                $content = $phpQueryDom->htmlOuter();
-                unset($phpQueryDom);
-                //产品，产品分类，新闻，博客（section模板通用数据模块处理）
-                $content = $pageService->generalTemplateProcessingForDataModules($content,$project->id);
-                //生成静态页
-                $content = $tdkService->pageTdkHandle($project,$content,RouteMap::SOURCE_PAGE,$routerMap);
-                $content = $pageService->publicHtmlHandle($content,$project->id);
-                unset($pageService);
-                $html = $commonService->thirdPartyCodeHandle($project,$content,$routePath,$routerMap);
-                //处理URL等,处理html链接a标签href
-                if (!empty($html)){
-                    return  $this->pageUrlHandle($project,$routerMap,$html);
-                }else{
-                    return "";
-                }
-            }
-        }else{
-            return  "";
-        }
-    }
-
-    /**
-     * 获取关键词列表页面
-     */
-    public function getProductKeywordListPage($project,$router,$page): string
-    {
-        if (isset($router->route) && $router->route != null) {
-            $routePath = $router->route;
-        } else {
-            $routePath = $router;
-        }
-        //公共头部底部
-        $pageService = new PageService();
-        $commonService = new CommonService();
-        $publicTemplate = $pageService->getPublicTemplate($project);
-        $headerHtml = $publicTemplate->headerHtml;
-        $footerHtml = $publicTemplate->footerHtml;
-
-        //获取字母开头关键词列表
-        $keywords = $pageService->getProductKeywordsByLetter($project,$router,$page);
-        $html = view("products/products_keywords_list",compact("headerHtml","footerHtml","keywords","routePath"))->__toString();
-        $html = $pageService->publicHtmlHandle($html, $project->id);
-        //生成静态页
-        $webCustomHtml = $commonService->thirdPartyCodeHandle($project, $html, $routePath);
-        //top-search TDK处理，分页link索引处理
-        $webCustomHtml = $pageService->productKeywordListTdkHandle($webCustomHtml,$project,$routePath,$keywords,$page);
-        //处理URL等,处理html链接a标签href
-        if (!empty($html)){
-            $webCustomHtml = $this->pageUrlHandle($project,$routePath,$webCustomHtml);
-        }else{
-            return "";
-        }
-        unset($keywords);
-        unset($html);
-        return $webCustomHtml;
-    }
-
-    /**
-     * TODO:处理URL等,处理html链接a标签href,获取最终html
-     */
-    public function pageUrlHandle($project,$routerMap,$html,$lang="",$page=null): string
-    {
-        if (isset($routerMap->route) && $routerMap->route != null) {
-            $route = $routerMap->route;
-        } else {
-            $route = $routerMap;
-        }
-        $pageService = new PageService();
-        $phpQueryDom=phpQuery::newDocument($html);
-        $domainEnd = $project->domain_end;
-        //主站a链接处理
-        $this->masterWebATagHandle($phpQueryDom,$project,$domainEnd);
-        //html 标签处理
-        $this->htmlTagHandle($phpQueryDom,$project);
-        //国家
-        $webCountry = $pageService->getCountryList($project->id);
-        //语种 alternate
-        $this->setHrefLang($phpQueryDom,$project,$route,$page,$lang,$webCountry);
-        //以-tag的聚合页结尾的路由加上 <meta name="robots" content="noindex">
-        $this->setTagRobotsNoindex($phpQueryDom,$routerMap);
-        //<meta name="cookie_consent_banner" content="参数值"> 配置
-        $this->setCookieConsentBanner($phpQueryDom,$project);
-
-        $html = $phpQueryDom->htmlOuter();
-        unset($phpQueryDom);
-        phpQuery::unloadDocuments();
-
-        //根据配置读取不同的资源路径功能
-        $html = $this->setResourcePath($project,$html);
-        //网站语种列表
-        return $pageService->publicCountryLanguageHandle($html,$project,$route);
-    }
-
-    /**
-     * html 标签处理
-     */
-    public function htmlTagHandle($phpQueryDom,$project)
-    {
-        $phpQueryDom->find("html")->attr("dir","ltr");
-        $mainLang = WebLanguage::getProjectMainLang($project->main_lang_id);
-        if ($mainLang->short == "ru"){
-            $phpQueryDom->find('main .keyword_search')->remove();
-        }
-        $lang = $mainLang ? $mainLang->short : 'en';
-        $phpQueryDom->find("html")->attr("lang",$lang);
-    }
-
-    /**
-     * 888项目禁用鼠标右键点击，查看元素
-     */
-    public function prohibitRightMouseClick($phpQueryDom,$project)
-    {
-        if ($project->id == 888){
-            $phpQueryDom->find("body")->attr("ondragstart","window.event.returnValue=false");
-            $phpQueryDom->find("body")->attr("oncontextmenu","window.event.returnValue=false");
-            $phpQueryDom->find("body")->attr("onselectstart","event.returnValue=false");
-        }
-    }
-
-    /**
-     *主站a链接处理
-     */
-    public function masterWebATagHandle($phpQueryDom,$project,$domainEnd)
-    {
-        foreach ($phpQueryDom->find('a') as $a) {
-            $href = pq($a)->attr('href');
-            //a标签href字符串是否有http://或者https://等协议头，有的话不做处理
-            if (strpos($href, 'http://') !== false || strpos($href, 'https://') !== false || strpos($href, 'javascript') !== false || strpos($href, 'javasctipt') !== false || strpos($href, '#') !== false || empty($href) || strpos($href, '.zip') !== false || strpos($href, '.txt') !== false || strpos($href, 'tel:') !== false || strpos($href, 'mailto') !== false || strpos($href, '.pdf') !== false || strpos($href, '.tar') !== false || strpos($href, '.jpg') !== false || strpos($href, '.png') !== false || strpos($href, '.jpeg') !== false || strpos($href, '.xml') !== false || strpos($href, 'skype:') !== false || strpos($href, 'whatsapp:') !== false) {
-                $domain = $project->domain;
-                $domain = str_replace("http://","",$domain);
-                $domain = str_replace("https://","",$domain);
-                $domain = str_replace("/","",$domain);
-                $domainArr = parse_url($domain);
-                if (strpos($href, '#') !== false || strpos($href, '.xml') !== false){}else{
-                    if (isset($domainArr["path"]) && !empty($domainArr["path"])){
-                        if (strpos($href, 'http://') !== false || strpos($href, 'https://') !== false){
-                            $domain = $domainArr["path"];
-                            if (strpos($href, $domain) !== false){
-                                $href = str_replace("http://","",$href);
-                                $href = str_replace("https://","",$href);
-                                $href = str_replace($domain,"",$href);
-                                if ($domainEnd == Project::$domainEndSlash){
-                                    //以斜杠结尾
-                                    $href = substr($href, -1) === '/' ? $href : $href . "/";
-                                }else{
-                                    //不以斜杠结尾
-                                    if (substr($href, -1) === '/') {
-                                        if ($href != "/"){
-                                            $href = rtrim($href, '/');
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                pq($a)->attr('href', $href);
-            }else{
-                if ($domainEnd == Project::$domainEndSlash){
-                    //以斜杠结尾
-                    $href = substr($href, -1) === '/' ? $href : $href . "/";
-                    if (strpos($href, ".html") !== false || strpos($href, ".htm") !== false){
-                        $href = rtrim($href, '/');
-                    }
-                }else{
-                    //不以斜杠结尾
-                    if (substr($href, -1) === '/') {
-                        if ($href != "/"){
-                            $href = rtrim($href, '/');
-                        }
-                    }
-                }
-            }
-            pq($a)->attr('href', $href);
-        }
-    }
-
-    /**
-     * <meta name="cookie_consent_banner" content="参数值"> 配置
-     */
-    public function setCookieConsentBanner($phpQueryDom,$project)
-    {
-        $deployBuildInfo = DeployBuild::where("project_id",$project->id)->first();
-        if (!empty($deployBuildInfo)){
-            $phpQueryDom->find('head')->append('<meta name="cookie_consent_banner" content="'.$deployBuildInfo->cookie_consent_banner.'">');
-        }
-    }
-
-    /**
-     * 语种 alternate
-     */
-    public function setHrefLang($phpQueryDom,$project,$route,$page,$lang,$webCountry)
-    {
-        //处理源代码语言url
-        $countryUrl = [];
-        $createPageService = new CreatePageService();
-        $domain = $createPageService->domainHandle($project->domain);
-        $mainLang = WebLanguage::getProjectMainLang($project->main_lang_id);
-        if (!empty($webCountry)) {
-            foreach ($webCountry as $key => $item) {
-                //语种列表调整，新增自定义跳转链接
-                if (isset($item->country_custom) && !empty($item->country_custom)){
-                    if ($item->country_custom->is_create == 1){
-                        $page = (int)$page != null && (int)$page != 0 ? (int)$page . "/" : "";
-                        if (!empty($mainLang) && $item->short != $mainLang->short){
-                            $countryUrl[$key]["url"] = "https://" . $item->country_custom->custom_domain . "/" . $route . "/" . $page;
-                        }else{
-                            $countryUrl[$key]["url"] = "https://" . $domain . "/" . $route . "/" . $page;
-                        }
-                    }else{
-                        $countryUrl[$key]["url"] = "https://" . $item->country_custom->custom_domain . "/";
-                    }
-                    $countryUrl[$key]["alias"] = $item->short;
-                }else{
-                    if (!empty($mainLang) && $item->short != $mainLang->short){
-                        $langShort = $item->short."/";
-                    }else{
-                        $langShort = "";
-                    }
-                    if ((int)$page != null) {
-                        $countryUrl[$key]["url"] = "https://" . $domain . "/" .$langShort . $route . "/" . (int)$page . "/";
-                    } else {
-                        $countryUrl[$key]["url"] = $route == "index" ? "https://" . $domain . "/" . $langShort : "https://" . $domain . "/" . $langShort. $route . "/";
-                    }
-                    $countryUrl[$key]["alias"] = $item->short;
-                }
-            }
-        }
-        //路径
-        if ($route == "index") {
-            $webUrl = "https://" . $domain . "/";
-        } else {
-            if ((int)$page != null || (int)$page != 0) {
-                if ($lang != "") {
-                    $langShort = $lang == "en" ? "" : $lang."/";
-                    $webUrl = "https://" . $domain . "/" .$langShort. $route . "/" . (int)$page . "/";
-                } else {
-                    $webUrl = "https://" . $domain . "/" . $route . "/" . (int)$page . "/";
-                }
-            } else {
-                if ($lang != "") {
-                    $langShort = $lang == "en" ? "" : $lang."/";
-                    $webUrl = "https://" . $domain . "/" . $langShort . $route . "/";
-                } else {
-                    $webUrl = "https://" . $domain . "/" . $route . "/";
-                }
-            }
-        }
-        $phpQueryDom->find('head')->append("<meta property='og:url' content='$route'/>");
-        $phpQueryDom->find('head')->append("<link rel='canonical' href='$webUrl' />");
-        if (!empty($countryUrl)){
-            foreach ($countryUrl as $item){
-                if (isset($item['alias']) && isset($item['url'])){
-                    $phpQueryDom->find('head')->append("<link rel='alternate' hreflang='".$item['alias']."' href='".$item['url']."'>");
-                }
-            }
-        }
-    }
-
-    /**
-     * 以-tag的聚合页结尾的路由加上 <meta name="robots" content="noindex">
-     */
-    public function setTagRobotsNoindex($phpQueryDom,$routerMap)
-    {
-        if (isset($routerMap->source) && $routerMap->source == RouteMap::SOURCE_PRODUCT_KEYWORD){
-            $routerSuffix = substr($routerMap->route, -4);
-            $routerLength = strlen($routerMap->route);
-            if ($routerLength >= 4 && $routerSuffix == "-tag"){
-                $phpQueryDom->find('head')->append('<meta name="robots" content="noindex,nofollow">');
-            }
-        }
-    }
-
-    /**
-     * 配置资源路径
-     */
-    public function setResourcePath($project,$html)
-    {
-        $projectLocation = $project->project_location;
-        $storageType = $project->storage_type;
-        $cos = config('filesystems.disks.cos');
-        if ($projectLocation == Project::$projectLocationZero){
-            //普通项目
-            if ($storageType == Project::$storageTypeZero){
-                //压缩项目
-                $html = str_replace($cos['cdn1'],$cos['cdn'],$html);
-            }else{
-                //非压缩项目
-                $html = str_replace($cos['cdn'],$cos['cdn1'],$html);
-            }
-        }else{
-            $s3 = config('filesystems.disks.s3');
-            //危险项目
-            $html = str_replace($cos['cdn1'],$s3['cdn'],$html);
-            $html = str_replace($cos['cdn'],$s3['cdn'],$html);
-        }
-        return $html;
-    }
-
-    /**
-     * 放入文件
-     */
-    public function putHtmlToPageFile($project,$lang,$route,$page,$html,$routeType=""): bool
-    {
-        if (empty($html) || $html == ""){
-            return true;
-        }
-        if (strpos($route, '.php') !== false || strpos($route, '.env') !== false || strpos($route, '.jpg') !== false || strpos($route, '.asp') !== false || strpos($route, '.png') !== false  || strpos($route, '.gif') !== false ){
-            return true;
-        }
-        $domain = $project->domain;
-        $domain = str_replace("https://","",$domain);
-        $domain = str_replace("http://","",$domain);
-        $domain = str_replace("/","",$domain);
-        $originLang = $lang;
-        $lang = $lang == "zh-TW" ? "zh-ct" : $lang;
-        $lang = $lang=="" ? "" : "/".$lang;
-        $page = $page == null || (int)$page == 1 ? null : "/".(int)$page;
-
-        //是否是5.0升级项目
-        if (isset($project->update_info["is_update"]) && $project->update_info["is_update"] == 1){
-            //5.0生成路径
-            $path = $this->getProjectRoutePath5($project,$domain,$route,$routeType,$lang,$page);
-        }else{
-            //6.0生成路径
-            $path = $this->getProjectRoutePath6($project,$domain,$route,$routeType,$lang,$page);
-        }
-        try {
-            //$filePath = iconv("UTF-8", "GBK", $path);
-            $filePath = $path;
-            if (!file_exists(public_path($filePath))) {
-                mkdir(public_path($filePath), 0777, true);
-            }
-            if (strpos($route, ".html") !== false || strpos($route, ".htm") !== false) {
-                file_put_contents(public_path($filePath . ".html"), $html);
-                chmod(public_path($filePath . ".html"), 0777);
-            }else{
-                file_put_contents(public_path($filePath . "/index.html"), $html);
-                chmod(public_path($filePath . "/index.html"), 0777);
-            }
-        } catch (\Exception $e) {
-            return true;
-        }
-
-        return true;
-    }
-
-    /**
-     * 6.0生成路径
-     */
-    public function getProjectRoutePath6($project,$domain,$route,$routeType,$lang,$page): string
-    {
-        if ($routeType == "news" || $routeType == "blogs"){
-            if ($routeType == "blogs"){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->whereIn('path', ['blog','blogs',''])->first();
-            }else{
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path",$routeType)->first();
-            }
-        }else{
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();
-        }
-        if (!empty($routerMap)){
-            if ($routerMap->source == "news"){
-                $route =  "/news/".$route;
-            }elseif($routerMap->source == "blog"){
-                $route = "/blogs/".$route;
-            }elseif($routerMap->source == "module"){
-                $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-                $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
-                if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){
-                    $route = "/".$moduleCategoryInfo->route."/".$route;
-                }
-            }else{
-                $route = $route == "index" ? "" : "/".$route;
-            }
-        }else{
-            $route = $route == "index" ? "" : "/".$route;
-        }
-        $route = str_replace(".html","",$route);
-        $route = str_replace(".htm","",$route);
-        return $domain.$lang.$route.$page;
-    }
-
-    /**
-     * 5.0生成路径
-     */
-    public function getProjectRoutePath5($project,$domain,$route,$routeType,$lang,$page): string
-    {
-        if ($routeType == "news" || $routeType == "blogs"){
-            if ($routeType == "blogs"){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->whereIn('path', ['blog','blogs',''])->first();
-            }else{
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path",$routeType)->first();
-            }
-        }else{
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path","")->first();
-            if (empty($routerMap)){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();
-            }
-        }
-        if (!empty($routerMap)){
-            if ($routerMap->source == "news"){
-                $route =  "/news/".$route;
-            }elseif($routerMap->source == "blog" || $routerMap->source == "blogs"){
-                $route = "/blogs/".$route;
-            }elseif ($routerMap->source == "news_category"){
-                if ($route == "news"){
-                    $route = $page == null || $page == 1 ? "/".$route : "/".$route . "/page";
-                }else{
-                    $route = $page == null || $page == 1 ? "/news_catalog/".$route : "/news_catalog/".$route."/page";
-                }
-            }elseif ($routerMap->source == "blog_category"){
-                if ($route == "blog"){
-                    $route = $page == null || $page == 1 ? "/".$route : "/".$route."/page";
-                }else{
-                    $route = $page == null || $page == 1 ? "/blog_catalog/".$route : "/blog_catalog/".$route."/page";
-                }
-            }elseif ($routerMap->source == "product_category"){
-                $route = $page == null || $page == 1 ? "/".$route : "/".$route."/page";
-            }elseif ($routerMap->source == "module_category"){
-                $moduleCategory = CustomModuleCategory::getModuleCategoryAndExtendById($project->id,$routerMap->source_id);
-                if (!empty($moduleCategory->getExtend->route)){
-                    if ($moduleCategory->getExtend->route == $route){
-                        $route = "/".$moduleCategory->route;
-                    }else{
-                        $route = "/".$moduleCategory->getExtend->route."_catalog/".$moduleCategory->route."/page";
-                    }
-                }else{
-                    $route = "/".$moduleCategory->route."/page";
-                }
-            }elseif ($routerMap->source == "module"){
-                $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-                $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
-                if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){
-                    $route = "/".$moduleCategoryInfo->route."/".$modules->route;
-                }else{
-                    $route = "/".$modules->route;
-                }
-            }else{
-                $route = $route == "index" ? "" : "/".$route;
-            }
-        }else{
-            if ($route == "products"){
-                if ($page == null || $page == 1){
-                    $route = "/".$route;
-                }else{
-                    $route = "/".$route."/page";
-                }
-            }elseif ($route == "news"){
-                $route = $page == null || $page == 1 ? "/".$route : "/".$route;
-            }elseif ($route == "blog"){
-                $route = $page == null || $page == 1 ? "/blog_catalog/".$route : "/blog_catalog/".$route."/page";
-            }else{
-                $route = $route == "index" ? "" : "/".$route;
-            }
-        }
-        $route = str_replace(".html","",$route);
-        $route = str_replace(".htm","",$route);
-        return $domain.$lang.$route.$page;
-    }
-
-    /**
-     * 从主站拿页面
-     */
-    public function getHtmlToPageFile($project,$lang,$route,$page,$routeType = "")
-    {
-        $domain = $project->domain;
-        $domain = str_replace("https://","",$domain);
-        $domain = str_replace("http://","",$domain);
-        $domain = str_replace("/","",$domain);
-        $lang = $lang=="" ? "" : "/".$lang;
-        $page = $page == null || (int)$page == 1 ? null : "/".(int)$page;
-
-        //是否是5.0升级项目
-        if (isset($project->update_info["is_update"]) && $project->update_info["is_update"] == 1){
-            //取5.0生成路径
-            $path = $this->getProjectRoutePagePath5($project,$domain,$route,$routeType,$lang,$page);
-        }else{
-            //取6.0生成路径
-            $path = $this->getProjectRoutePagePath6($project,$domain,$route,$routeType,$lang,$page);
-        }
-
-        try {
-            $filePath = iconv("UTF-8", "GBK", $path);
-            if (file_exists(public_path($filePath . "/index.html"))) {
-                $html = file_get_contents(public_path($filePath . "/index.html"));
-            }else{
-                $html = "";
-            }
-        } catch (\Exception $e) {
-            $html = "";
-        }
-        return $html;
-    }
-
-    /**
-     * 拿6.0页面
-     */
-    public function getProjectRoutePagePath6($project,$domain,$route,$routeType,$lang,$page): string
-    {
-        if ($routeType == "news" || $routeType == "blogs"){
-            if ($routeType == "blogs"){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->whereIn('path', ['blog','blogs',''])->first();
-            }else{
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path",$routeType)->first();
-            }
-
-        }else{
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path","")->first();
-            if (empty($routerMap)){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();
-            }
-        }
-        if (!empty($routerMap)){
-            if ($routerMap->source == "news"){
-                $route =  "/news/".$route;
-            }elseif($routerMap->source == "blog"){
-                $route = "/blogs/".$route;
-            }elseif($routerMap->source == "module"){
-                $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-                $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
-                if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){
-                    $route = "/".$moduleCategoryInfo->route."/".$route;
-                }
-            }else{
-                $route = $route == "index" ? "" : "/".$route;
-            }
-        }else{
-            $route = $route == "index" ? "" : "/".$route;
-        }
-        return $domain.$lang.$route.$page;
-    }
-
-    /**
-     * 拿5.0页面
-     */
-    public function getProjectRoutePagePath5($project,$domain,$route,$routeType,$lang,$page): string
-    {
-        if ($routeType == "news" || $routeType == "blogs"){
-            if ($routeType == "blogs"){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->whereIn('path', ['blog','blogs',''])->first();
-            }else{
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path",$routeType)->first();
-            }
-
-        }else{
-            $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->where("path","")->first();
-            if (empty($routerMap)){
-                $routerMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();
-            }
-        }
-        if (!empty($routerMap)){
-            if ($routerMap->source == "news"){
-                $route =  "/news/".$route;
-            }elseif($routerMap->source == "blog" || $routerMap->source == "blogs"){
-                $route = "/blogs/".$route;
-            }elseif ($routerMap->source == "news_category"){
-                $route = "/news_catalog/".$route."/page";
-            }elseif ($routerMap->source == "blog_category"){
-                $route = "/blog_catalog/".$route."/page";
-            }elseif ($routerMap->source == "product_category"){
-                $route = "/".$route."/page";
-            }elseif ($routerMap->source == "module"){
-                $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
-                $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
-                if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){
-                    $route = "/".$moduleCategoryInfo->getExtend->route."_catalog/".$moduleCategoryInfo->route."/page";
-                }else{
-                    $route = "/extend_catalog/".$moduleCategoryInfo->route."/page";
-                }
-            }else{
-                $route = $route == "index" ? "" : "/".$route;
-            }
-        }else{
-            $route = $route == "index" ? "" : "/".$route;
-        }
-        return $domain.$lang.$route.$page;
-    }
-
-    /**
-     * 翻译
-     */
-    public function translateWebPage($project,$html,$lang,$domain,$route="",$page=null,$countryLang=null): string
-    {
-        if (empty($html) || $html == ""){
-            return $html;
-        }
-        $staticHtmlRepository = new StaticHtmlRepository();
-        try {
-//非主站处理html语言
-            $htmlOld = $this->langUrlHandle($project,$lang,$html,$route,$page,$countryLang);
-            $phpQueryDomOld = phpQuery::newDocument($htmlOld);
-            $langDomContent = $phpQueryDomOld->find("header .change-language")->eq(0)->html();
-            $footerFormDomContent = $phpQueryDomOld->find(".form-footer-inquiry-block")->eq(0)->html();
-            $mainFormDomContent = $phpQueryDomOld->find(".section-form-wrap-block")->eq(0)->html();
-            $popFormDomContent = $phpQueryDomOld->find(".pop-box.inquiry-box")->eq(0)->html();
-            $topSearchDomContent = $phpQueryDomOld->find("main .top-search-title-first-letter-list")->eq(0)->html();
-            $langDomContent5 = $phpQueryDomOld->find(".prisna-wp-translate-seo")->eq(0)->html();
-            unset($phpQueryDomOld);
-            phpQuery::unloadDocuments();
-
-            $newHtml = "";
-            if ($lang != '') {
-              //翻译测试成功，用下面第二红最新翻译
-//            第一种翻译
-//            $commonService = new CommonService();
-//            $htmlNew = $commonService->webHtmlTranslate($project,$htmlOld,$lang,$domain);
-//            第二种翻译
-                $htmlNew = $staticHtmlRepository->getTranHtml($project,$htmlOld,$lang,$route,$page);
-                $phpQueryDomNew = phpQuery::newDocument($htmlNew);
-                unset($htmlOld);
-                $phpQueryDomNew->find("header .change-language")->eq(0)->html($langDomContent);
-                //取消根据翻译状态，翻译tag状态显示主站小语种列表功能（2024.02.27）
-//            $phpQueryDomNew->find("header div[data-module=2]")->find(".change-language-cont")->removeAttr("style");
-                $phpQueryDomNew->find(".form-footer-inquiry-block")->eq(0)->html($footerFormDomContent);
-                $phpQueryDomNew->find(".section-form-wrap-block")->eq(0)->html($mainFormDomContent);
-                $phpQueryDomNew->find(".pop-box.inquiry-box")->eq(0)->html($popFormDomContent);
-                $phpQueryDomNew->find("main .top-search-title-first-letter-list")->eq(0)->html($topSearchDomContent);
-                $phpQueryDomNew->find(".prisna-wp-translate-seo")->eq(0)->html($langDomContent5);
-                $newHtml = $phpQueryDomNew->htmlOuter();
-                unset($phpQueryDomNew,$htmlNew,$langDomContent,$footerFormDomContent,$mainFormDomContent,$popFormDomContent);
-            }
-            phpQuery::unloadDocuments();
-        } catch (\Exception $e) {
-            $newHtml = $staticHtmlRepository->getTranHtml($project,$html,$lang,$route,$page);
-        }
-
-        return $newHtml;
-    }
-
-    /**
-     * 小语种url处理
-     */
-    public function langUrlHandle($project,$lang,$html,$route="",$page=null,$countryLang=null)
-    {
-//        $html = str_replace("\n","",$html);
-        $content = $html;
-        //主站翻译，不进行小语种链接和页面处理
-        if ($project->is_lang_translate == 1){
-            $langInfo = WebLanguage::getProjectMainLang($project->main_lang_id);
-            if ($langInfo->short == $lang){
-                return $content;
-            }
-        }
-        //当前语言国徽背景图片处理
-        if ($lang != ""){
-            $oldLang = $lang;
-            $oldRoute = $route;
-            $phpQueryDom = phpQuery::newDocument($content);
-            //去掉小语种搜索框
-            $phpQueryDom->find("header .search")->remove();
-            $phpQueryDom->find("header .btn--search")->remove();
-            $phpQueryDom->find("header .btn-search")->remove();
-            $phpQueryDom->find("header .head-search")->remove();
-
-            $page = $page == null ? "" : $page."/";
-            $route = $route == "index" || $route == "" ? "" : $route."/";
-            $lang = $lang."/";
-            $langUrl = "https://".$project->domain."/".$lang.$route.$page;
-            $phpQueryDom->find("link[rel=canonical]")->attr("href",$langUrl);
-
-            //翻译版块当前小语种显示
-            $countryDom = $phpQueryDom->find("header div[data-module=2]");
-            $langInfo = WebLanguage::where("short",$oldLang)->first();
-            if (!empty($langInfo)){
-                $countryDom->find(".change-language-title span")->text($langInfo->english);
-            }
-            $oldTwLang = $oldLang == "zh-ct" ? "zh-TW" : $oldLang;
-            $countryDom->find(".change-language-title .country-flag")->attr("class","country-flag language-flag-".$oldTwLang);
-
-            //html 标签处理
-            if ($oldLang == "ar" || $oldLang == "ug"){
-                $phpQueryDom->find("html")->attr("dir","rtl");
-            }else{
-                $phpQueryDom->find("html")->attr("dir","ltr");
-            }
-
-            $phpQueryDom->find("html")->attr("lang",$oldLang);
-            //1：2级目录 2:2级域名
-            $linkingFormat = 1;
-            $mainLang = null;
-            $projectBuild = $project->deployBuild;
-            if (!empty($projectBuild)){
-                $linkingFormat = $projectBuild->linking_format;
-            }
-
-            if (isset($project->main_lang_id) && !empty($project->main_lang_id)){
-                $mainLang = WebLanguage::getProjectMainLang($project->main_lang_id);
-            }
-            //小语种自定义跳转
-            $countryCustomInfo = CountryCustom::getCountryCustomByProjectId($project->id);
-            $countryCustomInfoNew = [];
-            if (!empty($countryCustomInfo)){
-                foreach ($countryCustomInfo as $countryCustomInfoItem){
-                    if (isset($countryCustomInfoItem->country_custom_language->short)){
-                        $countryCustomInfoNew[$countryCustomInfoItem->country_custom_language->short]["custom_domain"] = $countryCustomInfoItem->custom_domain;
-                    }
-                }
-            }
-            // 1、处理A标签跳过图标 2、获取图标HTML a标签处理完成 还原图标HTML
-            //a标签路径问题
-            foreach ($phpQueryDom->find('a') as $a) {
-                $class =pq($a)->attr('class');
-                if (strpos($class, 'language-flag') !== false){
-                    continue;
-                }
-                $href = pq($a)->attr('href');
-                //a标签href字符串是否有http://或者https://等协议头，有的话不做处理
-                if (strpos($href, 'http://') !== false || strpos($href, 'https://') !== false || strpos($href,'javascript') !== false || strpos($href, 'javasctipt') !== false || $href == "#" || empty($href) || strpos($href, '.zip') !== false || strpos($href, '.txt') !== false || strpos($href, 'tel:') !== false || strpos($href, 'mailto') !== false || strpos($href, '.pdf') !== false || strpos($href, '.tar') !== false || strpos($href, '.jpg') !== false || strpos($href, '.png') !== false || strpos($href, '.jpeg') !== false || strpos($href, '.xml') !== false || strpos($href, 'skype:') !== false || strpos($href, 'whatsapp:') !== false) {
-                }else{
-                    if ($lang != ''){
-                        if (!empty($mainLang)){
-                            if ($lang != $mainLang->short){
-                                //小语种自定义链接
-                                if (isset($countryCustomInfoNew[$oldLang])){
-                                    continue;
-                                }
-                                if ($linkingFormat == 1){
-                                    $hrefNew = '/'.$lang . ltrim($href, '/');
-                                }else{
-                                    $hrefNew = '/' . ltrim($href, '/');
-                                }
-                            }else{
-                                $hrefNew = '/' . ltrim($href, '/');
-                            }
-                            pq($a)->attr('href', $hrefNew);
-                        }
-                    }
-                }
-            }
-
-            $data = date("Y-m-d H:i:s");
-            $phpQueryDom->find('html')->append("<!-- Globalso translate Cache file was created on ".$data." -->");
-            $content = $phpQueryDom->htmlOuter();
-            unset($html,$phpQueryDom);
-            phpQuery::unloadDocuments();
-            return $content;
-        }
-        return $content;
-    }
-
-    /**
-     * 生成robots
-     * @param Project $project
-     * @return bool
-     */
-    public function createRobots($project)
-    {
-        if (!empty($project)){
-            $robotTxtPath = public_path($project->domain."/robots.txt");
-            $createSitemapService = new CreateSitemapService();
-            //A端是否开启允许robots爬虫爬取
-            if ($project->robots == 0){
-                $sitemapContent = $this->getRefuseRobotsStr($project->domain);
-            }else{
-                $sitemapContent = $this->getAllowRobotsStr($project->domain);
-            }
-            $domainPath = public_path($project->domain);
-            if (!file_exists($domainPath)){
-                mkdir($domainPath, 0777, true);
-            }
-            $res = $createSitemapService->putSitemapFile($robotTxtPath,$sitemapContent);
-            if ($res){
-                return true;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * 生成允许爬虫爬取robots内容
-     * @param $domain
-     * @return string
-     */
-    public function getAllowRobotsStr($domain)
-    {
-        $domain_arr = config('custom.robots_disallow_domain');
-        $disallow = '';
-        if (in_array($domain, $domain_arr)) {
-            $langArr = WebLanguage::pluck('short');
-            foreach ($langArr as $val) {
-                if ($val == 'en')
-                    continue;
-                $disallow .= 'Disallow: /' . $val . '/' . PHP_EOL;
-            }
-        }
-        $trans_string = is_file(public_path($domain . '/trans_sitemap.xml')) ? "Sitemap: https://".$domain."/trans_sitemap.xml" : '';
-        return "User-agent: *
-Allow: /
-Disallow: /404/
-
-".$disallow."
-User-agent: MSNBot
-Disallow: /
-User-agent: YoudaoBot
-Disallow: /
-User-agent: JikeSpider
-Disallow: /
-User-agent: EasouSpider
-Disallow: /
-User-agent: AhrefsBot
-Disallow: /
-User-agent: MJ12bot
-Disallow: /
-User-agent: YYSpider
-Disallow: /
-User-agent: Teoma
-Disallow: /
-User-agent: rogerbot
-Disallow: /
-User-agent: exabot
-Disallow: /
-User-agent: DotBot
-Disallow: /
-User-agent: gigabot
-Disallow: /
-User-agent: BLEXBot
-Disallow: /
-User-agent: DOCOMO Sprider
-Disallow: /
-User-agent: Applebot
-Disallow: /
-User-agent: SeznamBot
-Disallow: /
-User-agent: SemrushBot
-Disallow: /
-
-Sitemap: https://".$domain."/sitemap.xml
-$trans_string";
-    }
-
-    /**
-     * 获取允许爬虫爬取robots内容
-     */
-    public function getRefuseRobotsStr($domain): string
-    {
-        return "User-agent: *
-Disallow: /";
-    }
-
-    /**
-     * 升级项目，并且以老版本展示
-     * @param $project
-     * @param $routerMap
-     * @param $old_domain_test
-     * @param $old_domain_online
-     * @param $language
-     * @return string
-     * @author Akun
-     * @date 2023/11/29 14:52
-     */
-    public function getOldHtml($project, $routerMap, $old_domain_test, $old_domain_online, $language=''){
-        $collect_info = CollectTask::where('project_id',$project->id)->where('language',$language)->where('source',$routerMap->source)->where('source_id',$routerMap->source_id)->where('status',CollectTask::STATUS_COM)->first();
-        if($collect_info){
-            $html = $collect_info->html;
-            if(strpos($html,'404 Not Found') !== false){
-                return '';
-            }
-            //替换域名
-            $html = str_replace("http://".$old_domain_test,"",$html);
-            $html = str_replace("https://".$old_domain_test,"",$html);
-            $html = str_replace("http://".$old_domain_online,"",$html);
-            $html = str_replace("https://".$old_domain_online,"",$html);
-//            //暂时隐藏小语种
-//            $html = str_replace('<div class="change-language ensemble">','<div class="change-language ensemble" style="display: none">',$html);
-//            $html = str_replace('<div class="language_more">','<div class="language_more" style="display: none">',$html);
-            //处理搜索
-            preg_match_all('/<form\s+[^>]*?action\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_search);
-            $search = $result_search[2] ?? [];
-            foreach ($search as $vc) {
-                if((strpos($vc,'search.php') !== false) || (strpos($vc,'index.php') !== false)){
-                    $html = str_replace($vc,'/search/',$html);
-                }
-            }
-            //增加统计代码
-            $html = str_replace('</body>','<script src="https://ecdn6.globalso.com/public/customerVisit.min.js"></script></body>',$html);
-            return $html;
-        }else{
-            return '';
-        }
-    }
-
-    /**
-     * 更新获取路由
-     */
-    public function getRouters($updateNotifyData,$pageNum): array
-    {
-        $routers = null;
-        $perPage = 100;
-        $offset = ($pageNum - 1) * $perPage;
-        $updateNotifyQuery = UpdateNotify::where("project_id",$updateNotifyData->project_id);
-        if ($updateNotifyData->route == Notify::ROUTE_ALL){
-            //所有更新
-            if ($updateNotifyData->type == Notify::TYPE_MASTER){
-                $updateNotifyQuery->where("status","<",2)->update(['status' => 2]);
-                $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->offset($offset)->limit($perPage)->get()->sortBy(function($item) {
-                    return array_search($item->source, ['page', 'product_category', 'product', 'news_category', 'news', 'blog_category', 'blog', 'product_keyword']);
-                });
-            }else{
-                $updateNotifyQuery->where("minor_languages_status","<",2)->update(['minor_languages_status' => 2]);
-                $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->where("source","!=","product_keyword")->offset($offset)->limit($perPage)->get()->sortBy(function($item) {
-                    return array_search($item->source, ['page', 'product_category', 'product', 'news_category', 'news', 'blog_category', 'blog']);
-                });
-            }
-        }else if($updateNotifyData->route == Notify::ROUTE_PRODUCT_KEYWORD){
-            //产品聚合页更新
-            $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->where("source","product_keyword")->offset($offset)->limit($perPage)->get();
-        }else if($updateNotifyData->route == Notify::ROUTE_PRODUCT_VIDEO_KEYWORD){
-            //产品视频聚合页更新
-            $videoKeywordIdList = Keyword::where("project_id",$updateNotifyData->project_id)->where("status",1)->whereNotNull("route")->whereNotNull("video")->pluck("id")->toArray();
-            if (!empty($videoKeywordIdList)){
-                $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->where("source","product_keyword")->whereIn("source_id",$videoKeywordIdList)->offset($offset)->limit($perPage)->get();
-            }
-        }else if($updateNotifyData->route == Notify::ROUTE_NOT_TRANSLATE){
-            //漏翻译
-            if ($updateNotifyData->type == Notify::TYPE_MINOR){
-                $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->offset($offset)->limit($perPage)->get()->sortBy(function($item) {
-                    return array_search($item->source, ['page', 'product_category', 'product', 'news_category', 'news', 'blog_category', 'blog', 'product_keyword']);
-                });
-            }
-        }else if($updateNotifyData->route == Notify::ROUTE_NEED){
-            //按需更新
-            if ($updateNotifyData->type == Notify::TYPE_MASTER){
-                $routers = $updateNotifyQuery->where("status","<",2)->offset($offset)->limit($perPage)->get();
-                $updateNotifyQuery->where("status","<",2)->update(['status' => 2]);
-            }else{
-                $routers = $updateNotifyQuery->where("minor_languages_status","<",2)->offset($offset)->limit($perPage)->get();
-                $updateNotifyQuery->where("minor_languages_status","<",2)->update(['minor_languages_status' => 2]);
-            }
-        }else{
-            //按url更新
-            $urlArrMap = [];
-            $dataJson = json_decode($updateNotifyData->data);
-            $urlArr = $dataJson->url;
-            if (!empty($urlArr)){
-                if (count($urlArr) != 0){
-                    foreach ($urlArr as $key => $item){
-                        if (strpos($item, 'http://') !== false || strpos($item, 'https://') !== false) {
-                            $pathUrl = parse_url($item);
-                            if (isset($pathUrl["path"])){
-                                $pathUrl = $pathUrl["path"];
-                                if ($pathUrl == "/"){
-                                    $urlArrMap[] = "index";
-                                }
-                            }else{
-                                $urlArrMap[] = "index";
-                            }
-                            $pathInfo = urldecode($pathUrl);
-                            $pageService = new PageService();
-                            $analysisRouteArr = $pageService->analysisRoute($pathInfo);
-                            if (isset($analysisRouteArr["router"])){
-                                $urlArrMap[] = $analysisRouteArr["router"];
-                            }
-                        }else{
-                            $urlArrMap[] = $item;
-                        }
-                    }
-                }
-                $pageNum = 0;
-            }
-
-            $routeNew = [];
-            if (!empty($urlArrMap)){
-                foreach ($urlArrMap as $v){
-                    $routerItem = RouteMap::where("project_id",$updateNotifyData->project_id)->where("route",$v)->first();
-                    if (!empty($routerItem)){
-                        $routeNew[] = $v;
-                    }
-                }
-            }
-            if (!empty($routeNew)){
-                $routeNew = array_values(array_unique(array_filter($routeNew)));
-                $routers = RouteMap::where("project_id",$updateNotifyData->project_id)->whereIn("route",$routeNew)->get();
-            }
-        }
-        $routersInfo["routers"] = $routers;
-        $routersInfo["pageNum"] = $pageNum;
-        return $routersInfo;
-    }
-
-    /**
-     * 数据详情入库数据处理
-     */
-    public function htmlPageQueryDataHandle($routers,$updateNotifyData,$task_id,$isHasData = true)
-    {
-        $page = null;
-        $updateData = [];
-        $data = json_decode($updateNotifyData->data, true);
-        $updateNotifyData->domain = $data['domain'];
-        if ($updateNotifyData->route == Notify::ROUTE_ALL || $updateNotifyData->route == Notify::ROUTE_URL || $updateNotifyData->route == Notify::ROUTE_PRODUCT_KEYWORD || $updateNotifyData->route == Notify::ROUTE_NOT_TRANSLATE){
-            //全部更新
-            if ($isHasData && !empty($routers) && !$routers->isEmpty()){
-                foreach ($routers as $item){
-                    $count = $this->isListAndGetCount($item,$updateNotifyData);
-                    if ($count == 0 || $item->route == "index"){
-                        $updateData['project_id'] = $updateNotifyData->project_id;
-                        $updateData['id'] = $task_id;
-                        $updateData['type'] = $item->source;
-                        $updateData['route'] = $item->route;
-                        $updateData['page'] = $page;
-                        $updateData['domain'] =$updateNotifyData->domain;
-                        $updateDataJson = json_encode($updateData);
-                        //更新页面
-                        $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                    }else{
-                        for ($i = 1; $i <= $count; $i++) {
-                            if ($i == 1){
-                                $updateData['page'] = null;
-                            }else{
-                                $updateData['page'] = $i;
-                            }
-                            $updateData['project_id'] = $updateNotifyData->project_id;
-                            $updateData['id'] = $task_id;
-                            $updateData['type'] = $item->source;
-                            $updateData['route'] = $item->route;
-                            $updateData['domain'] =$updateNotifyData->domain;
-                            $updateDataJson = json_encode($updateData);
-                            //更新页面
-                            $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                        }
-                    }
-                }
-            }
-
-            if (!$isHasData){
-                //判断products,news,blog三个列表页是否存在路由，不存在主动更新
-                //手动更新所有关键词列表页（自定义top-search系列页面）
-                $this->checkProductsNewsBlogListAndGetCount($updateNotifyData,$task_id);
-                if ($updateNotifyData->type == Notify::TYPE_MASTER){
-                    $this->productKeywordListAdnGetCount($updateNotifyData,$task_id);
-                }else{
-                    if ($updateNotifyData->route == Notify::ROUTE_PRODUCT_KEYWORD){
-                        $this->productKeywordListAdnGetCount($updateNotifyData,$task_id);
-                    }
-                }
-            }
-        }else{
-            //按需更新
-            if ($isHasData && !empty($routers) && !$routers->isEmpty()){
-                foreach ($routers as $item){
-                    $count = $this->isListAndGetCount($item,$updateNotifyData);
-                    if ($count == 0 || $item->type == "index"){
-                        $updateData['project_id'] = $updateNotifyData->project_id;
-                        $updateData['id'] = $task_id;
-                        if ($item->type == "index"){
-                            $updateData['type'] = "page";
-                            $updateData['route'] = "index";
-                        }else{
-                            $updateData['type'] = $item->type;
-                            $updateData['route'] = $item->route;
-                        }
-                        $updateData['page'] = $page;
-                        $updateData['domain'] =$updateNotifyData->domain;
-                        $updateDataJson = json_encode($updateData);
-                        //更新页面
-                        $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                    }else{
-                        for ($i = 1; $i <= $count; $i++) {
-                            if ($i == 1){
-                                $updateData['page'] = null;
-                            }else{
-                                $updateData['page'] = $i;
-                            }
-                            $updateData['project_id'] = $updateNotifyData->project_id;
-                            $updateData['id'] = $task_id;
-                            $updateData['type'] = $item->type;
-                            $updateData['route'] = $item->route;
-                            $updateData['domain'] =$updateNotifyData->domain;
-                            $updateDataJson = json_encode($updateData);
-                            //更新页面
-                            $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                        }
-                    }
-                }
-            }
-
-            if (!$isHasData){
-                //判断products,news,blog三个列表页是否存在路由，不存在主动更新
-                $this->checkProductsNewsBlogListAndGetCount($updateNotifyData,$task_id);
-            }
-
-        }
-        unset($routers);
-    }
-
-    /**
-     * 是否是列表，并返回页数
-     */
-    public function isListAndGetCount($router,$updateNotifyData)
-    {
-        $count = 0;
-        $newsQuery = News::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1);
-        $blogQuery = Blog::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1);
-        $productsQuery = Product::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1)->whereNotNull('route');
-        if ($updateNotifyData->route == Notify::ROUTE_ALL || $updateNotifyData->route == Notify::ROUTE_URL){
-            if ($router->source  == "news_category"){
-                if ($router->route == "news"){
-                    $count = $newsQuery->count();
-                }else{
-                    $count = $newsQuery->where("category_id","like","%".",".$router->source_id.","."%")->count();
-                }
-            }
-            if ($router->source  == "blog_category"){
-                if ($router->route == "blog"){
-                    $count = $blogQuery->count();
-                }else{
-                    $count = $blogQuery->where("category_id","like","%".",".$router->source_id.","."%")->count();
-                }
-
-            }
-            if ($router->source  == "product_category"){
-                if ($router->route == "products"){
-                    $count =$productsQuery->count();
-                }else{
-                    $ids = [];
-                    $productCategoryList = Category::getAllSonCategoryById($updateNotifyData->project_id,(int)$router->source_id);
-                    if (!empty($productCategoryList)){
-                        $productList = CategoryRelated::whereIn("cate_id",$productCategoryList)->get();
-                        if (!empty($productList)){
-                            foreach ($productList as $productV){
-                                $ids[] = $productV->product_id;
-                            }
-                        }
-                    }
-                    $count =$productsQuery->whereIn("id",$ids)->count();
-                }
-
-            }
-        }else{
-            $routerMap = RouteMap::where("project_id",$updateNotifyData->project_id)->where("route",$router->route)->first();
-            if (!empty($routerMap)){
-                if ($router->type  == "news_category"){
-                    if ($router->route  == "news"){
-                        $count = $newsQuery->count();
-                    }else{
-                        $count = $newsQuery->where("category_id","like","%".",".$routerMap->source_id.","."%")->count();
-                    }
-                }
-                if ($router->type  == "blog_category"){
-                    if ($router->route  == "blog"){
-                        $count = $blogQuery->count();
-                    }else{
-                        $count = $blogQuery->where("category_id","like","%".",".$routerMap->source_id.","."%")->count();
-                    }
-
-                }
-                if ($router->type  == "product_category"){
-                    if ($router->route  == "products"){
-                        $count = $productsQuery->count();
-                    }else{
-                        $count = $productsQuery->where("category_id","like","%,".(string)$routerMap->source_id.",%")->count();
-                    }
-
-                }
-            }
-        }
-
-        if ($count != 0){
-            if ($router->type  == "product_category"){
-                $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$productListType)->orderBy("id","desc")->first();
-                if (!empty($webSettingNum)){
-                    $perPage = (int)$webSettingNum->num;
-                }else{
-                    $perPage = Category::$productCategoryPagePercent;  //产品每页条数
-                }
-                $total = (int)ceil($count / $perPage);  //产品分类总页数
-            }elseif($router->type  == "news_category"){
-                $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$newsListType)->orderBy("id","desc")->first();
-                if (!empty($webSettingNum)){
-                    $perPage = (int)$webSettingNum->num;
-                }else{
-                    $perPage = NewsCategory::$newsCategoryPagePercent;  //新闻每页条数
-                }
-                $total = (int)ceil($count / $perPage);  //新闻总页数
-            }else{
-                $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$blogListType)->orderBy("id","desc")->first();
-                if (!empty($webSettingNum)){
-                    $perPage = (int)$webSettingNum->num;
-                }else{
-                    $perPage = NewsCategory::$newsCategoryPagePercent;  //博客每页条数
-                }
-                $total = (int)ceil($count / $perPage);  //博客总页数
-            }
-            $count = $total;
-        }
-        return $count;
-
-    }
-
-    /**
-     * 需要更新的页面，主站页面或者小语种页面
-     */
-    public function pushHtmlPage($updateNotifyData, $updateDataJson,$taskId)
-    {
-        //更新页面
-        $mysqlData["created_at"] = now();
-        $mysqlData["updated_at"] = now();
-        $mysqlData["data"] =$updateDataJson;
-        $mysqlData["task_id"] =$taskId;
-        $data = json_decode($updateDataJson);
-        if (!empty($data->page)){
-            $page ="，分页：".$data->page;
-        }else{
-            $page = "";
-        }
-        echo  "创建项目路由：任务ID：" . $taskId ."，项目ID：".$data->project_id."，域名：".$data->domain."，路由：".$data->route.$page. PHP_EOL;
-
-        if ($updateNotifyData->type == Notify::TYPE_MASTER){
-            UpdateMasterWebsiteModel::insertGetId($mysqlData);
-        }else{
-            UpdateMinorLanguagesModel::insertGetId($mysqlData);
-        }
-    }
-
-    /**
-     * 判断products,news,blog三个列表页是否存在路由，不存在主动更新
-     */
-    public function checkProductsNewsBlogListAndGetCount($updateNotifyData,$task_id)
-    {
-        $productsCount = 0;
-        $newsCount = 0;
-        $blogCount = 0;
-        //产品
-        $routerProductsMap = RouteMap::where("project_id",$updateNotifyData->project_id)->where("route","products")->first();
-        if (empty($routerProductsMap)){
-            $productsCount = Product::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1)->whereNotNull('route')->orderBy("id","DESC")->count();
-            if ($productsCount != 0){
-                $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$productListType)->orderBy("id","desc")->first();
-                if (!empty($webSettingNum)){
-                    $perPage = (int)$webSettingNum->num;
-                }else{
-                    $perPage = Category::$productCategoryPagePercent;  //产品每页条数
-                }
-                $productsTotal = (int)ceil($productsCount / $perPage);
-                if ($productsTotal>=1){
-                    for ($i = 1; $i <= $productsTotal; $i++) {
-                        $updateData = [];
-                        if ($i == 1){
-                            $updateData['page'] = null;
-                        }else{
-                            $updateData['page'] = $i;
-                        }
-                        $updateData['project_id'] = $updateNotifyData->project_id;
-                        $updateData['id'] = $task_id;
-                        $updateData['type'] = "product_category";
-                        $updateData['route'] = "products";
-                        $updateData['domain'] =$updateNotifyData->domain;
-                        $updateDataJson = json_encode($updateData);
-                        //更新页面
-                        $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                    }
-                }
-            }
-        }
-
-        //新闻
-        $routerNewsMap = RouteMap::where("project_id",$updateNotifyData->project_id)->where("route","news")->first();
-        if (empty($routerNewsMap)){
-            $newsCount = News::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1)->orderBy("id","DESC")->count();
-            $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$newsListType)->orderBy("id","desc")->first();
-            if (!empty($webSettingNum)){
-                $perPage = (int)$webSettingNum->num;
-            }else{
-                $perPage = NewsCategory::$newsCategoryPagePercent;
-            }
-            $NewsTotal = (int)ceil($newsCount / $perPage);
-            if ($NewsTotal>=1){
-                for ($i = 1; $i <= $NewsTotal; $i++) {
-                    $updateData = [];
-                    if ($i == 1){
-                        $updateData['page'] = null;
-                    }else{
-                        $updateData['page'] = $i;
-                    }
-                    $updateData['project_id'] = $updateNotifyData->project_id;
-                    $updateData['id'] = $task_id;
-                    $updateData['type'] = "news_category";
-                    $updateData['route'] = "news";
-                    $updateData['domain'] =$updateNotifyData->domain;
-                    $updateDataJson = json_encode($updateData);
-                    //更新页面
-                    $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                }
-            }
-        }
-
-        //博客
-        $routerBlogMap = RouteMap::where("project_id",$updateNotifyData->project_id)->where("route","blog")->first();
-        if (empty($routerBlogMap)){
-            $blogCount = Blog::where("project_id",$updateNotifyData->project_id)->select("id")->where("status",1)->orderBy("id","DESC")->count();
-            $webSettingNum = SettingNum::where("project_id",$updateNotifyData->project_id)->where("type",SettingNum::$blogListType)->orderBy("id","desc")->first();
-            if (!empty($webSettingNum)){
-                $perPage = (int)$webSettingNum->num;
-            }else{
-                $perPage = NewsCategory::$newsCategoryPagePercent;
-            }
-            $BlogTotal = (int)ceil($blogCount / $perPage);
-            if ($BlogTotal>=1){
-                for ($i = 1; $i <= $BlogTotal; $i++) {
-                    $updateData = [];
-                    if ($i == 1){
-                        $updateData['page'] = null;
-                    }else{
-                        $updateData['page'] = $i;
-                    }
-                    $updateData['project_id'] = $updateNotifyData->project_id;
-                    $updateData['id'] = $task_id;
-                    $updateData['type'] = "blog_category";
-                    $updateData['route'] = "blog";
-                    $updateData['domain'] =$updateNotifyData->domain;
-                    $updateDataJson = json_encode($updateData);
-                    //更新页面
-                    $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                }
-            }
-        }
-
-    }
-
-    /**
-     * 手动更新所有关键词列表页（自定义top-search系列页面）
-     */
-    public function productKeywordListAdnGetCount($updateNotifyData,$task_id)
-    {
-        $productKeywordInfo = $this->projectProductKeywordsDataAndHandle($updateNotifyData->project_id);
-        if (isset($productKeywordInfo["productKeywordListInfo"]) && !empty($productKeywordInfo["productKeywordListInfo"])){
-            foreach ($productKeywordInfo["productKeywordListInfo"] as $productKeywordItem){
-                if ($productKeywordItem['total']>=1){
-                    for ($i = 1; $i <= $productKeywordItem['total']; $i++) {
-                        if ($i == 1){
-                            $updateData['page'] = null;
-                        }else{
-                            $updateData['page'] = $i;
-                        }
-                        $updateData['project_id'] = $updateNotifyData->project_id;
-                        $updateData['id'] = $task_id;
-                        $updateData['type'] = "product_keyword_list";
-                        $updateData['route'] = $productKeywordItem['route'];
-                        $updateData['domain'] =$updateNotifyData->domain;
-                        $updateDataJson = json_encode($updateData);
-                        //更新页面
-                        $this->pushHtmlPage($updateNotifyData,$updateDataJson,$task_id);
-                    }
-                }
-            }
-        }
-        unset($productKeywordInfo);
-    }
-
-    /**
-     * 获取更新进度表
-     */
-    public function getUpdateProgress($projectId,$type)
-    {
-        $updateProgressQuery = UpdateProgress::where("project_id",(int)$projectId)->orderBy("id","desc");
-        if ($type == "master_website"){
-            $updateProgressQuery = $updateProgressQuery->where("type",1)->first();
-        }else{
-            $updateProgressQuery = $updateProgressQuery->where("type",2)->first();
-        }
-        return $updateProgressQuery;
-    }
-
-    /**
-     * 项目产品关键词列表路由，及数据处理
-     */
-    public function projectProductKeywordsDataAndHandle($projectId): array
-    {
-        $keywordsArr = [];
-        $keywordModel = new Keyword();
-        $keywords = $keywordModel->where("project_id",$projectId)->get();
-
-        if (!empty($keywords)){
-            foreach ($keywords->toArray() as $item){
-                $firstLetter = mb_strtolower(mb_substr($item['title'], 0, 1, 'utf-8'), 'utf-8');
-                $keywordsArr["top-search"][] = $item;
-                if (in_array($firstLetter, $keywordModel->routeZ)){
-                    $keywordsArr["top-search-0"][] = $item;
-                }else{
-                    $keywordsArr["top-search-".$firstLetter][] = $item;
-                }
-            }
-        }
-        return [
-            "productKeywordListInfo"=>$this->projectProductKeywordsDataAndTotalPageHandle($keywordsArr),
-            "productKeywords"=>$keywords,
-        ];
-    }
-
-    /**
-     * 项目产品关键词列表路由数据及总页数
-     */
-    public function projectProductKeywordsDataAndTotalPageHandle($data): array
-    {
-        $projectProjectKeywords = [];
-        $perPage = 80;
-        if (!empty($data)){
-            foreach ($data as $key => $item){
-                $count = count($item);
-                $total = (int)ceil($count / $perPage);
-                $projectProjectKeywords[$key]["route"] =$key;
-                $projectProjectKeywords[$key]["total"] =$total;
-            }
-        }
-        return $projectProjectKeywords;
-    }
-
-    /**
-     * 站点域名处理
-     */
-    public function domainHandle($domain)
-    {
-        $langDomain = str_replace("http://","",$domain);
-        $langDomain = str_replace("https://","",$langDomain);
-        $langDomain = str_replace("/","",$langDomain);
-        return $langDomain;
-    }
-
-    /**
-     * 小语种自定义创建站点目录页面拷贝
-     */
-    public function copyPageMinorWebsiteToCreateDomainDirectory($project)
-    {
-        $countryCustomInfo = CountryCustom::with("countryCustomLanguage")->where("language_id","!=",$project->main_lang_id)->where("project_id",$project->id)->where("status",1)->where("is_create",1)->get();
-        if (!empty($countryCustomInfo)){
-            $langDomain = $this->domainHandle($project->domain);
-            foreach ($countryCustomInfo as $countryCustomInfoItem){
-                $publicLangPath = public_path($langDomain."/".$countryCustomInfoItem->countryCustomLanguage->short);
-                $publicCreatePath = public_path($countryCustomInfoItem->custom_domain);
-                if (file_exists($publicLangPath)){
-                    if (!file_exists($publicCreatePath)){
-                        mkdir($publicCreatePath,0777);
-                    }
-                    File::copyDirectory($publicLangPath, $publicCreatePath);
-                }
-            }
-        }
-    }
-}