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

+<?php
+
+namespace App\Console\Commands\GeneratePDF;
+
+use App\Models\File\PdfFile;
+use App\Models\ProjectAssociation\ProjectAssociation;
+use App\Services\CosService;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Illuminate\Console\Command;
+
+class GeneratePdfData extends Command
+{
+//    use CmdSignal;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'generate_pdf_data';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '生成v6绑定的aicc用户的pdf备用数据';
+
+    // 最大支持5个进程
+    public $maxRunNumber = 50;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function handle()
+    {
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    public function start(): int
+    {
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    protected function main()
+    {
+        $month = date('m');
+        $list  = ProjectAssociation::query()->whereStatus(ProjectAssociation::STATUS_NORMAL)
+                                   ->where('m_status', '!=', $month)->first();
+
+        if (is_null($list)) {
+            $this->error('没有任务，等待中');
+            sleep(60);
+            return 0;
+        }
+        $pdfFile = new PdfFile();
+        $bool    = $pdfFile->saveData(['pid' => $list->id]);
+        if (!$bool) {
+            $this->error('生成v6绑定的aicc用户的pdf备用数据添加失败');
+            return 0;
+        }
+        $list->m_status = $month;
+        $list->save();
+        $this->info('生成v6绑定的aicc用户的pdf备用数据添加成功');
+        return 0;
+    }
+}

 <?php
 <?php
 
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\GeneratePDF;
 
 
-use App\Http\Controllers\File\FileController;
-use App\Models\File\DataFile;
+use App\Models\File\PdfFile;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Services\CosService;
 use App\Services\CosService;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\Facade\Pdf;
@@ -12,7 +11,7 @@ use Illuminate\Http\File;
 
 
 class ProjectFilePDF extends Command
 class ProjectFilePDF extends Command
 {
 {
-    use CmdSignal;
+//    use CmdSignal;
 
 
     /**
     /**
      * The name and signature of the console command.
      * The name and signature of the console command.
@@ -28,14 +27,8 @@ class ProjectFilePDF extends Command
      */
      */
     protected $description = '网站项目数据，生成PDF文件';
     protected $description = '网站项目数据，生成PDF文件';
 
 
-    protected $ProjectAssociation;
-
-    protected $DataFile;
-
     protected $time;
     protected $time;
 
 
-    protected $fileController;
-
     protected $CosService;
     protected $CosService;
 
 
     // 最大支持5个进程
     // 最大支持5个进程
@@ -48,71 +41,89 @@ class ProjectFilePDF extends Command
      */
      */
     public function __construct()
     public function __construct()
     {
     {
-        $this->ProjectAssociation = new ProjectAssociation();
-        $this->DataFile           = new DataFile();
         $this->time       = date("Y-m");
         $this->time       = date("Y-m");
-        $this->fileController     = new FileController();
         $this->CosService = new CosService();
         $this->CosService = new CosService();
         parent::__construct();
         parent::__construct();
     }
     }
 
 
-//    public function handle()
-//    {
-//        $project_data = [];
-//        $html         = $this->html($project_data);
-//        $filename     = hash('md5', $this->time . '-' . '$project_id' . '-' . '$friend_id' . '-' . '$user_id');
-//        $this->savePDF($html, $filename);
-////        $this->testStreamPdf($html, $filename);
-////        $file_path = $this->savePDF2($html, $filename);
-//        return 0;
-//    }
+    public function handle()
+    {
+        // 开始时间
+        $startTime = microtime(true);
+        $html      = $this->html([]);
+        $filename  = hash('md5', $this->time . '-' . random_int(100000, 999999));
+        $this->savePDF($html, $filename);
+
+        // 结束时间
+        $endTime = microtime(true);
+
+        // 计算执行时间
+        $executionTime = ($endTime - $startTime);
+
+        // 输出执行时间
+        var_dump("程序执行时间： " . $executionTime . " 秒");
+//        return $this->main();
+    }
 
 
+    /**
+     * @return int
+     */
     public function start(): int
     public function start(): int
     {
     {
-        # 0 - 未生成
-        # 1 - 已生成
-        # 2 - 其它问题
-        $is_pdf = 0;
-        $lists  = $this->ProjectAssociation::query()->where('is_pdf', $is_pdf)
-                                           ->where('project_id', '!=', 0)
-                                           ->where('friend_id', '!=', 0)
-                                           ->where('user_id', '!=', 0)
-                                           ->where('created_at', 'like', $this->time . '%')->first();
-
-        if (is_null($lists)) {
-            $this->debug_echo('没有任务，等待中');
-            sleep(30);
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    protected function main()
+    {
+        $list = PdfFile::query()->whereIsPdf(PdfFile::GENERATE_NOT_PDF)->first();
+
+        if (is_null($list)) {
+            $this->error('没有任务，等待中');
+            sleep(60);
+            return 0;
+        }
+        $pid = $list->pid;
+        if (empty($pid)) {
+            $this->error('数据错误');
+            return 0;
+        }
+        $isExists = ProjectAssociation::query()->whereId($pid)->whereStatus(ProjectAssociation::STATUS_NORMAL)->first();
+        if (is_null($isExists)) {
+            $this->error('数据已被禁用 —— ' . $pid);
             return 0;
             return 0;
         }
         }
-        $key   = $this->signature . '-' . $lists->id;
-        $count = redis_get($key);
 
 
-        $project_id = $lists->project_id;
-        $user_id    = $lists->user_id;
-        $friend_id  = $lists->friend_id;
+        $key        = 'generate_pdf_' . $list->id;
+        $count      = (int)redis_get($key) ?: 0;
+        $project_id = $isExists->project_id;
+        $user_id    = $isExists->user_id;
+        $friend_id  = $isExists->friend_id;
         // todo 根据项目查询数据
         // todo 根据项目查询数据
         $project_data = [];
         $project_data = [];
         $html         = $this->html($project_data);
         $html         = $this->html($project_data);
         $filename     = hash('md5', $this->time . '-' . $project_id . '-' . $friend_id . '-' . $user_id);
         $filename     = hash('md5', $this->time . '-' . $project_id . '-' . $friend_id . '-' . $user_id);
 
 
-        $file_path = $this->savePDF($html, $filename);
-        if (empty($file_path)) {
-            $this->debug_echo('pdf生成失败！');
+        if ($count == 2) {
+            $list->is_pdf = PdfFile::GENERATE_OTHER_PDF;
+            $list->save();
+            $this->error('项目文件数据保存失败！ - 其他原因 - ' . $key);
             return 0;
             return 0;
         }
         }
-        $isRes = $this->DataFile->saveData(compact('project_id', 'user_id', 'friend_id', 'file_path') + ['time' => $this->time]);
-        if (!$isRes) {
-            if ($count == 2) {
-                $lists->is_pdf = 2;
-                $lists->save();
-                $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
-            } else {
+
+        $file_path = $this->savePDF($html, $filename);
+        if (empty($file_path)) {
             redis_set($key, $count + 1);
             redis_set($key, $count + 1);
-                $this->debug_echo('项目文件数据保存失败！ - ' . $key);
-            }
+            $this->error('pdf生成失败！');
+            return 0;
         }
         }
-        $lists->is_pdf = 1;
-        $lists->save();
+
+        // 保存文件路径
+        $list->file_path = $file_path;
+        $list->is_pdf    = PdfFile::GENERATE_PDF;
+        $list->save();
         $this->info('项目文件数据保存成功！');
         $this->info('项目文件数据保存成功！');
         return 0;
         return 0;
     }
     }
@@ -131,18 +142,22 @@ class ProjectFilePDF extends Command
         }
         }
         // 指定保存路径和文件名
         // 指定保存路径和文件名
         $savePath = $pdf_path . $filename . '.pdf';
         $savePath = $pdf_path . $filename . '.pdf';
+
         if (file_exists($savePath)) {
         if (file_exists($savePath)) {
             echo '文件已经存在';
             echo '文件已经存在';
             return 0;
             return 0;
         }
         }
 
 
+        $path = '/PDF/' . $this->time;
         $pdf  = PDF::loadHTML($html);
         $pdf  = PDF::loadHTML($html);
-        $pdf->save($savePath);
 
 
-        $path = '/V6/PDF/' . $this->time;
-        // 创建一个文件实例
-        $file = new File($savePath);
-        return $this->CosService->uploadFile($file, $path, $filename . '.pdf');
+        // 获取二进制文件
+        $binary = $pdf->output(['compres' => 0]);
+        // 将文件保存到本地
+//        $pdf->save($savePath);
+//        $binary = new File($savePath);
+
+        return $this->CosService->uploadFile($binary, $path, $filename . '.pdf', true);
     }
     }
 
 
     /**
     /**
@@ -153,6 +168,6 @@ class ProjectFilePDF extends Command
     protected function html($item)
     protected function html($item)
     {
     {
         $font_path = storage_path('fonts\msyh.ttf');
         $font_path = storage_path('fonts\msyh.ttf');
-        return '<html><head><title>Laravel</title><meta http-equiv=\'Content-Type\' content=\'text/html; charset=utf-8\'/><style>body{  font-family: \'msyh\';  }  @font-face {  font-family: \'msyh\';  font-style: normal;  font-weight: normal;  src: url(' . $font_path . ') format(\'truetype\');  }</style></head><body><div class=\'container\'><div class=\'content\'><p style=\'font-family: msyh, DejaVu Sans,sans-serif;\'>献给母亲的爱</p><div style=\'font-family: msyh, DejaVu Sans,sans-serif;\' class=\'title\'>Laravel 5中文测试</div><div  class=\'title\'>测试三askjdhfkjasdhf</div></div></div></body></html>';
+        return '<html><head><title>Laravel</title><meta http-equiv=\'Content-Type\' content=\'text/html; charset=utf-8\'/><style>body{  font-family: \'msyh\';  }  @font-face {  font-family: \'msyh\';  font-style: normal;  font-weight: normal;  src: url(' . $font_path . ') format(\'truetype\');  }</style></head><body><div class=\'container\'><div class=\'content\'><p style=\'font-family: msyh, DejaVu Sans,sans-serif;\'>献给母亲的爱</p><div style=\'font-family: msyh, DejaVu Sans,sans-serif;\' class=\'title\'>Laravel 5中文测试sdsd</div><div  class=\'title\'>测试三askjdhfkjasdhf</div></div></div></body></html>';
     }
     }
 }
 }

 <?php
 <?php
 
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\GeneratePDF;
 
 
-use App\Models\File\DataFile;
+use App\Models\File\PdfFile;
+use App\Models\ProjectAssociation\ProjectAssociation;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 
 
-class WebsiteData extends Command
+class PushAiccData extends Command
 {
 {
-    use CmdSignal;
+//    use CmdSignal;
 
 
     /**
     /**
      * The name and signature of the console command.
      * The name and signature of the console command.
      *
      *
      * @var string
      * @var string
      */
      */
-    protected $signature = 'website_data';
+    protected $signature = 'push_data_to_aicc';
 
 
     /**
     /**
      * The console command description.
      * The console command description.
@@ -39,41 +40,65 @@ class WebsiteData extends Command
         parent::__construct();
         parent::__construct();
     }
     }
 
 
+
+    public function handle()
+    {
+        return $this->main();
+    }
+
     public function start(): int
     public function start(): int
     {
     {
-        # 0 - 未推送
-        # 1 - 已推送
-        # 2 - 其他问题
-        $status = 0;
-        $lists  = DataFile::query()->where('status', $status)
-                          ->where('created_at', 'like', $this->time . '%')->first();
-        if (is_null($lists)) {
-            $this->debug_echo('没有任务，等待中');
-            sleep(30);
+        return $this->main();
+    }
+
+    protected function main()
+    {
+        $list = PdfFile::query()->whereIsPdf(PdfFile::GENERATE_PUSH)->whereIsPush(PdfFile::GENERATE_NOT_PUSH)->first();
+        if (is_null($list)) {
+            $this->error('向AICC推送 - 没有任务，等待中');
+            sleep(60);
             return 0;
             return 0;
         }
         }
 
 
-        $key         = $this->signature . '-' . $lists->id;
-        $count       = redis_get($key);
-        $data        = $lists;
+        $pid = $list->pid;
+        if (empty($pid)) {
+            $this->error('向AICC推送数据错误');
+            return 0;
+        }
+        $isExists = ProjectAssociation::query()->whereId($pid)->whereStatus(ProjectAssociation::STATUS_NORMAL)->first();
+        if (is_null($isExists)) {
+            $this->error('向AICC推送数据已被禁用 —— ' . $pid);
+            return 0;
+        }
+
+        $key   = 'push_data_to_aicc_' . $list->id;
+        $count = (int)redis_get($key) ?: 0;
+
+        $data               = $list->toArray();
+        $data['project_id'] = $isExists->project_id;
+        $data['friend_id']  = $isExists->friend_id;
+        $data['user_id']    = $isExists->user_id;
+
         $url         = env('AICC_URL');
         $url         = env('AICC_URL');
         $msg         = http_post($url, json_encode(compact('data')));
         $msg         = http_post($url, json_encode(compact('data')));
         $status_code = 0;
         $status_code = 0;
         if ($msg) {
         if ($msg) {
             $status_code = (int)$msg['status'];
             $status_code = (int)$msg['status'];
         }
         }
-        if ($status_code != 200) {
         if ($count == 2) {
         if ($count == 2) {
-                $lists->status = 2;
-                $lists->save();
+            $list->is_push = PdfFile::GENERATE_OTHER_PUSH;
+            $list->save();
             $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
             $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
-            } else {
+            return 0;
+        }
+
+        if ($status_code != 200) {
             redis_set($key, $count + 1);
             redis_set($key, $count + 1);
             $this->debug_echo('项目文件数据保存失败！ - ' . $key);
             $this->debug_echo('项目文件数据保存失败！ - ' . $key);
+            return 0;
         }
         }
-        }
-        $lists->status = 1;
-        $lists->save();
+        $list->is_push = PdfFile::GENERATE_PUSH;
+        $list->save();
         $this->info('项目文件数据保存成功！');
         $this->info('项目文件数据保存成功！');
         return 0;
         return 0;
     }
     }

+<?php
+/**
+ * @remark :
+ * @name   :UpdateRoute.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/11/20 15:07
+ */
+
+namespace App\Console\Commands;
+
+use App\Models\Blog\Blog;
+use App\Models\Blog\BlogCategory;
+use App\Models\News\News;
+use App\Models\News\NewsCategory;
+use App\Models\Product\Category;
+use App\Models\Product\Keyword;
+use App\Models\Product\Product;
+use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplateMain;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * @remark :更新所有项目的路由
+ * @name   :UpdateRoute
+ * @author :lyh
+ * @method :post
+ * @time   :2023/11/20 15:08
+ */
+class UpdateMainHtml extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update_main';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '洗数据';
+
+    /**
+     * @remark :统一更新路由
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:13
+     */
+    public function handle(){
+        $projectModel = new Project();
+        $list = $projectModel->list(['type'=>['!=',0]]);
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $this->editMainHtml();
+            DB::disconnect('custom_mysql');
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+    /**
+     * @remark :洗数据
+     * @name   :getMainHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 18:03
+     */
+    public function editMainHtml(){
+        $mainModel = new BTemplateMain();
+//        $mainModel->edit(['type'=>3],['type'=>4]);
+        $mainModel->edit(['type'=>4],['type'=>6]);
+        return true;
+    }
+}

@@ -29,9 +29,11 @@ class ComController extends BaseController
     public function get_menu(){
     public function get_menu(){
         //根据当前登录用户角色返回用户菜单列表
         //根据当前登录用户角色返回用户菜单列表
         $projectMenuModel = new ProjectMenuModel();
         $projectMenuModel = new ProjectMenuModel();
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export(11111, true) . PHP_EOL, FILE_APPEND);
         if($this->user['role_id'] != 0){
         if($this->user['role_id'] != 0){
             $this->map = $this->getNoAdminMenuCondition();
             $this->map = $this->getNoAdminMenuCondition();
         }else{
         }else{
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($this->map, true) . PHP_EOL, FILE_APPEND);
             $this->map = $this->getAdminMenuCondition();
             $this->map = $this->getAdminMenuCondition();
         }
         }
         $lists = $projectMenuModel->list($this->map,'sort');
         $lists = $projectMenuModel->list($this->map,'sort');

@@ -45,7 +45,7 @@ class BTemplateController extends BaseController
             'source.required' => 'source不能为空',
             'source.required' => 'source不能为空',
             'source_id.required' => 'source_id不能为空',
             'source_id.required' => 'source_id不能为空',
         ]);
         ]);
-        $info = $BTemplateLogic->getTemplate();
+        $info = $BTemplateLogic->getTemplateHtml();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
@@ -138,28 +138,4 @@ class BTemplateController extends BaseController
         $this->response('模板保存成功');
         $this->response('模板保存成功');
     }
     }
 
 
-    /**
-     * @remark :获取可视化详情页模板数据
-     * @name   :getDetailInfo
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/24 11:27
-     */
-    public function getDetailInfo(BTemplateLogic $BTemplateLogic){
-        $html = $BTemplateLogic->getDetail();
-        $this->response('success',Code::SUCCESS,['html'=>$html]);
-    }
-
-    /**
-     * @remark :保存详情页模板数据
-     * @name   :saveDetail
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/24 14:47
-     */
-    public function saveDetail(BTemplateLogic $BTemplateLogic){
-        $BTemplateLogic->saveDetail();
-        $this->response('success');
-    }
-
 }
 }

 <?php
 <?php
 /**
 /**
  * @remark :
  * @remark :
- * @name   :VisualizationController.php
+ * @name   :InitHtmlController.php
  * @author :lyh
  * @author :lyh
  * @method :post
  * @method :post
- * @time   :2023/11/15 9:55
+ * @time   :2023/12/27 10:37
  */
  */
 
 
 namespace App\Http\Controllers\Bside\Template;
 namespace App\Http\Controllers\Bside\Template;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
+use App\Http\Logic\Bside\BTemplate\InitHtmlLogic;
 use App\Http\Logic\Bside\BTemplate\VisualizationLogic;
 use App\Http\Logic\Bside\BTemplate\VisualizationLogic;
 
 
 /**
 /**
- * @remark :定制项目处理
- * @name   :VisualizationController
+ * @remark :初始复合页代码块上传
+ * @name   :InitHtmlController
  * @author :lyh
  * @author :lyh
  * @method :post
  * @method :post
- * @time   :2023/11/15 9:55
+ * @time   :2023/12/27 10:37
  */
  */
-class VisualizationController extends BaseController
+class InitHtmlController extends BaseController
 {
 {
     /**
     /**
+     * @remark :获取可视化详情页模板数据
+     * @name   :getDetailInfo
+     * @author :lyh
+     * @method :post $param (type:类型，2产品 3博客 4新闻 对应扩展模块的id)
+     * @time   :2023/10/24 11:27
+     */
+    public function getDetailHtml(InitHtmlLogic $logic){
+        $this->request->validate([
+            'type'=>['required'],
+        ],[
+            'type.required' => '类型不能为空',
+        ]);
+        $html = $logic->getDetailHtml();
+        $this->response('success',Code::SUCCESS,['html'=>$html]);
+    }
+
+    /**
+     * @remark :保存详情页模板数据
+     * @name   :saveDetail
+     * @author :lyh
+     * @method :post $param (type:类型，2产品 3博客 4新闻 对应扩展模块的id)
+     * @time   :2023/10/24 14:47
+     */
+    public function saveDetailHtml(InitHtmlLogic $logic){
+        $this->request->validate([
+            'type'=>['required'],
+        ],[
+            'type.required' => '类型不能为空',
+        ]);
+        $logic->saveDetailHtml();
+        $this->response('success');
+    }
+
+    /**
      * @remark :获取当前定制代码块详情
      * @remark :获取当前定制代码块详情
      * @name   :info
      * @name   :info
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/11/15 10:26
      * @time   :2023/11/15 10:26
      */
      */
-    public function info(VisualizationLogic $logic){
-        $info = $logic->getVisualizationInfo();
+    public function getCustomizedHtml(InitHtmlLogic $logic){
+        $this->request->validate([
+            'type'=>['required'],
+        ],[
+            'type.required' => '类型不能为空',
+        ]);
+        $info = $logic->getCustomizedHtml();
         if($info === false){
         if($info === false){
             $info = [];
             $info = [];
         }
         }
@@ -44,8 +85,13 @@ class VisualizationController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/11/15 10:08
      * @time   :2023/11/15 10:08
      */
      */
-    public function save(VisualizationLogic $logic){
-        $logic->saveVisualization();
+    public function saveCustomizedHtml(InitHtmlLogic $logic){
+        $this->request->validate([
+            'type'=>['required'],
+        ],[
+            'type.required' => '类型不能为空',
+        ]);
+        $logic->saveCustomizedHtml();
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }

@@ -57,48 +57,42 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :获取当前选择使用的模板
-     * @name   :getModuleTemplate
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/29 9:44
-     */
-    public function getTemplate(){
-        $template_id = $this->getSettingTemplate($this->param['source'],$this->param['source_id']);//设置的模版id
-        $data = $this->getHtml($template_id,$this->param['source'],$this->param['source_id'],$this->param['is_custom'] ?? 0);
-        return $this->success($data);
-    }
-
-    /**
-     * @remark :获取可视化装修的html
+     * @remark :获取可视化html
      * @name   :getTemplateHtml
      * @name   :getTemplateHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/13 10:47
+     * @time   :2023/12/27 14:48
      */
      */
-    public function getHtml($template_id,$source,$source_id,$is_custom){
-        $templateInfo = $this->webTemplateInfo($template_id,$source,$source_id,$is_custom);
+    public function getTemplateHtml(){
+        $is_custom = $this->param['is_custom'] ?? 0;//是否为扩展模块
+        $is_list = $this->param['is_list'] ?? 0;//是否为列表页
+        $template_id = $this->getSettingTemplate($this->param['source'],$is_list);//设置的模版id
+        $templateInfo = $this->model->read([
+            'template_id'=>$template_id, 'source'=>$this->param['source'],
+            'project_id'=>$this->user['project_id'], 'source_id'=>$this->param['source_id'],
+            'is_custom'=>$is_custom, 'is_list'=>$is_list
+        ]);
         if($templateInfo === false){
         if($templateInfo === false){
             if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//处理定制页面初始数据
             if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//处理定制页面初始数据
-                $html = $this->isCustomizedPage($source,$source_id);//查看当前页面是否定制
+                $html = $this->isCustomizedPage($this->param['source'],$is_list);//获取定制页面的html
                 return $this->success(['html'=>$html,'template_id'=>$template_id]);
                 return $this->success(['html'=>$html,'template_id'=>$template_id]);
             }
             }
-            $mainInfo = $this->getCommonMain($source,$source_id,$is_custom);//获取中间部分代码
+            $mainInfo = $this->getMAinHtml($this->param['source'],$is_custom,$is_list);//获取中间部分代码
         }else{
         }else{
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
-                $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
-                $commonInfo = $this->getCommonPage($type,$this->user['project_id'],0);//获取定制头部
+                $commonInfo = $this->getCommonHtml($this->param['source'],$is_list,0);//获取定制头部
                 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
                 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
                 return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
                 return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
             }
             }
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
         }
         }
-        $commonInfo = $this->getCommonPage($source,$source_id,$template_id);//获取头部
+        $commonInfo = $this->getCommonHtml($this->param['source'],$is_list,$template_id);//获取定制头部
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
             $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
             $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
         $html = $this->getHeadFooter($html);
         $html = $this->getHeadFooter($html);
         $result = ['html'=>$html,'template_id'=>$template_id];
         $result = ['html'=>$html,'template_id'=>$template_id];
-        if($templateInfo !== false){
+        if($templateInfo !== false)
+        {
             $result['id'] = $templateInfo['id'];
             $result['id'] = $templateInfo['id'];
             $result['updated_at'] = $templateInfo['updated_at'];
             $result['updated_at'] = $templateInfo['updated_at'];
         }
         }
@@ -106,6 +100,43 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取中间部分的html
+     * @name   :getMAinHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 15:00
+     */
+    public function getMAinHtml($type,$is_custom,$is_list){
+        //获取设置的默认中间部分
+        $bTemplateMainModel = new BTemplateMain();
+        $mainInfo = $bTemplateMainModel->read(['type'=>$type,'is_list'=>$is_list,'is_custom'=>$is_custom]);
+        if($mainInfo === false){
+            $main_html = $this->getInitModule($type,$is_custom,$is_list);
+            $main_css = "<style id='globalsojs-styles'></style>";
+        }else{
+            $main_html = $mainInfo['main_html'];
+            $main_css = $mainInfo['main_css'];
+        }
+        return ['main_html'=>$main_html,'main_css'=>$main_css];
+    }
+
+    /**
+     * @remark :默认复合页数据
+     * @name   :getProductModule
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/27 15:08
+     */
+    public function getInitModule($type,$is_custom,$is_list){
+        if($is_custom == BTemplate::SOURCE_CUSTOM) {
+            $type = BTemplate::TYPE_CUSTOM;
+        }
+        $mainModel = new TemplateTypeMain();
+        $info = $mainModel->read(['type'=>$type,'is_list'=>$is_list]);
+        return $info['main_html'];
+    }
+
+    /**
      * @remark :返回整个html截取代码
      * @remark :返回整个html截取代码
      * @name   :handleAllHtml
      * @name   :handleAllHtml
      * @author :lyh
      * @author :lyh
@@ -129,19 +160,19 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/13 10:55
      * @time   :2023/12/13 10:55
      */
      */
-    public function isCustomizedPage($source,$source_id)
+    public function isCustomizedPage($source,$is_list)
     {
     {
-        $type = $this->getCustomizedType($source, $source_id);//获取定制界面类型
+        $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
         //查看当前页面是否定制，是否开启可视化
         //查看当前页面是否定制，是否开启可视化
         $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
         $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
         if (in_array($type, $page_array)) {//是定制界面
         if (in_array($type, $page_array)) {//是定制界面
             //TODO::获取初始代码
             //TODO::获取初始代码
             $bTemplateMainModel = new BTemplateMain();
             $bTemplateMainModel = new BTemplateMain();
-            $customHtmlInfo = $bTemplateMainModel->read(['type'=>$type]);
+            $customHtmlInfo = $bTemplateMainModel->read(['type'=>$source,'is_list'=>$is_list]);
             if($customHtmlInfo === false){
             if($customHtmlInfo === false){
                 $this->fail('定制页面，请先上传代码块');
                 $this->fail('定制页面，请先上传代码块');
             }
             }
-            $commonInfo = $this->getCommonPage($type,$this->user['project_id'],0);//获取定制头部
+            $commonInfo = $this->getCommonHtml($type,$is_list,0);//获取定制头部
             if($commonInfo !== false){
             if($commonInfo !== false){
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
             }
             }
@@ -151,22 +182,34 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :定制界面根据source+source_id获取type类型
+     * @remark :根据source获取type类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/11/16 11:20
      * @time   :2023/11/16 11:20
      */
      */
-    public function getCustomizedType($source,$source_id){
+    public function getCustomizedType($source,$is_list){
         $type = BTemplate::TYPE_ONE;
         $type = BTemplate::TYPE_ONE;
         if($source == BTemplate::SOURCE_PRODUCT){
         if($source == BTemplate::SOURCE_PRODUCT){
-            if($source_id == 0){$type = BTemplate::TYPE_THREE;}else{$type = BTemplate::TYPE_TWO;}
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_THREE;
+            }else{
+                $type = BTemplate::TYPE_TWO;
+            }
         }
         }
         if($source == BTemplate::SOURCE_BLOG){
         if($source == BTemplate::SOURCE_BLOG){
-            if($source_id == 0){$type = BTemplate::TYPE_FIVE;}else{$type = BTemplate::TYPE_FOUR;}
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_FIVE;
+            }else{
+                $type = BTemplate::TYPE_FOUR;
+            }
         }
         }
         if($source == BTemplate::SOURCE_NEWS){
         if($source == BTemplate::SOURCE_NEWS){
-            if($source_id == 0){$type = BTemplate::TYPE_SEVEN;}else{$type = BTemplate::TYPE_SIX;}
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_SEVEN;
+            }else{
+                $type = BTemplate::TYPE_SIX;
+            }
         }
         }
         return $type;
         return $type;
     }
     }
@@ -178,13 +221,14 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/13 10:48
      * @time   :2023/12/13 10:48
      */
      */
-    public function getSettingTemplate($source,$source_id){
+    public function getSettingTemplate($source,$is_list){
+        $template_id = 0;
         if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION) {//定制项目
         if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION) {//定制项目
-            $type = $this->getCustomizedType($source, $source_id);//获取定制界面类型
+            $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
             //查看当前页面是否定制，是否开启可视化
             //查看当前页面是否定制，是否开启可视化
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
             if (in_array($type, $page_array)) {//是定制界面
             if (in_array($type, $page_array)) {//是定制界面
-                return 0;
+                return $this->success($template_id);
             }
             }
         }
         }
         $bSettingModel = new Setting();
         $bSettingModel = new Setting();
@@ -192,188 +236,237 @@ class BTemplateLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $this->fail('请先选择模版');
             $this->fail('请先选择模版');
         }
         }
-        return $info['template_id'];
+        $template_id = $info['template_id'];
+        return $this->success($template_id);
     }
     }
 
 
     /**
     /**
-     * @remark :根据参数获取数据详情
-     * @name   :webTemplateInfo
+     * @remark :根据类型获取公共头和底
+     * @name   :getCommonPage
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/7/25 16:41
+     * @time   :2023/10/21 16:55
      */
      */
-    public function webTemplateInfo($template_id,$source,$source_id,$is_custom = 0){
-        //查看当前模板是否已编辑保存web_template
-        $TemplateInfo = $this->model->read([
-            'template_id'=>$template_id,
-            'source'=>$source,
-            'project_id'=>$this->user['project_id'],
-            'source_id'=>$source_id,
-            'is_custom'=>$is_custom
-        ]);
-        return $this->success($TemplateInfo);
+    public function getCommonHtml($source,$is_list,$template_id){
+        $is_head = $this->user['configuration']['is_head'] ?? 0;
+        $data = [
+            'template_id' => $template_id,
+            'project_id' => $this->user['project_id']
+        ];
+        if($template_id == 0){
+            $is_head = BTemplate::IS_HEADER;
+        }
+        if($is_head != BTemplate::IS_NO_HEADER) {
+            //查看页面是否设置自定义头部底部
+            $pageSettingModel = new PageSetting();
+            $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
+            if($pageInfo !== false){
+                $commonInfo = [];
+                if ($source == BTemplate::SOURCE_BLOG) {//产品页
+                    $commonInfo = $this->getProductCommonHtml($data,$is_list,$pageInfo);
+                }
+                if ($source == BTemplate::SOURCE_BLOG) {//博客页
+                    $commonInfo = $this->getBlogCommonHtml($data,$is_list,$pageInfo);
+                }
+                if ($source == BTemplate::SOURCE_NEWS) {//新闻页
+                    $commonInfo = $this->getNewsCommonHtml($data,$is_list,$pageInfo);
+                }
+                if ($source == BTemplate::SOURCE_KEYWORD) {//聚合页
+                    $commonInfo = $this->getKeywordCommonHtml($data,$pageInfo);
+                }
+                if(!empty($commonInfo)){
+                    return $this->success($commonInfo);
+                }
+            }
+        }
+        //获取首页公共的头部和底部
+        $commonInfo = $this->getHomeCommonHtml($data);
+        return $commonInfo;
     }
     }
 
 
     /**
     /**
-     * @remark :获取中间公共部分
-     * @name   :getCommonMain
+     * @remark :获取首页头部底部
+     * @name   :getHomeCommonHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/24 15:58
+     * @time   :2023/12/27 16:11
      */
      */
-    public function getCommonMain($source,$source_id,$is_custom){
-        $data = [];
-        if($is_custom == BTemplate::SOURCE_CUSTOM){
-            if($source_id != 0){$type = BTemplate::TYPE_CUSTOM_DETAIL;}else{$type = BTemplate::TYPE_CUSTOM_LIST;}
-        }else{
-            if ($source == BTemplate::SOURCE_PRODUCT) {if ($source_id != 0) {$type = BTemplate::TYPE_TWO;} else {$type = BTemplate::TYPE_THREE;}}
-            if ($source == BTemplate::SOURCE_BLOG) {if ($source_id != 0) {$type = BTemplate::TYPE_FOUR;} else {$type = BTemplate::TYPE_FIVE;}}
-            if ($source == BTemplate::SOURCE_NEWS) {if ($source_id != 0) {$type = BTemplate::TYPE_SIX;} else {$type = BTemplate::TYPE_SEVEN;}}
-            if ($source == BTemplate::SOURCE_KEYWORD) {$type = BTemplate::TYPE_EIGHT;}
+    public function getHomeCommonHtml($data){
+        $data['type'] = BTemplate::SOURCE_HOME;
+        $commonTemplateModel = new BTemplateCommon();
+        return $commonTemplateModel->read($data);
     }
     }
-        //查询有没有公共详情模板
-        $bTemplateMainModel = new BTemplateMain();
-        $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$type]);
-        if($mainInfo === false){
-            $data['main_html'] = $this->getModule($type);
-            $data['main_css'] = "<style id='globalsojs-styles'></style>";
-        }else{
-            $data['main_html'] = $mainInfo['main_html'];
-            $data['main_css'] = $mainInfo['main_css'];
+
+    /**
+     * @remark :聚合页
+     * @name   :getKeywordCommonHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 16:09
+     */
+    public function getKeywordCommonHtml($data,$pageInfo){
+        $commonInfo = [];
+        $commonTemplateModel = new BTemplateCommon();
+        $data['type'] = BTemplate::TYPE_EIGHT;
+        if ($pageInfo['polymerization'] != 0) {
+            $commonInfo = $commonTemplateModel->read($data);
+            if($commonInfo === false){
+                $commonInfo = [];
             }
             }
-        return $data;
+        }
+        return $this->success($commonInfo);
     }
     }
 
 
     /**
     /**
-     * @remark :根据类型获取公共头和底
-     * @name   :getCommonPage
+     * @remark :产品头部底部
+     * @name   :getProductCommonHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/21 16:55
+     * @time   :2023/12/27 16:01
      */
      */
-    public function getCommonPage($source,$source_id,$template_id){
-        if(isset($this->user['configuration']['is_head']) && ($this->user['configuration']['is_head'] != 0)) {
-            //查看页面是否设置自定义头部底部
-            $pageSettingModel = new PageSetting();
-            $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
-            if ($pageInfo != false) {
+    public function getProductCommonHtml($data,$is_list,$pageInfo){
+        $commonInfo = [];
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
-                $data = [
-                    'template_id' => $template_id,
-                    'project_id' => $this->user['project_id']
-                ];
-                if ($source == BTemplate::SOURCE_PRODUCT) {//产品页
-                    if($source_id != 0){$data['type'] = BTemplate::TYPE_TWO;if ($pageInfo['product_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
-                    else {$data['type'] = BTemplate::TYPE_THREE;if ($pageInfo['product_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == BTemplate::SOURCE_BLOG) {//博客页
-                    if ($source_id != 0) {$data['type'] = BTemplate::TYPE_FOUR;if ($pageInfo['blog_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
-                    else {$data['type'] = BTemplate::TYPE_FIVE;if ($pageInfo['blog_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == BTemplate::SOURCE_NEWS) {//新闻页
-                    if ($source_id != 0) {$data['type'] = BTemplate::TYPE_SIX;if ($pageInfo['news_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
-                    else {$data['type'] = BTemplate::TYPE_SEVEN;if ($pageInfo['news_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == BTemplate::SOURCE_KEYWORD) {//聚合页
-                    $data['type'] = BTemplate::TYPE_EIGHT;if ($pageInfo['polymerization'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
+        if($is_list == BTemplate::IS_LIST){
+            $data['type'] = BTemplate::TYPE_THREE;
+            if ($pageInfo['product_list'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
                 }
                 }
             }
             }
-        //获取首页公共的头部和底部
-        if(!isset($commonInfo) || $commonInfo === false){
-            $commonTemplateModel = new BTemplateCommon();
-            $commonInfo = $commonTemplateModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>BTemplate::TYPE_ONE]);
+        } else {
+            $data['type'] = BTemplate::TYPE_TWO;
+            if ($pageInfo['product_details'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
+                }
             }
             }
-        return $commonInfo;
+        }
+        return $this->success($commonInfo);
     }
     }
 
 
     /**
     /**
-     * @remark :保存修改后的模版
-     * @name   :templateSave
+     * @remark :博客头部
+     * @name   :getBlogCommonHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/6/29 11:05
+     * @time   :2023/12/27 16:05
      */
      */
-    public function templateSave(){
-        //演示项目不允许修改
-        $this->showProjectNoEdit($this->param['source']);
-        DB::beginTransaction();
-        try {
-            $this->param = $this->handleDefaultString($this->param);//设置默认字符
-            $templateInfo = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],
-                $this->param['source_id'],$this->param['is_custom']);
-            if($templateInfo === false){//执行新增
-                $this->templateAddHtml($this->param['html'], $this->param['source'], $this->param['source_id'],
-                    $this->param['template_id'], $this->param['section_list_id'], $this->param['is_custom']);
-            }else{//执行编辑
-                $this->templateEditHtml($this->param['html'],$this->param['source'],$this->param['source_id'],
-                    $this->param['template_id'],$this->param['section_list_id'], $this->param['is_custom']);
+    public function getBlogCommonHtml($data,$is_list,$pageInfo){
+        $commonInfo = [];
+        $commonTemplateModel = new BTemplateCommon();
+        if ($is_list == BTemplate::IS_LIST) {
+            $data['type'] = BTemplate::TYPE_SEVEN;
+            if ($pageInfo['blog_list'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
+                }
+            }
+        } else {
+            $data['type'] = BTemplate::TYPE_SIX;
+            if ($pageInfo['blog_details'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
                 }
                 }
-            //更新头部信息
-            $this->saveCommonHtml($this->param['html'],$this->param['source'],$this->param['source_id'],$this->param['template_id']);
-            $this->setOperationRecords($this->param['html'],$this->param['source'],$this->param['source_id'],$this->param['template_id'],$this->param['is_custom']);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('系统错误，请联系管理员');
             }
             }
-        //通知更新
-        $this->homeOrProduct($this->param['source'],$this->param['source_id'],$this->param['is_custom']);
-        return $this->success();
+        }
+        return $this->success($commonInfo);
     }
     }
 
 
     /**
     /**
-     * @remark :保存数据时设置默认字符
-     * @name   :saveDefaultString
+     * @remark :新闻头部
+     * @name   :getNewsCommonHtml
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/15 10:30
+     * @time   :2023/12/27 16:07
      */
      */
-    public function handleDefaultString($param){
-        if(!isset($param['template_id'])){
-            $param['template_id'] = 0;
+    public function getNewsCommonHtml($data,$is_list,$pageInfo){
+        $commonInfo = [];
+        $commonTemplateModel = new BTemplateCommon();
+        if ($is_list == BTemplate::IS_LIST) {
+            $data['type'] = BTemplate::TYPE_SEVEN;
+            if ($pageInfo['news_list'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
                 }
                 }
-        if(!isset($param['is_custom'])){
-            $param['is_custom'] = 0;
             }
             }
-        if(!isset($param['section_list_id'])){
-            $param['section_list_id'] = '';
+        } else {
+            $data['type'] = BTemplate::TYPE_SIX;
+            if ($pageInfo['news_details'] != 0) {
+                $commonInfo = $commonTemplateModel->read($data);
+                if($commonInfo === false){
+                    $commonInfo = [];
                 }
                 }
-        return $this->success($param);
+            }
+        }
+        return $this->success($commonInfo);
     }
     }
 
 
     /**
     /**
-     * @remark :可视化添加数据
-     * @name   :templateAddHtml
+     * @remark :保存修改后的模版
+     * @name   :templateSave
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/15 10:15
+     * @time   :2023/6/29 11:05
      */
      */
-    public function templateAddHtml($html,$source,$source_id,$template,$section_list_id,$is_custom){
+    public function templateSave(){
+        //演示项目不允许修改
+        $this->showProjectNoEdit($this->param['source']);
+        $this->param = $this->handleDefaultString($this->param);//设置默认数据
+        $templateInfo = $this->model->read([
+            'template_id'=>$this->param['template_id'],
+            'source'=>$this->param['source'],
+            'source_id'=>$this->param['source_id'],
+            'is_custom'=>$this->param['is_custom'],
+            'is_list'=>$this->param['is_list']
+        ]);
+        if($templateInfo === false){//执行新增
             $data = [
             $data = [
-            'source'=>$source, 'source_id'=>$source_id,'type'=>BTemplate::PAGE_HTML,
-            'template_id'=>$template, 'project_id'=>$this->user['project_id'],
-            'section_list_id'=>$section_list_id,'is_custom'=>$is_custom,
+                'source'=>$this->param['source'], 'source_id'=>$this->param['source_id'],'type'=>BTemplate::PAGE_HTML,
+                'template_id'=>$this->param['template_id'], 'project_id'=>$this->user['project_id'],
+                'section_list_id'=>$this->param['section_list_id'],'is_custom'=>$this->param['is_custom'],
+                'is_list'=>$this->param['is_list']
             ];
             ];
-        $data = $this->handleVisualizationParam($html,$source,$source_id,$data);
+            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$data);
             $this->model->add($data);
             $this->model->add($data);
-        return true;
+        }else{//执行编辑
+            $condition = [
+                'source'=>$this->param['source'], 'source_id'=>$this->param['source'],
+                'is_custom'=>$this->param['is_custom'], 'template_id'=>$this->param['template_id'],
+                'is_list'=>$this->param['is_list']
+            ];
+            $data = [
+                'section_list_id'=>$this->param['section_list_id']
+            ];
+            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$data);
+            $this->model->edit($data,$condition);
+        }
+        //更新头部信息
+        $this->saveCommonHtml($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['template_id']);
+        $this->setOperationRecords($this->param['html'],$this->param['source'],$this->param['source_id'],$this->param['template_id'],$this->param['is_custom']);
+        //通知更新
+        $this->homeOrProduct($this->param['source'],$this->param['source_id'],$this->param['is_custom'],$this->param['is_list']);
+        return $this->success();
     }
     }
 
 
     /**
     /**
-     * @remark :可视化更新html
-     * @name   :templateEditHtml
+     * @remark :保存数据时设置默认字符
+     * @name   :saveDefaultString
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/15 10:26
+     * @time   :2023/12/15 10:30
      */
      */
-    public function templateEditHtml($html,$source,$source_id,$template,$section_list_id,$is_custom){
-        $condition = [
-            'source'=>$source, 'source_id'=>$source_id,
-            'is_custom'=>$is_custom, 'template_id'=>$template
-        ];
-        $data = [
-            'section_list_id'=>$section_list_id
-        ];
-        $data = $this->handleVisualizationParam($html,$source,$source_id,$data);
-        $this->model->edit($data,$condition);
-        return true;
+    public function handleDefaultString($param){
+        $param['template_id'] = $param['template_id'] ?? 0;
+        $param['is_custom'] = $param['is_custom'] = 0;
+        $param['section_list_id'] = $param['section_list_id'] ?? '';
+        $param['is_list'] = $param['is_list'] ?? 0;
+        return $this->success($param);
     }
     }
 
 
     /**
     /**
@@ -383,9 +476,9 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/15 10:59
      * @time   :2023/12/15 10:59
      */
      */
-    public function handleVisualizationParam($html,$source, $source_id,$data){
+    public function handleVisualizationParam($html,$source, $is_list,$data){
         if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//定制项目
         if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//定制项目
-            $type = $this->getCustomizedType($source, $source_id);//获取定制界面类型
+            $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
             //查看当前页面是否定制，是否开启可视化
             //查看当前页面是否定制，是否开启可视化
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
             if (in_array($type, $page_array)) {//当前页面是定制界面
             if (in_array($type, $page_array)) {//当前页面是定制界面
@@ -412,8 +505,8 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/13 17:05
      * @time   :2023/12/13 17:05
      */
      */
-    public function saveCommonHtml($html,$source,$source_id,$template_id){
-        $type = $this->getType($source,$source_id,$template_id);//获取头部类型1-9（首页到自定义页面）
+    public function saveCommonHtml($html,$source,$is_list,$template_id){
+        $type = $this->getType($source,$is_list,$template_id);//获取头部类型1-9（首页到自定义页面）
         $templateCommonModel = new BTemplateCommon();
         $templateCommonModel = new BTemplateCommon();
         $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);//查看当前头部是否存在
         $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);//查看当前头部是否存在
         $handleInfo = $this->handleCommonParam($html);
         $handleInfo = $this->handleCommonParam($html);
@@ -482,32 +575,34 @@ class BTemplateLogic extends BaseLogic
         return $this->success($param);
         return $this->success($param);
     }
     }
     /**
     /**
-     * @remark :获取设置的类型
+     * @remark :保存时获取获取设置的类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/10/21 17:29
      * @time   :2023/10/21 17:29
      */
      */
-    public function getType($source,$source_id,$template_id){
-        $type = 1;//首页公共头部底部
+    public function getType($source,$is_list,$template_id){
+        $type = BTemplate::SOURCE_HOME;//首页公共头部底部
+        $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
         if($template_id == 0){//保存上传的代码块时，默认为独立头部
         if($template_id == 0){//保存上传的代码块时，默认为独立头部
-            $this->user['configuration']['is_head'] == 1;
+            $is_head == BTemplate::IS_HEADER;
         }
         }
         //查看页面是否设置自定义头部底部
         //查看页面是否设置自定义头部底部
-        if(isset($this->user['configuration']['is_head']) && ($this->user['configuration']['is_head'] != 0)) {
+        if($is_head != BTemplate::IS_NO_HEADER) {
             $pageSettingModel = new PageSetting();
             $pageSettingModel = new PageSetting();
             $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
             $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
-            if ($pageInfo !== false) {
-                if ($source == BTemplate::SOURCE_PRODUCT) {if ($source_id != 0) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::TYPE_TWO;}}
+            if ($pageInfo === false) {
+                return $this->success($type);
+            }
+            if ($source == BTemplate::SOURCE_PRODUCT) {if ($is_list == 0) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::TYPE_TWO;}}
             else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::TYPE_THREE;}}}
             else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::TYPE_THREE;}}}
-                if ($source == BTemplate::SOURCE_BLOG) {if ($source_id != 0) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::TYPE_FOUR;}}
+            if ($source == BTemplate::SOURCE_BLOG) {if ($is_list == 0) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::TYPE_FOUR;}}
             else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::TYPE_FIVE;}}}
             else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::TYPE_FIVE;}}}
-                if ($source == BTemplate::SOURCE_NEWS) {if ($source_id != 0) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::TYPE_SIX;}}
+            if ($source == BTemplate::SOURCE_NEWS) {if ($is_list == 0) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::TYPE_SIX;}}
             else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::TYPE_SEVEN;}}}
             else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::TYPE_SEVEN;}}}
             if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_EIGHT;}}
             if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_EIGHT;}}
         }
         }
-        }
-        return $type;
+        return $this->success($type);
     }
     }
 
 
     /**
     /**
@@ -518,6 +613,9 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/8/23 11:16
      * @time   :2023/8/23 11:16
      */
      */
     public function setOperationRecords($html,$source,$source_id,$template_id,$is_custom,$type = 0){
     public function setOperationRecords($html,$source,$source_id,$template_id,$is_custom,$type = 0){
+        if($source != BTemplate::SOURCE_HOME){
+            return true;
+        }
         $data = [
         $data = [
             'template_id'=>$template_id,
             'template_id'=>$template_id,
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
@@ -547,23 +645,39 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/31 16:05
      * @time   :2023/7/31 16:05
      */
      */
-    public function homeOrProduct($source,$source_id = 0,$is_custom = 0){
+    public function homeOrProduct($source,$source_id = 0,$is_custom = 0,$is_list = 0){
         if($is_custom == 0){
         if($is_custom == 0){
             if($source == BTemplate::SOURCE_HOME){
             if($source == BTemplate::SOURCE_HOME){
                 RouteMap::setRoute('index', RouteMap::SOURCE_PAGE, 0, $this->user['project_id']);
                 RouteMap::setRoute('index', RouteMap::SOURCE_PAGE, 0, $this->user['project_id']);
                 $type = RouteMap::SOURCE_PAGE;
                 $type = RouteMap::SOURCE_PAGE;
             }elseif($source == BTemplate::SOURCE_PRODUCT){
             }elseif($source == BTemplate::SOURCE_PRODUCT){
+                if($is_list == BTemplate::IS_LIST){
+                    $type = RouteMap::SOURCE_PRODUCT_CATE;
+                }else{
                     $type = RouteMap::SOURCE_PRODUCT;
                     $type = RouteMap::SOURCE_PRODUCT;
+                }
             }elseif($source == BTemplate::SOURCE_BLOG){
             }elseif($source == BTemplate::SOURCE_BLOG){
+                if($is_list == BTemplate::IS_LIST){
+                    $type = RouteMap::SOURCE_BLOG_CATE;
+                }else{
                     $type = RouteMap::SOURCE_BLOG;
                     $type = RouteMap::SOURCE_BLOG;
+                }
             }elseif($source == BTemplate::SOURCE_NEWS){
             }elseif($source == BTemplate::SOURCE_NEWS){
+                if($is_list == BTemplate::IS_LIST){
+                    $type = RouteMap::SOURCE_NEWS_CATE;
+                }else{
                     $type = RouteMap::SOURCE_NEWS;
                     $type = RouteMap::SOURCE_NEWS;
+                }
             }else{
             }else{
                 $type = 'all';
                 $type = 'all';
             }
             }
         }else{
         }else{
+            if($is_list == BTemplate::IS_LIST){
+                $type = RouteMap::SOURCE_MODULE_CATE;
+            }else{
                 $type = RouteMap::SOURCE_MODULE;
                 $type = RouteMap::SOURCE_MODULE;
             }
             }
+        }
         $route = RouteMap::getRoute($type,$source_id,$this->user['project_id']);
         $route = RouteMap::getRoute($type,$source_id,$this->user['project_id']);
         $this->addUpdateNotify($type,$route);
         $this->addUpdateNotify($type,$route);
         return $this->curlDelRoute(['route'=>$route,'new_route'=>$route]);
         return $this->curlDelRoute(['route'=>$route,'new_route'=>$route]);
@@ -615,19 +729,6 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :默认产品模块
-     * @name   :getProductModule
-     * @author :lyh
-     * @method :post
-     * @time   :2023/7/27 15:08
-     */
-    public function getModule($type){
-        $mainModel = new TemplateTypeMain();
-        $info = $mainModel->read(['type'=>$type]);
-        return $info['main_html'];
-    }
-
-    /**
      * @remark :设置主题公共head
      * @remark :设置主题公共head
      * @name   :setHeadInfo
      * @name   :setHeadInfo
      * @author :lyh
      * @author :lyh
@@ -823,134 +924,4 @@ class BTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
-
-    /**
-     * @remark :获取详情模板详情
-     * @name   :getDetail
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/24 11:29
-     */
-    public function getDetail(){
-        $bSettingModel = new Setting();
-        $bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
-        if($bSettingInfo === false){
-            $this->fail('请先设置模板');
-        }
-        $is_custom = $this->param['is_custom'] ?? 0;//扩展模块详情模版
-        $commonInfo = $this->getTypeCommonHtml($bSettingInfo['template_id'],$this->param['type'],$is_custom);
-        //获取设置的默认中间部分
-        $bTemplateMainModel = new BTemplateMain();
-        $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_custom'=>$is_custom]);
-        if($mainInfo === false){
-            if($is_custom == BTemplate::SOURCE_CUSTOM) {
-                $this->param['type'] = BTemplate::TYPE_CUSTOM_DETAIL;
-            }
-            $main_html = $this->getModule($this->param['type']);
-            $main_style = "<style id='globalsojs-styles'></style>";
-        }else{
-            $main_html = $mainInfo['main_html'];
-            $main_style = $mainInfo['main_css'];
-        }
-        $html = $commonInfo['head_css'].$main_style.$commonInfo['footer_css'].$commonInfo['other'].
-            $commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
-        $html = $this->getHeadFooter($html);//组装数据
-        return $this->success($html);
-    }
-
-    /**
-     * @remark :根据type获取html
-     * @name   :getHeaderFooter
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/15 18:06
-     */
-    public function getTypeCommonHtml($template_id,$type,$is_custom){
-        //获取首页公共部分
-        $templateCommonModel = new BTemplateCommon();
-        $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>1]);
-        if($is_custom == BTemplate::SOURCE_CUSTOM){
-            return $this->success($commonInfo);
-        }
-        //判断当前项目是否有设置独立头部的权限
-        if(isset($this->user['configuration']['is_head']) && ($this->user['configuration']['is_head'] != 0)) {
-            //有权限时，获取独立头部
-            $commonTypeInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);
-            if($commonTypeInfo !== false){
-                $commonInfo = $commonTypeInfo;
-            }
-        }
-        return $this->success($commonInfo);
-    }
-
-    /**
-     * @remark :保存详情模板数据
-     * @name   :saveDetail
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/24 11:53
-     */
-    public function saveDetail(){
-        $bSettingModel = new Setting();
-        $bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
-        if($bSettingInfo === false){
-            $this->fail('请先设置模板');
-        }
-        $is_custom = $this->param['is_custom'] ?? 0;//扩展模块详情模版
-        $data = [
-            'main_html'=>characterTruncation($this->param['html'],'/<main\b[^>]*>(.*?)<\/main>/s'),
-            'main_css'=>characterTruncation($this->param['html'],'/<style id="globalsojs-styles">(.*?)<\/style>/s'),
-        ];
-        $data['section_list_id'] = $this->param['section_list_id'];
-        //保存中间部分
-        $bTemplateMainModel = new BTemplateMain();
-        $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_custom'=>$is_custom]);
-        if($mainInfo === false){
-            $data['project_id'] = $this->user['project_id'];
-            $data['type'] = $this->param['type'];
-            $data['is_custom'] = $is_custom;
-            $bTemplateMainModel->add($data);
-        }else{
-            $bTemplateMainModel->edit($data,['id'=>$mainInfo['id']]);
-        }
-        $this->saveDetailCommonHtml($is_custom,$this->param['type'],$bSettingInfo['template_id'],$this->param['html']);
-        return $this->success();
-    }
-
-    /**
-     * @remark :保存详情页模版头部底部
-     * @name   :saveDetailCommonHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/15 18:12
-     */
-    public function saveDetailCommonHtml($is_custom,$type,$template_id,$html){
-        $publicData = [
-            'head_html' => characterTruncation($html,'/<header\b[^>]*>(.*?)<\/header>/s'),
-            'head_css' => characterTruncation($html,'/<style id="globalsojs-header">(.*?)<\/style>/s'),
-            'footer_html' => characterTruncation($html,'/<footer\b[^>]*>(.*?)<\/footer>/s'),
-            'footer_css' => characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<\/style>/s'),
-            'other'=>str_replace('<header','',characterTruncation($html,"/<link id=\"google-fonts-link\"(.*?)<header/s")),
-        ];
-        //查看当前模板是否有独立头部，有独立头部，更新独立头部,无独立头部，更新公共头部
-        if($is_custom == BTemplate::SOURCE_CUSTOM){//扩展模块
-            $this->user['configuration']['is_head'] = BTemplate::SOURCE_NO_CUSTOM;
-        }
-        $templateCommonModel = new BTemplateCommon();
-        if(isset($this->user['configuration']['is_head']) && ($this->user['configuration']['is_head'] != 0)) {
-            $templateCommonInfo = $templateCommonModel->read(['type'=>$type,'project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
-            if($templateCommonInfo === false){
-                $publicData['type'] = $type;
-                $publicData['project_id'] = $this->user['project_id'];
-                $publicData['template_id'] = $template_id;
-                $templateCommonModel->add($publicData);
-            }else{
-                $templateCommonModel->edit($publicData,['id'=>$templateCommonInfo['id']]);
-            }
-        }else{
-            //更新首页头部底部
-            $templateCommonModel->edit($publicData,['type'=>1,'project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
-        }
-        return true;
-    }
 }
 }

@@ -29,7 +29,7 @@ class CustomTemplateLogic extends BaseLogic
      * @time   :2023/6/29 15:46
      * @time   :2023/6/29 15:46
      */
      */
     public function customTemplateLists($map,$page,$row,$order = 'created_at'){
     public function customTemplateLists($map,$page,$row,$order = 'created_at'){
-        $filed = ['id','name','status','url','title','keywords','description','project_id','created_at','updated_at'];
+        $filed = ['id','name','status','url','title','keywords','description','project_id','is_upgrade','six_read','created_at','updated_at'];
         $map['deleted_status'] = 0;
         $map['deleted_status'] = 0;
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         $lists = $this->model->lists($map,$page,$row,$order,$filed);

+<?php
+/**
+ * @remark :
+ * @name   :InitHtmlLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/12/27 10:39
+ */
+
+namespace App\Http\Logic\Bside\BTemplate;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Service\Service as ServiceSettingModel;
+use App\Models\Template\BTemplate;
+use App\Models\Template\BTemplateCommon;
+use App\Models\Template\BTemplateMain;
+use App\Models\Template\Setting;
+use App\Models\Template\TemplateTypeMain;
+
+class InitHtmlLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :获取非定制项目复合页数据
+     * @name   :getDetailHtml
+     * @author :lyh
+     * @method :post $param (type:类型，2产品 3博客 4新闻 对应扩展模块的id)
+     * @time   :2023/12/27 10:50
+     */
+    public function getDetailHtml(){
+        $template_id = $this->getTemplateId();
+        $is_custom = $this->param['is_custom'] ?? 0;//TODO::1：代表扩展模块
+        $is_list = $this->param['is_list'] ?? 0;//TODO::1：代表分类列表模块
+        //获取设置的默认中间部分
+        $bTemplateMainModel = new BTemplateMain();
+        $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_list'=>$is_list,'is_custom'=>$is_custom]);
+        if($mainInfo === false){
+            $main_html = $this->getInitModule($this->param['type'],$is_custom,$is_list);
+            $main_style = "<style id='globalsojs-styles'></style>";
+        }else{
+            $main_html = $mainInfo['main_html'];
+            $main_style = $mainInfo['main_css'];
+        }
+        $commonInfo = $this->getTypeCommonHtml($template_id,$this->param['type'],$is_custom,$is_list);        //获取头部
+        $html = $commonInfo['head_css'].$main_style.$commonInfo['footer_css'].$commonInfo['other'].$commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
+        $html = $this->getHeadFooter($html);//组装数据
+        return $this->success($html);
+    }
+
+    /**
+     * @remark :拼接获取公共头部底部
+     * @name   :getHeadFooter
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/21 17:22
+     */
+    public function getHeadFooter($html){
+        //获取公共主题头部底部
+        $serviceSettingModel = new ServiceSettingModel();
+        $list = $serviceSettingModel->list(['type'=>2],'created_at');
+        //拼接html
+        foreach ($list as $v){
+            if($v['key'] == 'head'){
+                $html = $v['values'].$html;
+            }
+            if($v['key'] == 'footer'){
+                $html = $html.$v['values'];
+            }
+        }
+        return $html;
+    }
+
+    /**
+     * @remark :保存复合页数据
+     * @name   :saveDetailHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 11:57
+     */
+    public function saveDetailHtml(){
+        $template_id = $this->getTemplateId();
+        $is_custom = $this->param['is_custom'] ?? 0;//TODO::1：代表扩展模块
+        $is_list = $this->param['is_list'] ?? 0;//TODO::1：代表分类列表模块
+        //保存中间部分
+        $bTemplateMainModel = new BTemplateMain();
+        $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_custom'=>$is_custom,'is_list'=>$is_list]);
+        if($mainInfo === false){
+            $data = [
+                'main_html'=>characterTruncation($this->param['html'],'/<main\b[^>]*>(.*?)<\/main>/s'),
+                'main_css'=>characterTruncation($this->param['html'],'/<style id="globalsojs-styles">(.*?)<\/style>/s'),
+                'section_list_id'=>$this->param['section_list_id'] ?? '',
+                'project_id'=>$this->user['project_id'],
+                'type'=>$this->param['type'],
+                'is_custom'=>$is_custom,
+                'is_list'=>$is_list
+            ];
+            $bTemplateMainModel->add($data);
+        }else{
+            $data = [
+                'main_html'=>characterTruncation($this->param['html'],'/<main\b[^>]*>(.*?)<\/main>/s'),
+                'main_css'=>characterTruncation($this->param['html'],'/<style id="globalsojs-styles">(.*?)<\/style>/s'),
+                'section_list_id'=>$this->param['section_list_id'] ?? '',
+            ];
+            $bTemplateMainModel->edit($data,['id'=>$mainInfo['id']]);
+        }
+        $this->saveDetailCommonHtml($this->param['html'],$this->param['type'],$template_id,$is_custom,$is_list);
+        return $this->success();
+    }
+    /**
+     * @remark :保存详情页模版头部底部
+     * @name   :saveDetailCommonHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/15 18:12
+     */
+    public function saveDetailCommonHtml($html,$type,$template_id,$is_custom,$is_list){
+        $publicData = $this->handleCommonParam($html);
+        $templateCommonModel = new BTemplateCommon();
+        //查看当前模板是否有独立头部，有独立头部，更新独立头部,无独立头部，更新公共头部
+        $is_head = $this->user['configuration']['is_head'] ?? 0;
+        if($is_custom == BTemplate::SOURCE_CUSTOM){//todo::扩展模块无独立头部底部
+            $is_head = BTemplate::IS_NO_HEADER;
+        }
+        if($is_head == BTemplate::IS_HEADER) {
+            //有独立头部，更新独立头部
+            $commonType = $this->getHeaderType($type,$is_list);
+            $templateCommonInfo = $templateCommonModel->read(['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'type'=>$commonType]);
+            if($templateCommonInfo === false){
+                $publicData['type'] = $type;
+                $publicData['project_id'] = $this->user['project_id'];
+                $publicData['template_id'] = $template_id;
+                $templateCommonModel->add($publicData);
+            }else{
+                $templateCommonModel->edit($publicData,['id'=>$templateCommonInfo['id']]);
+            }
+        }else{
+            //更新首页头部底部
+            $templateCommonModel->edit($publicData,['type'=>BTemplate::SOURCE_HOME,'project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :保存时字符串处理
+     * @name   :handleCommonParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/29 15:35
+     */
+    public function handleCommonParam($html){
+        //字符串截取
+        $param['head_html'] = characterTruncation($html,'/<header\b[^>]*>(.*?)<\/header>/s');
+        $param['footer_html'] = characterTruncation($html,'/<footer\b[^>]*>(.*?)<\/footer>/s');
+        $param['head_css'] = characterTruncation($html,'/<style id="globalsojs-header">(.*?)<\/style>/s');
+        $param['footer_css'] = characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<\/style>/s');
+        $footer_other = str_replace('<header','',characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<header/s'));
+        $param['other'] = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', '', $footer_other);
+        return $this->success($param);
+    }
+
+    /**
+     * @remark :默认复合页数据
+     * @name   :getProductModule
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/27 15:08
+     */
+    public function getInitModule($type,$is_custom,$is_list){
+        if($is_custom == BTemplate::SOURCE_CUSTOM) {
+            $type = BTemplate::TYPE_CUSTOM;
+        }
+        $mainModel = new TemplateTypeMain();
+        $info = $mainModel->read(['type'=>$type,'is_list'=>$is_list]);
+        return $info['main_html'];
+    }
+
+    /**
+     * @remark :根据type获取头部html
+     * @name   :getHeaderFooter
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/15 18:06
+     */
+    public function getTypeCommonHtml($template_id,$type,$is_custom,$is_list){
+        //判断当前项目是否有设置独立头部的权限
+        $is_head = $this->user['configuration']['is_head'] ?? 0;
+        if($is_custom == BTemplate::SOURCE_CUSTOM){//todo::拓展模块默认取首页
+            $is_head = BTemplate::IS_NO_HEADER;
+        }
+        //获取首页公共部分
+        $templateCommonModel = new BTemplateCommon();
+        if($is_head == BTemplate::IS_HEADER) {
+            //有独立头部，获取独立头部
+            $commonType = $this->getHeaderType($type,$is_list);
+            $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$commonType]);
+            if($commonInfo !== false){
+                return $this->success($commonInfo);
+            }
+        }
+        //首页头底
+        $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>BTemplate::SOURCE_HOME]);
+        return $this->success($commonInfo);
+    }
+
+    /**
+     * @remark :独立头部获取头部底部类型
+     * @name   :getHeaderType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 11:36
+     */
+    public function getHeaderType($type,$is_list){
+        $resultType = BTemplate::SOURCE_HOME;
+        if($type == BTemplate::SOURCE_PRODUCT){
+            if($is_list == BTemplate::IS_LIST){
+                $resultType = BTemplate::TYPE_THREE;
+            }else{
+                $resultType = BTemplate::TYPE_TWO;
+            }
+        }
+        if($type == BTemplate::SOURCE_BLOG){
+            if($is_list == BTemplate::IS_LIST){
+                $resultType = BTemplate::TYPE_FIVE;
+            }else{
+                $resultType = BTemplate::TYPE_FOUR;
+            }
+        }
+        if($type == BTemplate::SOURCE_NEWS){
+            if($is_list == BTemplate::IS_LIST){
+                $resultType = BTemplate::TYPE_SEVEN;
+            }else{
+                $resultType = BTemplate::TYPE_SIX;
+            }
+        }
+        return $this->success($resultType);
+    }
+
+    /**
+     * @remark :获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/27 10:51
+     */
+    public function getTemplateId(){
+        $bSettingModel = new Setting();
+        $bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']],['id','template_id']);
+        if($bSettingInfo === false){
+            $this->fail('请先设置模板');
+        }
+        return $this->success($bSettingInfo['template_id']);
+    }
+
+    /**
+     * @remark :获取代码块
+     * @name   :getVisualizationInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/17 14:44
+     */
+    public function getCustomizedHtml(){
+        $is_list = $this->param['is_list'] ?? 0;
+        $bTemplateMainModel = new BTemplateMain();
+        $info = $bTemplateMainModel->read(['type'=>$this->param['type'],'is_list'=>$is_list]);
+        if($info === false){
+            $html = '';
+        }else{
+            $html = $info['main_html'];
+        }
+        return $this->success(['html'=>$html]);
+    }
+
+    /**
+     * @remark :保存定制html
+     * @name   :saveHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/15 10:12
+     */
+    public function saveCustomizedHtml(){
+        try {
+            $is_list = $this->param['is_list'] ?? 0;
+            $bTemplateMainModel = new BTemplateMain();
+            $mainInfo = $bTemplateMainModel->read(['type'=>$this->param['type'],'is_list'=>$is_list]);
+            if($mainInfo === false){
+                $mainData = [
+                    'project_id'=>$this->user['project_id'],
+                    'type'=>$this->param['type'],
+                    'is_list'=>$is_list,
+                    'main_html'=>$this->param['html']
+                ];
+                $bTemplateMainModel->add($mainData);
+            }else{
+                $bTemplateMainModel->edit(['main_html'=>$this->param['html']],['id'=>$mainInfo['id']]);
+            }
+        }catch (\Exception $exception){
+            $this->fail('保存失败，请联系开发人员');
+        }
+        return $this->success();
+    }
+}

-<?php
-/**
- * @remark :
- * @name   :VisualizationLogic.php
- * @author :lyh
- * @method :post
- * @time   :2023/11/15 10:09
- */
-
-namespace App\Http\Logic\Bside\BTemplate;
-
-use App\Http\Logic\Bside\BaseLogic;
-use App\Models\Blog\Blog;
-use App\Models\News\News;
-use App\Models\Product\Product;
-use App\Models\Project\PageSetting;
-use App\Models\RouteMap\RouteMap;
-use App\Models\Service\Service as ServiceSettingModel;
-use App\Models\Template\BTemplate;
-use App\Models\Template\BTemplateCommon;
-use App\Models\Template\BTemplateLog;
-use App\Models\Template\BTemplateMain;
-use App\Models\Template\Setting;
-use App\Models\Template\Template;
-use App\Models\Template\TemplateTypeMain;
-use App\Models\Visualization\Visualization;
-
-class VisualizationLogic extends BaseLogic
-{
-    public function __construct()
-    {
-        parent::__construct();
-        $this->model = new BTemplateMain();
-        $this->param = $this->requestAll;
-    }
-
-    /**
-     * @remark :获取代码块
-     * @name   :getVisualizationInfo
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/17 14:44
-     */
-    public function getVisualizationInfo(){
-        $bTemplateMainModel = new BTemplateMain();
-        $info = $bTemplateMainModel->read(['type'=>$this->param['type']]);
-        if($info === false){
-            $html = '';
-        }else{
-            $html = $info['main_html'];
-        }
-        return $this->success(['html'=>$html]);
-    }
-
-    /**
-     * @remark :保存定制html
-     * @name   :saveHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/15 10:12
-     */
-    public function saveVisualization(){
-        try {
-            $type = $this->param['type'];
-            $bTemplateMainModel = new BTemplateMain();
-            $mainInfo = $bTemplateMainModel->read(['type'=>$type]);
-            if($mainInfo === false){
-                $mainData = [
-                    'project_id'=>$this->user['project_id'],
-                    'type'=>$type,
-                    'main_html'=>$this->param['html']
-                ];
-                $bTemplateMainModel->add($mainData);
-            }else{
-                $bTemplateMainModel->edit(['main_html'=>$this->param['html']],['id'=>$mainInfo['id']]);
-            }
-        }catch (\Exception $e){
-            $this->fail('系统错误，请联系管理员');
-        }
-        return $this->success();
-    }
-}

-<?php
-
-namespace App\Models\File;
-
-use App\Models\Base;
-
-class DataFile extends Base
-{
-    protected $table = 'gl_data_file';
-
-    public function saveData(array $data): bool
-    {
-        # v6项目ID
-        $project_id = (int)$data['project_id'] ?? 0;
-        $isRes      = self::query()->where('project_id', $project_id)->where('created_at', 'like', $data['time'] . '%')->first();
-        if (!$isRes) {
-            $isRes             = new self();
-            $isRes->project_id = $project_id;
-            # AICC用户ID
-            $isRes->user_id = $data['user_id'];
-            # 第三方朋友ID
-            $isRes->friend_id = $data['friend_id'];
-            # 生成文件路径
-            $isRes->file_path = $data['file_path'];
-        }
-        return $isRes->save();
-    }
-
-    /**
-     * @param int $page
-     * @param int $perPage
-     * @return array
-     */
-    public function allData(int $page = 1, int $perPage = 15)
-    {
-        $lists       = self::query()->paginate($perPage, ['*'], 'page', $page);
-        $items       = $lists->Items();
-        $totalPage   = $lists->lastPage();
-        $total       = $lists->total();
-        $currentPage = $lists->currentPage();
-        return compact('total', 'items', 'totalPage', 'currentPage');
-    }
-
-}

+<?php
+
+namespace App\Models\File;
+
+use App\Models\Base;
+
+/**
+ * App\Models\File\PdfFile
+ *
+ * @property int $id
+ * @property int $pid AICC用户ID
+ * @property string $file_path 生成文件路径
+ * @property int $is_pdf 0 - 未生成 1 - 已生成 2 - 其它问题
+ * @property int|null $is_push 0 - 未推送 1 - 已推送 2 - 其他问题
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile newModelQuery()
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PdfFile query()
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereCreatedAt($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereFilePath($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereId($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereIsPdf($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereIsPush($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile wherePid($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class PdfFile extends Base
+{
+    protected $table = 'gl_pdf_file';
+
+    /** @var int PDF - 未生成 */
+    const GENERATE_NOT_PDF = 0;
+
+    /** @var int PDF - 已生成 */
+    const GENERATE_PDF = 1;
+
+    /** @var int PDF - 其它问题 */
+    const GENERATE_OTHER_PDF = 2;
+
+    /** @var int AICC - 未推送 */
+    const GENERATE_NOT_PUSH = 0;
+    /** @var int AICC - 已推送 */
+    const GENERATE_PUSH = 1;
+    /** @var int AICC - 其他问题 */
+    const GENERATE_OTHER_PUSH = 2;
+
+    public function saveData(array $data): bool
+    {
+        # v6项目ID
+        $pid   = (int)$data['pid'] ?? 0;
+        $time = $data['time'] ?? date('Y-m-d');
+        $isRes = self::query()->wherePid($pid)->where('created_at', 'like', $time . '%')->first();
+        if (!$isRes) {
+            $isRes      = new self();
+            $isRes->pid = $pid;
+            # 生成文件路径
+            $isRes->file_path = $data['file_path'] ?? '';
+        }
+        return $isRes->save();
+    }
+
+}

@@ -5,10 +5,47 @@ namespace App\Models\ProjectAssociation;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 
 
+/**
+ * App\Models\ProjectAssociation\ProjectAssociation
+ *
+ * @property int $id
+ * @property int $project_id V6项目ID
+ * @property int $friend_id AICC朋友ID
+ * @property int $user_id AICC用户ID
+ * @property string|null $nickname AICC朋友昵称
+ * @property string|null $user_name AICC用户姓名
+ * @property string|null $image AICC朋友头像
+ * @property int|null $status 1 - 正常， 0 - 禁用
+ * @property int|null $m_status 统计当月是否生成数据
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method  Builder|ProjectAssociation newModelQuery()
+ * @method  Builder|ProjectAssociation newQuery()
+ * @method static Builder|ProjectAssociation query()
+ * @method  Builder|ProjectAssociation whereCreatedAt($value)
+ * @method  Builder|ProjectAssociation whereFriendId($value)
+ * @method  Builder|ProjectAssociation whereId($value)
+ * @method  Builder|ProjectAssociation whereImage($value)
+ * @method  Builder|ProjectAssociation whereMStatus($value)
+ * @method  Builder|ProjectAssociation whereNickname($value)
+ * @method  Builder|ProjectAssociation whereProjectId($value)
+ * @method  Builder|ProjectAssociation whereStatus($value)
+ * @method  Builder|ProjectAssociation whereUpdatedAt($value)
+ * @method  Builder|ProjectAssociation whereUserId($value)
+ * @method  Builder|ProjectAssociation whereUserName($value)
+ * @mixin \Eloquent
+ */
 class ProjectAssociation extends Model
 class ProjectAssociation extends Model
 {
 {
+
     protected $table = 'gl_project_association';
     protected $table = 'gl_project_association';
 
 
+    /** @var int 数据状态 - 正常 */
+    const STATUS_NORMAL = 1;
+
+    /** @var int 数据状态 - 禁用 */
+    const STATUS_DISABLED = 0;
+
     /**
     /**
      * 保存|修改数据
      * 保存|修改数据
      * @param array $data
      * @param array $data

@@ -36,8 +36,10 @@ class BTemplate extends Base
     const TYPE_SEVEN = 7;//新闻列表
     const TYPE_SEVEN = 7;//新闻列表
     const TYPE_EIGHT = 8;//自定义页面
     const TYPE_EIGHT = 8;//自定义页面
 
 
-    const TYPE_CUSTOM_DETAIL = 11;//扩展详情
-    const TYPE_CUSTOM_LIST = 12;//扩展列表
+    const TYPE_CUSTOM = 7;//扩展详情
+    const IS_LIST = 1;//列表页
+    const IS_HEADER = 1;//独立头部底部
+    const IS_NO_HEADER = 0;//非独立头部底部
 
 
     protected $table = 'gl_web_template';
     protected $table = 'gl_web_template';
     //连接数据库
     //连接数据库

@@ -21,7 +21,7 @@ class CosService
      * @method :post
      * @method :post
      * @time   :2023/7/19 15:28
      * @time   :2023/7/19 15:28
      */
      */
-    public function uploadFile(&$files,$path,$filename)
+    public function uploadFile(&$files,$path,$filename, $binary = false)
     {
     {
         $cos = config('filesystems.disks.cos');
         $cos = config('filesystems.disks.cos');
         $cosClient = new Client([
         $cosClient = new Client([
@@ -32,10 +32,11 @@ class CosService
             ],
             ],
         ]);
         ]);
         $key = $path.'/'.$filename;
         $key = $path.'/'.$filename;
+        $Body = $binary ? $files : fopen($files->getRealPath(), 'r');
         $cosClient->putObject([
         $cosClient->putObject([
             'Bucket' => $cos['bucket'],
             'Bucket' => $cos['bucket'],
             'Key' => $key,
             'Key' => $key,
-            'Body' => fopen($files->getRealPath(), 'r'),
+            'Body' => $Body,
         ]);
         ]);
         return $key;
         return $key;
     }
     }

@@ -23,6 +23,7 @@
         "swooletw/laravel-swoole": "^2.13"
         "swooletw/laravel-swoole": "^2.13"
     },
     },
     "require-dev": {
     "require-dev": {
+        "barryvdh/laravel-ide-helper": "^2.13",
         "facade/ignition": "^2.5",
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
         "fakerphp/faker": "^1.9.1",
         "laravel/sail": "^1.0.1",
         "laravel/sail": "^1.0.1",

@@ -341,12 +341,12 @@ Route::middleware(['bloginauth'])->group(function () {
         });
         });
     });
     });
 
 
-    //定制项目上传代码块
-    Route::prefix('visualization')->group(function () {
-        Route::any('/info', [\App\Http\Controllers\Bside\Template\VisualizationController::class, 'info'])->name('visualization_info');
-        Route::any('/save', [\App\Http\Controllers\Bside\Template\VisualizationController::class, 'save'])->name('visualization_save');
-        Route::any('/getHtml', [\App\Http\Controllers\Bside\Template\VisualizationController::class, 'getHtml'])->name('visualization_getHtml');
-        Route::any('/saveHtml', [\App\Http\Controllers\Bside\Template\VisualizationController::class, 'saveHtml'])->name('visualization_saveHtml');
+    //初始代码块
+    Route::prefix('init_html')->group(function () {
+        Route::any('/getCustomizedHtml', [\App\Http\Controllers\Bside\Template\InitHtmlController::class, 'getCustomizedHtml'])->name('init_getCustomizedHtml');
+        Route::any('/saveCustomizedHtml', [\App\Http\Controllers\Bside\Template\InitHtmlController::class, 'saveCustomizedHtml'])->name('init_saveCustomizedHtml');
+        Route::any('/getDetailHtml', [\App\Http\Controllers\Bside\Template\InitHtmlController::class, 'getDetailHtml'])->name('init_getDetailHtml');
+        Route::any('/saveDetailHtml', [\App\Http\Controllers\Bside\Template\InitHtmlController::class, 'saveDetailHtml'])->name('init_saveDetailHtml');
     });
     });
 
 
     // 自定义页面，专题页
     // 自定义页面，专题页
@@ -434,6 +434,7 @@ Route::middleware(['bloginauth'])->group(function () {
     //自定义模板
     //自定义模板
     Route::prefix('custom_module')->group(function () {
     Route::prefix('custom_module')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'lists'])->name('custom_lists');
         Route::any('/', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'lists'])->name('custom_lists');
+        Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'info'])->name('custom_info');
         Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'save'])->name('custom_save');
         Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'save'])->name('custom_save');
         Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'del'])->name('custom_del');
         Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleController::class, 'del'])->name('custom_del');