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

@@ -6,6 +6,7 @@ use App\Models\Project\DeployOptimize;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
+use App\Models\Domain\DomainInfo as DomainInfoModel;
 
 
 /**
 /**
  * 剩余服务时长
  * 剩余服务时长
@@ -78,6 +79,11 @@ class RemainDay extends Command
                 $item->extend_type = Project::TYPE_FIVE;
                 $item->extend_type = Project::TYPE_FIVE;
                 $item->site_status = Project::TYPE_ONE;//关闭站点
                 $item->site_status = Project::TYPE_ONE;//关闭站点
                 //TODO::未续费网站禁止登录及通知C端禁止网站
                 //TODO::未续费网站禁止登录及通知C端禁止网站
+                $domainModel = new DomainInfoModel();
+                $domainInfos = $domainModel->read(['project_id'=>$item->id]);
+                if($domainInfos !== false){
+                    curl_get('https://'.$domainInfos['domain'].'/api/stop_or_start_website/');
+                }
             }
             }
             $item->save();
             $item->save();
         }
         }

@@ -9,10 +9,13 @@
 
 
 namespace App\Console\Commands\Test;
 namespace App\Console\Commands\Test;
 
 
+use App\Models\Project\Project;
 use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
+use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @remark :头部底部分开 脚本数据
  * @remark :头部底部分开 脚本数据
@@ -49,7 +52,8 @@ class HeaderFooter extends Command
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            DB::table('gl_web_template_com')->truncate();
+            $templateComModel = new BTemplateCom();
+            $templateComModel->truncate();
             $this->saveTemplateCom($v['id']);
             $this->saveTemplateCom($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }

@@ -21,6 +21,7 @@ use App\Models\Com\City;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Manage\BelongingGroup;
 use App\Models\Manage\BelongingGroup;
@@ -1072,8 +1073,14 @@ class ProjectController extends BaseController
             'project_id.required' => '项目id不能为空',
             'project_id.required' => '项目id不能为空',
             'site_status.required' => '状态不能为空',
             'site_status.required' => '状态不能为空',
         ]);
         ]);
-        $projectModel->edit(['site_status'=>$this->map['site_status']],['id'=>$this->param['id']]);
+        $projectModel->edit(['site_status'=>$this->map['site_status']],['id'=>$this->param['project_id']]);
         //TODO::通知C端
         //TODO::通知C端
+        $domainModel = new DomainInfoModel();
+        $domainInfo = $domainModel->read(['project_id'=>$this->param['project_id']]);
+        if($domainInfo !== false){
+            $rs = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website/');
+            @file_put_contents(storage_path('logs/site_status.log'), var_export('通知C端on/off'.$domainInfo['domain'].'.返回结果：'.json_encode($rs), true) . PHP_EOL, FILE_APPEND);
+        }
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }