作者 lyh

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

... ... @@ -180,16 +180,14 @@ class DomainInfoLogic extends BaseLogic
$this->fail('证书cert值不能为空');
}
// $api_url = 'http://'.$server_info['init_domain'].'/setSsl';
$api_url = 'http://master2.globalso.com/api/setSsl';
$api_url = 'http://'.$server_info['init_domain'].'/api/setSsl';
$api_param = [
'domain' => $info['domain'],
'private_key' => $this->param['key'],
'cert' => $this->param['cert'],
];
}else{
// $api_url = 'http://'.$server_info['init_domain'].'/applySsl';
$api_url = 'http://master2.globalso.com/api/applySsl';
$api_url = 'http://'.$server_info['init_domain'].'/api/applySsl';
$api_param = ['domain' => $info['domain']];
}
... ...
... ... @@ -509,8 +509,7 @@ class ProjectLogic extends BaseLogic
$domain_info = $domain_model->read(['id',$param['deploy_optimize']['domain']],'domain');
if($server_info && $domain_info){
// $api_url = 'http://'.$server_info['init_domain'].'/api/createSite';
$api_url = 'http://master2.globalso.com/api/createSite';
$api_url = 'http://'.$server_info['init_domain'].'/api/createSite';
$api_param = ['domain'=>$domain_info['domain']];
try {
HttpUtils::get($api_url, $api_param);
... ...