change postjson

authorization/authorizer_info.go

@@ -55,8 +55,7 @@ func GetAuthorizerInfo(componentAccessToken string, data AuthorizerInfoParam) (*
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiGetAuthorizerInfo, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiGetAuthorizerInfo, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -66,9 +65,5 @@ func GetAuthorizerInfo(componentAccessToken string, data AuthorizerInfoParam) (*
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorization/authorizer_token.go

@@ -61,8 +61,7 @@ func AuthorizerToken(componentAccessToken string, data AuthorizerTokenParam) (*A
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiAuthorizerToken, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiAuthorizerToken, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -72,9 +71,5 @@ func AuthorizerToken(componentAccessToken string, data AuthorizerTokenParam) (*A
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorization/component_token.go

@@ -52,7 +52,7 @@ func ComponentToken(data ComponentTokenParam) (*ComponentTokenResult, error) {
 		return nil, errors.New("获取令牌 推送 ticket 不能为空")
 	}
 
-	resp, e2 := request.PostJSON(apiComponentToken, data)
+	resp, e2 := request.PostJSON(apiComponentToken, nil, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -62,9 +62,5 @@ func ComponentToken(data ComponentTokenParam) (*ComponentTokenResult, error) {
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorization/pre_auth_code.go

@@ -50,8 +50,7 @@ func CreatePreAuthCode(componentAccessToken string, data PreAuthCodeParam) (*Pre
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiCreatePreauthcode, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiCreatePreauthcode, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -61,9 +60,5 @@ func CreatePreAuthCode(componentAccessToken string, data PreAuthCodeParam) (*Pre
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorization/push_ticket.go

@@ -45,7 +45,7 @@ func StartPushTicket(data PushTicketParam) (*PushTicketResult, error) {
 		return nil, errors.New("启动 ticket 推送服务 第三方平台的 appsecret 不能为空")
 	}
 
-	resp, e2 := request.PostJSON(apiStartPushTicket, data)
+	resp, e2 := request.PostJSON(apiStartPushTicket, nil, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -55,9 +55,5 @@ func StartPushTicket(data PushTicketParam) (*PushTicketResult, error) {
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorization/query_auth.go

@@ -54,8 +54,7 @@ func QueryAuth(componentAccessToken string, data QueryAuthParam) (*QueryAuthResu
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiQueryAuth, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiQueryAuth, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -65,9 +64,5 @@ func QueryAuth(componentAccessToken string, data QueryAuthParam) (*QueryAuthResu
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorizer/authorizer_list.go

@@ -64,8 +64,7 @@ func AuthorizerList(componentAccessToken string, data AuthorizerListParam) (*Aut
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiGetAuthorizerList, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiGetAuthorizerList, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -75,9 +74,5 @@ func AuthorizerList(componentAccessToken string, data AuthorizerListParam) (*Aut
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorizer/get_authorizer_option.go

@@ -61,8 +61,7 @@ func GetAuthorizerOption(componentAccessToken string, data GetAuthorizerOptionPa
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiGetAuthorizerOption, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiGetAuthorizerOption, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -72,9 +71,5 @@ func GetAuthorizerOption(componentAccessToken string, data GetAuthorizerOptionPa
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

authorizer/set_authorizer_option.go

@@ -63,8 +63,7 @@ func SetAuthorizerOption(componentAccessToken string, data SetAuthorizerOptionPa
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := request.ParseURL(apiSetAuthorizerOption, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	resp, e2 := request.PostJSON(apiSetAuthorizerOption, &queryParam, data)
 	if e2 != nil {
 		return nil, e2
 	}
@@ -74,9 +73,5 @@ func SetAuthorizerOption(componentAccessToken string, data SetAuthorizerOptionPa
 		return nil, err
 	}
 
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
 	return &result, nil
 }

utils/request/request.go

@@ -18,7 +18,9 @@ import (
 	"errors"
 	"io"
 	"net/http"
+	"net/url"
 
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/log"
 )
 
@@ -52,12 +54,30 @@ func post(url string, contentType string, body []byte) ([]byte, error) {
 }
 
 // PostJSON 使用 POST 方式发送 json 数据
-func PostJSON(url string, body interface{}) ([]byte, error) {
+func PostJSON(addr string, query *url.Values, body interface{}) ([]byte, error) {
+	apiURL, e0 := ParseURL(addr, query)
+	if e0 != nil {
+		return nil, e0
+	}
+
 	data, e1 := json.Marshal(body)
 	if e1 != nil {
 		return nil, e1
 	}
 
-	return post(url, ContentTypeJSON, data)
+	resp, e2 := post(apiURL.String(), ContentTypeJSON, data)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	e3 := wxerr.Error{}
+	if err := json.Unmarshal(resp, &e3); err != nil {
+		return nil, err
+	}
+
+	if e3.Code != 0 {
+		return nil, e3
+	}
 
+	return resp, nil
 }