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

@@ -150,7 +150,6 @@ class DomainInfoLogic extends BaseLogic
      */
      */
     public function setDomainSsl($initDomain,$domain,$rewrite,$other_domain)
     public function setDomainSsl($initDomain,$domain,$rewrite,$other_domain)
     {
     {
-        $this->fail('当前功能，占时无法使用，如有紧急需要上线项目，请联系管理人员');
         if($this->param['type'] == 2){
         if($this->param['type'] == 2){
             if(empty($this->param['key'])){
             if(empty($this->param['key'])){
                 $this->fail('证书KEY值不能为空');
                 $this->fail('证书KEY值不能为空');

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Project;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\AsideGlobalException;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
+use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;