周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 3fb8f81237d9b0199c1204ea8ba1736c8200a6ab 1 个父辈 df5e614d

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 61 行增加 和 59 行删除
... ... @@ -35,7 +35,7 @@ class CreateSite extends Command
if ($task) {
$model->edit(['status' => DomainCreateTask::STATUS_ING], ['id' => $task['id']]);
$re = $this->editDomainBt($task['domain_id']);
$re = $this->editDomainBt($task['domain_id'], $task['type']);
if (is_array($re)) {
$model->edit(['status' => DomainCreateTask::STATUS_FAL, 'error_msg' => $re[1]], ['id' => $task['id']]);
... ... @@ -45,7 +45,7 @@ class CreateSite extends Command
}
}
protected function editDomainBt($domain_id)
protected function editDomainBt($domain_id, $type)
{
//获取域名数据
$domain_model = new DomainInfo();
... ... @@ -73,69 +73,71 @@ class CreateSite extends Command
return [false, '获取服务器数据失败2'];
}
/*****************编辑主站*******************/
if ($domain_info['type'] == 2) {
$api_url = 'http://' . $serverInfo['init_domain'] . '/api/setSsl';
$api_param = [
'domain' => $domain_info['domain'],
'private_key' => $domain_info['private_key'],
'cert' => $domain_info['private_cert'],
'rewrite' => $domain_info['extend_config'],
'other_domain' => $domain_info['other_domain'],
'is_https' => $domain_info['is_https'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
} else {
$api_url = 'http://' . $serverInfo['init_domain'] . '/api/applySsl';
$api_param = [
'domain' => $domain_info['domain'],
'rewrite' => $domain_info['extend_config'],
'other_domain' => $domain_info['other_domain'],
'is_https' => $domain_info['is_https'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
}
try {
$rs = HttpUtils::get($api_url, $api_param);
$rs = json_decode($rs, true);
if (isset($rs['status']) && $rs['status'] == 200) {
$this->output($domain_info['domain'] . ',主站创建成功');
if ($type == 1) {
/*****************编辑主站*******************/
if ($domain_info['type'] == 2) {
$api_url = 'http://' . $serverInfo['init_domain'] . '/api/setSsl';
$api_param = [
'domain' => $domain_info['domain'],
'private_key' => $domain_info['private_key'],
'cert' => $domain_info['private_cert'],
'rewrite' => $domain_info['extend_config'],
'other_domain' => $domain_info['other_domain'],
'is_https' => $domain_info['is_https'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
} else {
return [false, '主站:' . ($rs['message'] ?? '未知错误')];
}
} catch (\Exception | GuzzleException $e) {
return [false, '主站:' . $e->getMessage()];
}
/*****************编辑amp站*******************/
if ($domain_info['amp_status']) {
$api_url_amp = 'http://' . $serverInfo['init_domain'] . '/api/createSiteAmp';
$api_param_amp = [
'domain' => $domain_info['domain'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
if ($domain_info['amp_type'] == 2) {
$api_param_amp['private_key'] = $domain_info['amp_private_key'];
$api_param_amp['cert'] = $domain_info['amp_private_cert'];
$api_url = 'http://' . $serverInfo['init_domain'] . '/api/applySsl';
$api_param = [
'domain' => $domain_info['domain'],
'rewrite' => $domain_info['extend_config'],
'other_domain' => $domain_info['other_domain'],
'is_https' => $domain_info['is_https'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
}
try {
$rs_amp = HttpUtils::get($api_url_amp, $api_param_amp);
$rs_amp = json_decode($rs_amp, true);
if (isset($rs_amp['status']) && $rs_amp['status'] == 200) {
$this->output($domain_info['domain'] . ',amp站创建成功');
$rs = HttpUtils::get($api_url, $api_param);
$rs = json_decode($rs, true);
if (isset($rs['status']) && $rs['status'] == 200) {
$this->output($domain_info['domain'] . ',主站创建成功');
} else {
return [false, 'amp站:' . ($rs['message'] ?? '未知错误')];
return [false, $rs['message'] ?? '未知错误'];
}
} catch (\Exception | GuzzleException $e) {
return [false, $e->getMessage()];
}
} else {
/*****************编辑amp站*******************/
if ($domain_info['amp_status']) {
$api_url_amp = 'http://' . $serverInfo['init_domain'] . '/api/createSiteAmp';
$api_param_amp = [
'domain' => $domain_info['domain'],
'not_allow_country' => $domain_info['not_allow_country'],
'not_allow_ip' => $domain_info['not_allow_ip'],
'is_redirect' => $domain_info['is_redirect']
];
if ($domain_info['amp_type'] == 2) {
$api_param_amp['private_key'] = $domain_info['amp_private_key'];
$api_param_amp['cert'] = $domain_info['amp_private_cert'];
}
try {
$rs_amp = HttpUtils::get($api_url_amp, $api_param_amp);
$rs_amp = json_decode($rs_amp, true);
if (isset($rs_amp['status']) && $rs_amp['status'] == 200) {
$this->output($domain_info['domain'] . ',amp站创建成功');
} else {
return [false, $rs['message'] ?? '未知错误'];
}
} catch (\Exception | GuzzleException $e_amp) {
return [false, $e_amp->getMessage()];
}
} catch (\Exception | GuzzleException $e_amp) {
return [false, 'amp站:' . $e_amp->getMessage()];
}
}
... ...