作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !458
@@ -96,9 +96,11 @@ class EditDomainBt implements ShouldQueue @@ -96,9 +96,11 @@ class EditDomainBt implements ShouldQueue
96 $api_url_amp = 'http://' . $server_info['init_domain'] . '/api/createSiteAmp'; 96 $api_url_amp = 'http://' . $server_info['init_domain'] . '/api/createSiteAmp';
97 $api_param_amp = [ 97 $api_param_amp = [
98 'domain' => $domain_info['domain'], 98 'domain' => $domain_info['domain'],
99 - 'private_key' => $domain_info['amp_private_key'],  
100 - 'cert' => $domain_info['amp_private_cert']  
101 ]; 99 ];
  100 + if ($domain_info['amp_type'] == 2) {
  101 + $api_param_amp['private_key'] = $domain_info['amp_private_key'];
  102 + $api_param_amp['cert'] = $domain_info['amp_private_cert'];
  103 + }
102 104
103 try { 105 try {
104 $rs_amp = HttpUtils::get($api_url_amp, $api_param_amp); 106 $rs_amp = HttpUtils::get($api_url_amp, $api_param_amp);