合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !321

@@ -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值不能为空');