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

@@ -67,7 +67,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
             if (!$project_info) {
             if (!$project_info) {
@@ -114,7 +114,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             $domain_array = parse_url($v['domain']);
             $domain_array = parse_url($v['domain']);
             $host = $domain_array['host'] ?? $domain_array['path'];
             $host = $domain_array['host'] ?? $domain_array['path'];
@@ -171,7 +171,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
             if (!$project_info) {
             if (!$project_info) {

@@ -37,7 +37,7 @@ class LogFormatterFactory
             if (!file_exists($path)) {
             if (!file_exists($path)) {
                 $directory = pathinfo($path, PATHINFO_DIRNAME);
                 $directory = pathinfo($path, PATHINFO_DIRNAME);
                 if(!file_exists($directory)){
                 if(!file_exists($directory)){
-                    mkdir($directory, 0644, true);
+                    mkdir($directory, 0755, true);
                     chown($directory, 'www');
                     chown($directory, 'www');
                 }
                 }
                 touch($path);
                 touch($path);