Merge pull request #9 from tioncico/master

AliYunoss 完善异常类对HTTPClient错误接管
easy-swoole · Jan 11, 2020 · f5338a1 · f5338a1
2 parents 12804a2 + 31f34ae
commit f5338a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/AliYun/Result/Result.php b/src/AliYun/Result/Result.php
@@ -97,12 +97,11 @@ public function parseResponse()
             $code = $this->retrieveErrorCode($this->rawResponse->getBody());
             $message = $this->retrieveErrorMessage($this->rawResponse->getBody());
             $body = $this->rawResponse->getBody();
-
             $details = array(
                 'status'     => $httpStatus,
                 'request-id' => $requestId,
-                'code'       => $code,
-                'message'    => $message,
+                'code'       => $code??$this->rawResponse->getErrCode(),
+                'message'    => $message??$this->rawResponse->getErrMsg(),
                 'body'       => $body
             );
             throw new OssException($details);
@@ -118,13 +117,13 @@ public function parseResponse()
     private function retrieveErrorMessage($body)
     {
         if (empty($body) || false === strpos($body, '<?xml')) {
-            return '';
+            return null;
         }
         $xml = simplexml_load_string($body);
         if (isset($xml->Message)) {
             return strval($xml->Message);
         }
-        return '';
+        return null;
     }
 
     /**
@@ -136,13 +135,13 @@ private function retrieveErrorMessage($body)
     private function retrieveErrorCode($body)
     {
         if (empty($body) || false === strpos($body, '<?xml')) {
-            return '';
+            return null;
         }
         $xml = simplexml_load_string($body);
         if (isset($xml->Code)) {
             return strval($xml->Code);
         }
-        return '';
+        return  null;
     }
 
     /**

diff --git a/tests/AliYun/test.php b/tests/AliYun/test.php
@@ -16,9 +16,15 @@
         'endpoint'        => END_POINT,
     ]);
     $client = new \EasySwoole\Oss\AliYun\OssClient($config);
-    $data = $client->signUrl(OSS_BUCKET,'oss-test.jpg');
-    var_dump($data);
-//    var_dump($client->listBuckets());
+//    $data = $client->signUrl(OSS_BUCKET,'oss-test.jpg');
+//    var_dump($data);
+    try{
+        var_dump($client->listBuckets());
+
+    }catch (\EasySwoole\Oss\AliYun\Core\OssException $throwable){
+        var_dump($throwable->getMessage());
+        var_dump($throwable->getErrorCode());
+    }
 
 
 //    $ossClient = new \OSS\OssClient(

diff --git a/tests/QiNiu/test.php b/tests/QiNiu/test.php
@@ -12,4 +12,4 @@
 
 $bucketManager = new \Qiniu\Storage\BucketManager($auth);
 list($list, $error) = $bucketManager->buckets();
-var_dump($list);
+var_dump($list,$error);