Merge branch 'master' into compatible-sdk-error

dara/error.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/alibabacloud-go/tea/tea"
 	"net/http"
 	"reflect"
 	"strconv"
@@ -41,38 +42,40 @@ type CastError struct {
 	Message *string
 }
 
-func TeaSDKError(err error) error {
-	if(err == nil) {
+func TeaSDKError(err error) *tea.SDKError {
+	if err == nil {
 		return nil
 	}
 
 	if te, ok := err.(*SDKError); ok {
 		return tea.NewSDKError(map[string]interface{}{
-			"code": StringValue(te.Code),
-			"statusCode": IntValue(te.StatusCode),
-			"message": StringValue(te.Message),
-			"data": te.Data,
-			"description": StringValue(te.Description),
+			"code":               StringValue(te.Code),
+			"statusCode":         IntValue(te.StatusCode),
+			"message":            StringValue(te.Message),
+			"data":               te.Data,
+			"description":        StringValue(te.Description),
 			"accessDeniedDetail": te.AccessDeniedDetail,
 		})
 	}
 
-	if respErr, ok := err.(ResponseError); ok { 
+	if respErr, ok := err.(ResponseError); ok {
 		return tea.NewSDKError(map[string]interface{}{
-			"code": StringValue(respErr.GetCode()),
+			"code":       StringValue(respErr.GetCode()),
 			"statusCode": IntValue(respErr.GetStatusCode()),
-			"message": respErr.Error(),
+			"message":    respErr.Error(),
 		})
 	}
 
-	if baseErr, ok := err.(BaseError); ok { 
+	if baseErr, ok := err.(BaseError); ok {
 		return tea.NewSDKError(map[string]interface{}{
-			"code": StringValue(baseErr.GetCode()),
+			"code":    StringValue(baseErr.GetCode()),
 			"message": baseErr.Error(),
 		})
 	}
 
-	return err
+	return tea.NewSDKError(map[string]interface{}{
+		"message": err.Error(),
+	})
 }
 
 // NewSDKError is used for shortly create SDKError object

dara/stream.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"strings"