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

@@ -13,6 +13,7 @@ use App\Utils\HttpUtils;
 use GuzzleHttp\Client;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Http;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\Process;
 
 
 class DomainInfoLogic extends BaseLogic
 class DomainInfoLogic extends BaseLogic
@@ -180,12 +181,19 @@ class DomainInfoLogic extends BaseLogic
                 'is_https' => $is_https
                 'is_https' => $is_https
             ];
             ];
         }
         }
-        try {
-            HttpUtils::get($api_url, $api_param);
-        } catch (\Exception | GuzzleException $e) {
-            errorLog('创建站点', $api_param, $e);
-            $this->fail('编辑证书失败');
-        }
+//        try {
+//            $rs = HttpUtils::get($api_url, $api_param);
+//            $rs = json_decode($rs, true);
+//            if(isset($rs['status']) && $rs['status'] == 200){
+//                return $this->success();
+//            }else{
+//                $this->fail($rs['message']??'');
+//            }
+//        } catch (\Exception | GuzzleException $e) {
+//            errorLog('创建站点', $api_param, $e);
+//            $this->fail('编辑证书失败');
+//        }
+        Http::get($api_url, $api_param);
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -216,12 +224,20 @@ class DomainInfoLogic extends BaseLogic
             'cert' => $this->param['amp_cert']??''
             'cert' => $this->param['amp_cert']??''
         ];
         ];
 
 
-        try {
-            HttpUtils::get($api_url, $api_param);
-        } catch (\Exception | GuzzleException $e) {
-            errorLog('创建AMP站点', $api_param, $e);
-            $this->fail('编辑AMP站点证书失败');
-        }
+//        try {
+//            Http::get($api_url, $api_param);
+//            $rs = HttpUtils::get($api_url, $api_param);
+//            $rs = json_decode($rs, true);
+//            if(isset($rs['status']) && $rs['status'] == 200){
+//                return $this->success();
+//            }else{
+//                $this->fail($rs['message']??'');
+//            }
+//        } catch (\Exception | GuzzleException $e) {
+//            errorLog('创建AMP站点', $api_param, $e);
+//            $this->fail('编辑AMP站点证书失败');
+//        }
+        Http::get($api_url, $api_param);
         return $this->success();
         return $this->success();
     }
     }