gx

@@ -12,7 +12,6 @@ namespace App\Http\Controllers\Aside\Template;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
-use App\Models\CustomModule\CustomModule;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Services\ProjectServer;
@@ -67,21 +66,16 @@ class ReplaceHtmlController extends BaseController
      * @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']);
         $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
-            $templateLogModel = new TemplateReplaceHtmlLog();
             foreach ($lists['list'] as $k => $v){
+                ProjectServer::useProject($v['project_id']);
+                $templateLogModel = new TemplateReplaceHtmlLog();
                 $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]);
                 $lists['list'][$k] = $v;
+                DB::disconnect('custom_mysql');
             }
         }
-        DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS,$lists);
     }
 

@@ -66,7 +66,7 @@ class ReplaceHtmlLogic extends BaseLogic
      * @time   :2024/5/7 15:52
      */
     public function replaceTemplateMainHtml(){
-        ProjectServer::useProject($this->param['project_id']);
+
         $data = $this->sourceTypeInfo();
         $typeInfo = $data[$this->param['name']];
         if(!isset($typeInfo)){
@@ -76,8 +76,9 @@ class ReplaceHtmlLogic extends BaseLogic
         //TODO::生成一条任务记录
         $replaceId = $this->saveReplaceHtml($this->param,$typeInfo,$template_id);
         //查询当前类型所有装修的记录
+        $bTemplateModel = new BTemplate();
         $condition = ['source'=>$typeInfo['type'],'is_custom'=>$typeInfo['is_custom'],'is_list'=>$typeInfo['is_list'], 'template_id'=>$template_id];
-        $list = $this->model->list($condition);
+        $list = $bTemplateModel->list($condition);
         foreach ($list as $v){
             if($v['type'] == 0){
                 $main_html = str_replace($this->param['old_html'],$this->param['html'],$v['main_html']);
@@ -88,7 +89,6 @@ class ReplaceHtmlLogic extends BaseLogic
             }
             $this->saveReplaceHtmlLog($replaceId,$v['id']);
         }
-        DB::disconnect('custom_mysql');
         return $this->success();
     }
 
@@ -120,13 +120,16 @@ class ReplaceHtmlLogic extends BaseLogic
      * @time   :2024/5/8 9:37
      */
     public function saveReplaceHtmlLog($replace_id,$replace_template_id){
+        ProjectServer::useProject($this->param['project_id']);
         $logData = [
             'replace_id'=>$replace_id,
             'replace_template_id'=>$replace_template_id,
             'uid'=>$this->user['manager_id'],
         ];
         $replaceHtmlModel = new TemplateReplaceHtmlLog();
-        return $replaceHtmlModel->add($logData);
+        $save_id = $replaceHtmlModel->addReturnId($logData);
+        DB::disconnect('custom_mysql');
+        return $this->success($save_id);
     }
 
     /**
@@ -137,12 +140,12 @@ class ReplaceHtmlLogic extends BaseLogic
      * @time   :2024/5/8 10:35
      */
     public function reductionHtml(){
-        ProjectServer::useProject($this->param['project_id']);
         $info = $this->model->read(['id'=>$this->param['id']]);
         if($info === false){
             $this->fail('当前数据不存在');
         }
         $replaceId = $this->saveResultReplaceHtml($info);
+        ProjectServer::useProject($this->param['project_id']);
         $replaceLogModel = new TemplateReplaceHtmlLog();
         $logList = $replaceLogModel->list(['replace_id'=>$this->param['id']]);
         $replaceArr = [];

@@ -149,7 +149,7 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/12/7 15:04
      */
     public function contentAdd(){
-        try {
+//        try {
             $this->param['sort'] = $this->setNewsSort();
             $id = $this->model->addReturnId($this->param);
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
@@ -157,9 +157,9 @@ class CustomModuleContentLogic extends BaseLogic
             $this->addUpdateNotify(RouteMap::SOURCE_MODULE,$route);
             $this->curlDelRoute(['new_route'=>$route]);
             $this->edit(['route' => $route], ['id' => $id]);
-        }catch (\Exception $e){
-            $this->fail('系统错误，请联系管理员');
-        }
+//        }catch (\Exception $e){
+//            $this->fail('系统错误，请联系管理员');
+//        }
         return $id;
     }
 

@@ -14,9 +14,6 @@ use App\Models\Base;
 class TemplateReplaceHtml extends Base
 {
     protected $table = 'gl_replace_html';
-    //连接数据库
-    protected $connection = 'custom_mysql';
-
     /**
      * @remark :默认类型
      * @name   :sourceType