作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !451
@@ -13,6 +13,7 @@ use App\Utils\HttpUtils; @@ -13,6 +13,7 @@ use App\Utils\HttpUtils;
13 use GuzzleHttp\Client; 13 use GuzzleHttp\Client;
14 use GuzzleHttp\Exception\GuzzleException; 14 use GuzzleHttp\Exception\GuzzleException;
15 use Illuminate\Support\Carbon; 15 use Illuminate\Support\Carbon;
  16 +use Illuminate\Support\Facades\Http;
16 use Symfony\Component\Process\Process; 17 use Symfony\Component\Process\Process;
17 18
18 class DomainInfoLogic extends BaseLogic 19 class DomainInfoLogic extends BaseLogic
@@ -181,7 +182,14 @@ class DomainInfoLogic extends BaseLogic @@ -181,7 +182,14 @@ class DomainInfoLogic extends BaseLogic
181 ]; 182 ];
182 } 183 }
183 try { 184 try {
184 - HttpUtils::get($api_url, $api_param); 185 + Http::get($api_url, $api_param);
  186 +// $rs = HttpUtils::get($api_url, $api_param);
  187 +// $rs = json_decode($rs, true);
  188 +// if(isset($rs['status']) && $rs['status'] == 200){
  189 +// return $this->success();
  190 +// }else{
  191 +// $this->fail($rs['message']??'');
  192 +// }
185 } catch (\Exception | GuzzleException $e) { 193 } catch (\Exception | GuzzleException $e) {
186 errorLog('创建站点', $api_param, $e); 194 errorLog('创建站点', $api_param, $e);
187 $this->fail('编辑证书失败'); 195 $this->fail('编辑证书失败');
@@ -217,7 +225,14 @@ class DomainInfoLogic extends BaseLogic @@ -217,7 +225,14 @@ class DomainInfoLogic extends BaseLogic
217 ]; 225 ];
218 226
219 try { 227 try {
220 - HttpUtils::get($api_url, $api_param); 228 + Http::get($api_url, $api_param);
  229 +// $rs = HttpUtils::get($api_url, $api_param);
  230 +// $rs = json_decode($rs, true);
  231 +// if(isset($rs['status']) && $rs['status'] == 200){
  232 +// return $this->success();
  233 +// }else{
  234 +// $this->fail($rs['message']??'');
  235 +// }
221 } catch (\Exception | GuzzleException $e) { 236 } catch (\Exception | GuzzleException $e) {
222 errorLog('创建AMP站点', $api_param, $e); 237 errorLog('创建AMP站点', $api_param, $e);
223 $this->fail('编辑AMP站点证书失败'); 238 $this->fail('编辑AMP站点证书失败');