合并分支 'master-lyh-edit' 到 'master'

Master lyh edit



查看合并请求 !561

@@ -38,6 +38,7 @@ class SyncFile extends Command
                 echo date('Y-m-d H:i:s') . '编辑的path为:'. $v['path'] .',主键id：'. $v['id'] . PHP_EOL;
                 echo date('Y-m-d H:i:s') . '编辑的path为:'. $v['path'] .',主键id：'. $v['id'] . PHP_EOL;
                 $errorFileModel->edit(['status'=>1],['id'=>$v['id']]);
                 $errorFileModel->edit(['status'=>1],['id'=>$v['id']]);
             }
             }
+            gc_collect_cycles();
         }
         }
         echo date('Y-m-d H:i:s') . '编辑的end为:' . PHP_EOL;
         echo date('Y-m-d H:i:s') . '编辑的end为:' . PHP_EOL;
         return true;
         return true;

@@ -61,6 +61,7 @@ class ProjectController extends BaseController
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
+            ->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id')
             ->where('gl_project.delete_status',Project::TYPE_ZERO)
             ->where('gl_project.delete_status',Project::TYPE_ZERO)
             ->where('gl_project.extend_type',Project::TYPE_ZERO);
             ->where('gl_project.extend_type',Project::TYPE_ZERO);
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
@@ -115,6 +116,7 @@ class ProjectController extends BaseController
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.api_no AS api_no',
             'gl_project_deploy_optimize.api_no AS api_no',
+            'gl_web_setting_template.template_id AS template_id',
         ];
         ];
         return $select;
         return $select;
     }
     }