diff --git a/library.go b/library.go index 6ff53b0b..593e5e26 100644 --- a/library.go +++ b/library.go @@ -1,5 +1,5 @@ package go_library func Version() string { - return "1.0.102" + return "1.0.103" } diff --git a/service/alipayopen/alipay.system.oauth.token.go b/service/alipayopen/alipay.system.oauth.token.go index bd53cc4d..7d08b9e3 100644 --- a/service/alipayopen/alipay.system.oauth.token.go +++ b/service/alipayopen/alipay.system.oauth.token.go @@ -2,7 +2,7 @@ package alipayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -48,9 +48,9 @@ func (c *Client) AlipaySystemOauthToken(ctx context.Context, grantType, code, re } // 定义 var response AlipaySystemOauthTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newAlipaySystemOauthTokenResult(response, request.ResponseBody, request, apiError), err } diff --git a/service/alipayopen/alipay.user.info.share.go b/service/alipayopen/alipay.user.info.share.go index c14b113a..71bfc257 100644 --- a/service/alipayopen/alipay.user.info.share.go +++ b/service/alipayopen/alipay.user.info.share.go @@ -2,7 +2,7 @@ package alipayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -42,9 +42,9 @@ func (c *Client) AlipayUserInfoShare(ctx context.Context, authToken string) (*Al } // 定义 var response AlipayUserInfoShareResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newAlipayUserInfoShareResult(response, request.ResponseBody, request, apiError), err } diff --git a/service/alipayopen/sign.go b/service/alipayopen/sign.go index b05cce9a..037ec195 100644 --- a/service/alipayopen/sign.go +++ b/service/alipayopen/sign.go @@ -5,8 +5,8 @@ import ( "crypto" "crypto/rand" "encoding/base64" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "log" "sort" @@ -70,7 +70,7 @@ func (c *Client) getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/baidu/express.go b/service/baidu/express.go index 58a76661..a0a9ba4c 100644 --- a/service/baidu/express.go +++ b/service/baidu/express.go @@ -1,7 +1,7 @@ package baidu import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -28,6 +28,6 @@ func (c *Client) Express() *ExpressResult { request, err := c.request("https://m.baidu.com/s?word=快递查询&ts={$ts}&t_kt=0&ie=utf-8&rsv_iqid=&rsv_t=&sa=&rsv_pq=&rsv_sug4=&tj=1&inputT={$input}&sugid=&ss=", params, http.MethodPost) // 定义 var response ExpressResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newExpressResult(response, request.ResponseBody, request, err) } diff --git a/service/cloudflare/ipsv4.go b/service/cloudflare/ipsv4.go index d7ee3b3a..d4012a30 100644 --- a/service/cloudflare/ipsv4.go +++ b/service/cloudflare/ipsv4.go @@ -1,7 +1,7 @@ package cloudflare import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -28,6 +28,6 @@ func (c *Client) IpsV4() *IpsV4Result { request, err := c.request(apiUrl+"/ips-v4", params, http.MethodPost) // 定义 var response IpsV4Response - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIpsV4Result(response, request.ResponseBody, request, err) } diff --git a/service/cloudflare/ipsv6.go b/service/cloudflare/ipsv6.go index dd4fbb8e..08ef495d 100644 --- a/service/cloudflare/ipsv6.go +++ b/service/cloudflare/ipsv6.go @@ -1,7 +1,7 @@ package cloudflare import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -28,6 +28,6 @@ func (c *Client) IpsV6() *IpsV6Result { request, err := c.request(apiUrl+"/ips-v6", params, http.MethodPost) // 定义 var response IpsV6Response - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIpsV6Result(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/jd.jy_order_details.go b/service/dingdanxia/jd.jy_order_details.go index 223ed364..e1aeaddd 100644 --- a/service/dingdanxia/jd.jy_order_details.go +++ b/service/dingdanxia/jd.jy_order_details.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -47,6 +47,6 @@ func (c *Client) JdJyOrderDetails(ctx context.Context, notMustParams ...goreques request, err := c.request(ctx, apiUrl+"/jd/jy_order_details", params, http.MethodPost) // 定义 var response JdJyOrderDetailsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newJdJyOrderDetailsResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/jd.order_details2.go b/service/dingdanxia/jd.order_details2.go index 85653e71..1f4fd206 100644 --- a/service/dingdanxia/jd.order_details2.go +++ b/service/dingdanxia/jd.order_details2.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -16,6 +16,6 @@ func (c *Client) JdOrderDetails2(ctx context.Context, notMustParams ...gorequest request, err := c.request(ctx, apiUrl+"/jd/order_details2", params, http.MethodPost) // 定义 var response JdJyOrderDetailsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newJdJyOrderDetailsResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/tbk.activityinfo.go b/service/dingdanxia/tbk.activityinfo.go index 1a1cdd7f..558b2b81 100644 --- a/service/dingdanxia/tbk.activityinfo.go +++ b/service/dingdanxia/tbk.activityinfo.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,6 +45,6 @@ func (c *Client) TbkActivityinfo(ctx context.Context, notMustParams ...gorequest request, err := c.request(ctx, apiUrl+"/tbk/activityinfo", params, http.MethodPost) // 定义 var response TbkActivityinfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkActivityinfoResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_generateLink.go b/service/dingdanxia/waimai.meituan_generateLink.go index f65a74a8..3c8dfa21 100644 --- a/service/dingdanxia/waimai.meituan_generateLink.go +++ b/service/dingdanxia/waimai.meituan_generateLink.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) WaiMaiMeituanGenerateLink(ctx context.Context, notMustParams .. request, err := c.request(ctx, apiUrl+"/waimai/meituan_generateLink", params, http.MethodPost) // 定义 var response WaiMaiMeituanGenerateLinkResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanGenerateLinkResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_orderid.go b/service/dingdanxia/waimai.meituan_orderid.go index 5e9dd771..9a9e0915 100644 --- a/service/dingdanxia/waimai.meituan_orderid.go +++ b/service/dingdanxia/waimai.meituan_orderid.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -71,6 +71,6 @@ func (c *Client) WaiMaiMeituanOrderId(ctx context.Context, orderId string, Type request, err := c.request(ctx, apiUrl+"/waimai/meituan_orderid", params, http.MethodPost) // 定义 var response WaiMaiMeituanOrderIdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanOrderIdResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_orders.go b/service/dingdanxia/waimai.meituan_orders.go index ba13e1d8..6e3a2a10 100644 --- a/service/dingdanxia/waimai.meituan_orders.go +++ b/service/dingdanxia/waimai.meituan_orders.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -48,6 +48,6 @@ func (c *Client) WaiMaiMeituanOrders(ctx context.Context, notMustParams ...goreq request, err := c.request(ctx, apiUrl+"/waimai/meituan_orders", params, http.MethodPost) // 定义 var response WaiMaiMeituanOrdersResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanOrdersResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_privilege.go b/service/dingdanxia/waimai.meituan_privilege.go index 0450333f..5ef1d34c 100644 --- a/service/dingdanxia/waimai.meituan_privilege.go +++ b/service/dingdanxia/waimai.meituan_privilege.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,6 +50,6 @@ func (c *Client) WaiMaiMeituanPrivilege(ctx context.Context, sid string, generat request, err := c.request(ctx, apiUrl+"/waimai/meituan_privilege", params, http.MethodPost) // 定义 var response WaiMaiMeituanPrivilegeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanPrivilegeResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_sg_privilege.go b/service/dingdanxia/waimai.meituan_sg_privilege.go index ff441edc..316cb67c 100644 --- a/service/dingdanxia/waimai.meituan_sg_privilege.go +++ b/service/dingdanxia/waimai.meituan_sg_privilege.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -48,6 +48,6 @@ func (c *Client) WaiMaiMeituanSgPrivilege(ctx context.Context, sid string, gener request, err := c.request(ctx, apiUrl+"/waimai/meituan_sg_privilege", params, http.MethodPost) // 定义 var response WaiMaiMeituanSgPrivilegeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanSgPrivilegeResult(response, request.ResponseBody, request, err) } diff --git a/service/dingdanxia/waimai.meituan_youxuan_goods.go b/service/dingdanxia/waimai.meituan_youxuan_goods.go index 40e8f45b..18f0f86b 100644 --- a/service/dingdanxia/waimai.meituan_youxuan_goods.go +++ b/service/dingdanxia/waimai.meituan_youxuan_goods.go @@ -2,7 +2,7 @@ package dingdanxia import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -47,6 +47,6 @@ func (c *Client) WaiMaiMeituanYouxuanGoods(ctx context.Context, notMustParams .. request, err := c.request(ctx, apiUrl+"/waimai/meituan_youxuan_goods", params, http.MethodPost) // 定义 var response WaiMaiMeituanYouxuanGoodsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWaiMaiMeituanYouxuanGoodsResult(response, request.ResponseBody, request, err) } diff --git a/service/dingtalk/robot.send.go b/service/dingtalk/robot.send.go index 50a6f5e3..55d3aa7c 100644 --- a/service/dingtalk/robot.send.go +++ b/service/dingtalk/robot.send.go @@ -2,8 +2,8 @@ package dingtalk import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -36,6 +36,6 @@ func (c *Client) RobotSend(ctx context.Context, notMustParams ...gorequest.Param request, err := c.request(ctx, apiUrl+fmt.Sprintf("/robot/send?access_token=%s×tamp=%d&sign=%s", c.GetAccessToken(), timestamp, c.sign(timestamp)), params, http.MethodPost) // 定义 var response RobotSendResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRobotSendResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/Iot_api.query_ordered_pkgInfo.go b/service/eastiot/Iot_api.query_ordered_pkgInfo.go index 6c009e57..3c854aad 100644 --- a/service/eastiot/Iot_api.query_ordered_pkgInfo.go +++ b/service/eastiot/Iot_api.query_ordered_pkgInfo.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,6 +44,6 @@ func (c *Client) IotApiQueryOrderedPkgInfo(ctx context.Context, simId string) *I request, err := c.request(ctx, apiUrl+"/Api/IotApi/queryOrderedPkgInfo", params, http.MethodPost) // 定义 var response IotApiQueryOrderedPkgInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiQueryOrderedPkgInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/Iot_api.query_sim_pkgInfo.go b/service/eastiot/Iot_api.query_sim_pkgInfo.go index 08f7d8f7..22ad27d9 100644 --- a/service/eastiot/Iot_api.query_sim_pkgInfo.go +++ b/service/eastiot/Iot_api.query_sim_pkgInfo.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -51,6 +51,6 @@ func (c *Client) IotApiQuerySimPkgInfo(ctx context.Context, simId string, sd int request, err := c.request(ctx, apiUrl+"/Api/IotApi/querySimPkgInfo", params, http.MethodPost) // 定义 var response IotApiQuerySimPkgInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiQuerySimPkgInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/Iot_api.query_user_pkgInfo.go b/service/eastiot/Iot_api.query_user_pkgInfo.go index 522fe2d9..a888ae49 100644 --- a/service/eastiot/Iot_api.query_user_pkgInfo.go +++ b/service/eastiot/Iot_api.query_user_pkgInfo.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,6 +45,6 @@ func (c *Client) IotApiQueryUserPkgInfo(ctx context.Context) *IotApiQueryUserPkg request, err := c.request(ctx, apiUrl+"/Api/IotApi/queryUserPkgInfo", map[string]interface{}{}, http.MethodPost) // 定义 var response IotApiQueryUserPkgInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiQueryUserPkgInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/Iot_api.recharge_sim.go b/service/eastiot/Iot_api.recharge_sim.go index 86d150a6..21d11bdd 100644 --- a/service/eastiot/Iot_api.recharge_sim.go +++ b/service/eastiot/Iot_api.recharge_sim.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -32,6 +32,6 @@ func (c *Client) IotApiRechargeSim(ctx context.Context, notMustParams ...goreque request, err := c.request(ctx, apiUrl+"/Api/IotApi/rechargeSim", params, http.MethodPost) // 定义 var response IotApiRechargeSimResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiRechargeSimResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/api.Iot_api.get_all_sim_type.go b/service/eastiot/api.Iot_api.get_all_sim_type.go index a30a8b0d..f77ffa2c 100644 --- a/service/eastiot/api.Iot_api.get_all_sim_type.go +++ b/service/eastiot/api.Iot_api.get_all_sim_type.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) IotApiGetAllSimType(ctx context.Context) *IotApiGetAllSimTypeRe request, err := c.request(ctx, apiUrl+"/Api/IotApi/getAllSimType", map[string]interface{}{}, http.MethodPost) // 定义 var response IotApiGetAllSimTypeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiGetAllSimTypeResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/lot_api.query_user_balance.go b/service/eastiot/lot_api.query_user_balance.go index 855bc0f7..fec59956 100644 --- a/service/eastiot/lot_api.query_user_balance.go +++ b/service/eastiot/lot_api.query_user_balance.go @@ -2,7 +2,7 @@ package eastiot import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -33,6 +33,6 @@ func (c *Client) IotApiQueryUserBalance(ctx context.Context) *IotApiQueryUserBal request, err := c.request(ctx, apiUrl+"/Api/IotApi/queryUserBalance", map[string]interface{}{}, http.MethodPost) // 定义 var response IotApiQueryUserBalanceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newIotApiQueryUserBalanceResult(response, request.ResponseBody, request, err) } diff --git a/service/eastiot/sign.go b/service/eastiot/sign.go index 15377a61..d789d585 100644 --- a/service/eastiot/sign.go +++ b/service/eastiot/sign.go @@ -1,8 +1,8 @@ package eastiot import ( - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gomd5" "sort" "strconv" @@ -31,7 +31,7 @@ func (c *Client) getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/feishu/webhook.go b/service/feishu/webhook.go index e2f6b301..9354357b 100644 --- a/service/feishu/webhook.go +++ b/service/feishu/webhook.go @@ -2,8 +2,8 @@ package feishu import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) WebhookSend(ctx context.Context, notMustParams ...gorequest.Par request, err := c.request(ctx, apiUrl+fmt.Sprintf("/open-apis/bot/v2/hook/%s", c.GetKey()), params) // 定义 var response WebhookSendResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWebhookSendResult(response, request.ResponseBody, request, err) } diff --git a/service/gddata/gdp.index.go b/service/gddata/gdp.index.go index 59969f1e..9e4cb0a0 100644 --- a/service/gddata/gdp.index.go +++ b/service/gddata/gdp.index.go @@ -2,9 +2,9 @@ package gddata import ( "context" - "encoding/json" "fmt" "github.com/baidubce/bce-sdk-go/http" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -37,6 +37,6 @@ func (c *Client) GdpIndex(ctx context.Context, year string) *GdpIndexResult { request, err := c.request(ctx, apiUrl+fmt.Sprintf("MjkwMDBfMDM2MDAwMTc=?token=%s", c.GetToken()), params, http.GET) // 定义 var response GdpIndexResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGdpIndexResult(response, request.ResponseBody, request, err) } diff --git a/service/gitee/api.v5.user.go b/service/gitee/api.v5.user.go index d85b12d8..eeb74a44 100644 --- a/service/gitee/api.v5.user.go +++ b/service/gitee/api.v5.user.go @@ -1,8 +1,8 @@ package gitee import ( - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -59,6 +59,6 @@ func (c *Client) ApiV5User(accessToken string) *ApiV5UserResult { request, err := c.request(apiUrl+fmt.Sprintf("/api/v5/user?access_token=%s", accessToken), params, http.MethodGet) // 定义 var response ApiV5UserResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiV5UserResult(response, request.ResponseBody, request, err) } diff --git a/service/gitee/oauth.token.go b/service/gitee/oauth.token.go index 7d327790..13791927 100644 --- a/service/gitee/oauth.token.go +++ b/service/gitee/oauth.token.go @@ -1,8 +1,8 @@ package gitee import ( - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -31,6 +31,6 @@ func (c *Client) OauthToken(code string) *OauthTokenResult { request, err := c.request(apiUrl+fmt.Sprintf("/oauth/token?grant_type=authorization_code&code=%s&client_id=%s&redirect_uri=%s&client_secret=%s", code, c.config.ClientID, c.config.RedirectUri, c.config.ClientSecret), params, http.MethodPost) // 定义 var response OauthTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newOauthTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.activity.query.go b/service/jd/jd.union.open.activity.query.go index 18c1a802..d5ec5c1e 100644 --- a/service/jd/jd.union.open.activity.query.go +++ b/service/jd/jd.union.open.activity.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -70,7 +70,7 @@ func (c *Client) UnionOpenActivityQuery(ctx context.Context, notMustParams ...Pa // 定义 var responce UnionOpenActivityQueryResultResponse var result UnionOpenActivityQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenActivityQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenActivityQueryResponce.QueryResult), &result) return newUnionOpenActivityQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.category.goods.get.go b/service/jd/jd.union.open.category.goods.get.go index 1c24fd97..cb6e8a8f 100644 --- a/service/jd/jd.union.open.category.goods.get.go +++ b/service/jd/jd.union.open.category.goods.get.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -47,7 +47,7 @@ func (c *Client) UnionOpenCategoryGoodsGet(ctx context.Context, notMustParams .. // 定义 var responce UnionOpenCategoryGoodsGetResultResponse var result UnionOpenCategoryGoodsGetQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenCategoryGoodsGetResponce.GetResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenCategoryGoodsGetResponce.GetResult), &result) return newUnionOpenCategoryGoodsGetResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.goods.bigfield.query.go b/service/jd/jd.union.open.goods.bigfield.query.go index 98b82106..7af95d5c 100644 --- a/service/jd/jd.union.open.goods.bigfield.query.go +++ b/service/jd/jd.union.open.goods.bigfield.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -67,7 +67,7 @@ func (c *Client) UnionOpenGoodsBigfieldQuery(ctx context.Context, notMustParams // 定义 var responce UnionOpenGoodsBigfieldQueryResultResponse var result UnionOpenGoodsBigfieldQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenGoodsBigfieldQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenGoodsBigfieldQueryResponce.QueryResult), &result) return newUnionOpenGoodsBigfieldQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.goods.jingfen.query.go b/service/jd/jd.union.open.goods.jingfen.query.go index dd8fef36..6b9ffd88 100644 --- a/service/jd/jd.union.open.goods.jingfen.query.go +++ b/service/jd/jd.union.open.goods.jingfen.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -131,7 +131,7 @@ func (c *Client) UnionOpenGoodsJIngFenQuery(ctx context.Context, notMustParams . // 定义 var responce UnionOpenGoodsJIngFenQueryResultResponse var result UnionOpenGoodsJIngFenQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenGoodsJingfenQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenGoodsJingfenQueryResponce.QueryResult), &result) return newUnionOpenGoodsJIngFenQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.goods.material.query.go b/service/jd/jd.union.open.goods.material.query.go index 3b74f3dd..6cc4c683 100644 --- a/service/jd/jd.union.open.goods.material.query.go +++ b/service/jd/jd.union.open.goods.material.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -128,7 +128,7 @@ func (c *Client) UnionOpenGoodsMaterialQuery(ctx context.Context, notMustParams // 定义 var responce UnionOpenGoodsMaterialQueryResultResponse var result UnionOpenGoodsMaterialQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenGoodsMaterialQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenGoodsMaterialQueryResponce.QueryResult), &result) return newUnionOpenGoodsMaterialQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.goods.promotiongoodsinfo.query.go b/service/jd/jd.union.open.goods.promotiongoodsinfo.query.go index 2a35cfba..5d36976f 100644 --- a/service/jd/jd.union.open.goods.promotiongoodsinfo.query.go +++ b/service/jd/jd.union.open.goods.promotiongoodsinfo.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -66,7 +66,7 @@ func (c *Client) UnionOpenGoodsPromotionGoodsInfoQuery(ctx context.Context, notM // 定义 var responce UnionOpenGoodsPromotionGoodsInfoQueryResultResponse var result UnionOpenGoodsPromotionGoodsInfoQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenGoodsPromotiongoodsinfoQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenGoodsPromotiongoodsinfoQueryResponce.QueryResult), &result) return newUnionOpenGoodsPromotionGoodsInfoQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.order.query.go b/service/jd/jd.union.open.order.query.go index 1ef88516..1c2c961c 100644 --- a/service/jd/jd.union.open.order.query.go +++ b/service/jd/jd.union.open.order.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -91,7 +91,7 @@ func (c *Client) UnionOpenOrderQuery(ctx context.Context, notMustParams ...Param // 定义 var responce UnionOpenOrderQueryResultResponse var result UnionOpenOrderQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenOrderQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenOrderQueryResponce.QueryResult), &result) return newUnionOpenOrderQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.order.row.query.go b/service/jd/jd.union.open.order.row.query.go index ec4f46c8..9a10a4a5 100644 --- a/service/jd/jd.union.open.order.row.query.go +++ b/service/jd/jd.union.open.order.row.query.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -100,7 +100,7 @@ func (c *Client) UnionOpenOrderRowQuery(ctx context.Context, notMustParams ...Pa // 定义 var responce UnionOpenOrderRowQueryResultResponse var result UnionOpenOrderRowQueryQueryResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenOrderRowQueryResponce.QueryResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenOrderRowQueryResponce.QueryResult), &result) return newUnionOpenOrderRowQueryResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.promotion.bysubunionid.get.go b/service/jd/jd.union.open.promotion.bysubunionid.get.go index 2d6aeb7b..e4c1b092 100644 --- a/service/jd/jd.union.open.promotion.bysubunionid.get.go +++ b/service/jd/jd.union.open.promotion.bysubunionid.get.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -45,7 +45,7 @@ func (c *Client) UnionOpenPromotionBySubUnionIdGet(ctx context.Context, notMustP // 定义 var responce UnionOpenPromotionBySubUnionIdGetResultResponse var result UnionOpenPromotionBySubUnionIdGetGetResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenPromotionBySubUnionIdGetResponce.GetResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenPromotionBySubUnionIdGetResponce.GetResult), &result) return newUnionOpenPromotionBySubUnionIdGetResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/jd.union.open.promotion.common.get.go b/service/jd/jd.union.open.promotion.common.get.go index 0d70627e..06d62801 100644 --- a/service/jd/jd.union.open.promotion.common.get.go +++ b/service/jd/jd.union.open.promotion.common.get.go @@ -2,7 +2,7 @@ package jd import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -45,7 +45,7 @@ func (c *Client) UnionOpenPromotionCommonGet(ctx context.Context, notMustParams // 定义 var responce UnionOpenPromotionCommonGetResultResponse var result UnionOpenPromotionCommonGetGetResult - err = json.Unmarshal(request.ResponseBody, &responce) - err = json.Unmarshal([]byte(responce.JdUnionOpenPromotionCommonGetResponce.GetResult), &result) + err = gojson.Unmarshal(request.ResponseBody, &responce) + err = gojson.Unmarshal([]byte(responce.JdUnionOpenPromotionCommonGetResponce.GetResult), &result) return newUnionOpenPromotionCommonGetResult(responce, result, request.ResponseBody, request, err) } diff --git a/service/jd/params.go b/service/jd/params.go index c0f8c351..1ad556f2 100644 --- a/service/jd/params.go +++ b/service/jd/params.go @@ -1,7 +1,7 @@ package jd import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "net/url" "sort" "strconv" @@ -91,7 +91,7 @@ func getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/kashangwl/api.buy.go b/service/kashangwl/api.buy.go index 86255100..22afad60 100644 --- a/service/kashangwl/api.buy.go +++ b/service/kashangwl/api.buy.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -46,6 +46,6 @@ func (c *Client) ApiBuy(ctx context.Context, notMustParams ...gorequest.Params) request, err := c.request(ctx, apiUrl+"/api/buy", params) // 定义 var response ApiBuyResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiBuyResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.customer.go b/service/kashangwl/api.customer.go index b7462f8a..b71febd6 100644 --- a/service/kashangwl/api.customer.go +++ b/service/kashangwl/api.customer.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) ApiCustomer(ctx context.Context) *ApiCustomerResult { request, err := c.request(ctx, apiUrl+"/api/customer", map[string]interface{}{}) // 定义 var response ApiCustomerResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiCustomerResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.order.go b/service/kashangwl/api.order.go index 4006f59a..b664332c 100644 --- a/service/kashangwl/api.order.go +++ b/service/kashangwl/api.order.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -62,6 +62,6 @@ func (c *Client) ApiOrder(ctx context.Context, orderId string) *ApiOrderResult { request, err := c.request(ctx, apiUrl+"/api/order", params) // 定义 var response ApiOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.outer-order.go b/service/kashangwl/api.outer-order.go index 1f81e811..14dec862 100644 --- a/service/kashangwl/api.outer-order.go +++ b/service/kashangwl/api.outer-order.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -62,7 +62,7 @@ func (c *Client) ApiOuterOrder(ctx context.Context, orderId string) *ApiOuterOrd request, err := c.request(ctx, apiUrl+"/api/outer-order", params) // 定义 var response ApiOuterOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOuterOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.product.cache.go b/service/kashangwl/api.product.cache.go index b8e6f011..bdded270 100644 --- a/service/kashangwl/api.product.cache.go +++ b/service/kashangwl/api.product.cache.go @@ -2,8 +2,8 @@ package kashangwl import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -43,6 +43,6 @@ func (c *Client) ApiProductCache(ctx context.Context, productId int64) *ApiProdu request, err := c.requestCache(ctx, fmt.Sprintf("%s/goods_info", apiUrlCache), params, http.MethodGet) // 定义 var response ApiProductCacheResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiProductCacheResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.product.go b/service/kashangwl/api.product.go index 59d0a8fe..c9509e9e 100644 --- a/service/kashangwl/api.product.go +++ b/service/kashangwl/api.product.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -45,6 +45,6 @@ func (c *Client) ApiProduct(ctx context.Context, productId int64) *ApiProductRes request, err := c.request(ctx, apiUrl+"/api/product", params) // 定义 var response ApiProductResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiProductResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/api.product.recharge-params.go b/service/kashangwl/api.product.recharge-params.go index 3da5a1f1..34d6b0b4 100644 --- a/service/kashangwl/api.product.recharge-params.go +++ b/service/kashangwl/api.product.recharge-params.go @@ -2,7 +2,7 @@ package kashangwl import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -41,6 +41,6 @@ func (c *Client) ApiProductRechargeParams(ctx context.Context, productId int64) request, err := c.request(ctx, apiUrl+"/api/product/recharge-params", params) // 定义 var response ApiProductRechargeParamsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiProductRechargeParamsResult(response, request.ResponseBody, request, err) } diff --git a/service/kashangwl/sign.go b/service/kashangwl/sign.go index 1ebd221e..7bcb9d4a 100644 --- a/service/kashangwl/sign.go +++ b/service/kashangwl/sign.go @@ -4,7 +4,7 @@ import ( "bytes" "crypto/md5" "encoding/hex" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "io" "net/url" @@ -53,7 +53,7 @@ func (c *Client) getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - marshal, _ := json.Marshal(v) + marshal, _ := gojson.Marshal(v) return string(marshal) } } diff --git a/service/leshuazf/apiv2.merchant.updateAuthority.go b/service/leshuazf/apiv2.merchant.updateAuthority.go index b0bd3cda..d5978d16 100644 --- a/service/leshuazf/apiv2.merchant.updateAuthority.go +++ b/service/leshuazf/apiv2.merchant.updateAuthority.go @@ -1,7 +1,7 @@ package leshuazf import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -29,6 +29,6 @@ func (c *Client) ApiV2MerchantUpdateAuthority(notMustParams ...gorequest.Params) request, err := c.request("/apiv2/merchant/updateAuthority", params, http.MethodPost) // 定义 var response ApiV2MerchantUpdateAuthorityResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiV2MerchantUpdateAuthorityResult(response, request.ResponseBody, request, err) } diff --git a/service/leshuazf/data.area.go b/service/leshuazf/data.area.go index 2bcff97f..1015a464 100644 --- a/service/leshuazf/data.area.go +++ b/service/leshuazf/data.area.go @@ -1,7 +1,7 @@ package leshuazf import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -37,6 +37,6 @@ func (c *Client) DataArea(notMustParams ...gorequest.Params) *DataAreaResult { request, err := c.request("/data/area", params, http.MethodPost) // 定义 var response DataAreaResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newDataAreaResult(response, request.ResponseBody, request, err) } diff --git a/service/leshuazf/data.bankbranch2.go b/service/leshuazf/data.bankbranch2.go index 15065070..c5d83eec 100644 --- a/service/leshuazf/data.bankbranch2.go +++ b/service/leshuazf/data.bankbranch2.go @@ -1,7 +1,7 @@ package leshuazf import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,6 +50,6 @@ func (c *Client) DataBankBranch2(notMustParams ...gorequest.Params) *DataBankBra request, err := c.request("/data/bankbranch2", params, http.MethodPost) // 定义 var response DataBankBranch2Response - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newDataBankBranch2Result(response, request.ResponseBody, request, err) } diff --git a/service/leshuazf/data.mcc.go b/service/leshuazf/data.mcc.go index 5c46b35a..bd291794 100644 --- a/service/leshuazf/data.mcc.go +++ b/service/leshuazf/data.mcc.go @@ -1,7 +1,7 @@ package leshuazf import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -36,6 +36,6 @@ func (c *Client) DataMcc(notMustParams ...gorequest.Params) *DataMccResult { request, err := c.request("/data/mcc", params, http.MethodPost) // 定义 var response DataMccResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newDataMccResult(response, request.ResponseBody, request, err) } diff --git a/service/leshuazf/sign.go b/service/leshuazf/sign.go index 45ab0a03..9ba5191c 100644 --- a/service/leshuazf/sign.go +++ b/service/leshuazf/sign.go @@ -1,8 +1,8 @@ package leshuazf import ( - "encoding/json" "github.com/dtapps/go-library/utils/gobase64" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gomd5" "sort" ) @@ -16,6 +16,6 @@ func (c *Client) getSign(params map[string]interface{}) string { keys = append(keys, k) } sort.Strings(keys) - str, _ := json.Marshal(keys) // data字符串值 + str, _ := gojson.Marshal(keys) // data字符串值 return gobase64.Encode(gomd5.ToLower("lepos" + c.GetKeyAgent() + string(str))) } diff --git a/service/meituan/api.generate_link.go b/service/meituan/api.generate_link.go index c1f7ab1a..1efc42e4 100644 --- a/service/meituan/api.generate_link.go +++ b/service/meituan/api.generate_link.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) ApiGenerateLink(ctx context.Context, notMustParams ...gorequest request, err := c.request(ctx, apiUrl+"/api/generateLink", params, http.MethodGet) // 定义 var response ApiGenerateLinkResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiGenerateLinkResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.getqualityscorebysid.go b/service/meituan/api.getqualityscorebysid.go index bb18cddf..90844dd4 100644 --- a/service/meituan/api.getqualityscorebysid.go +++ b/service/meituan/api.getqualityscorebysid.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -46,6 +46,6 @@ func (c *Client) ApiGetQuaLitYsCoreBySid(ctx context.Context, notMustParams ...g request, err := c.request(ctx, apiUrl+"/api/getqualityscorebysid", params, http.MethodGet) // 定义 var response ApiGetQuaLitYsCoreBySidResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiGetQuaLitYsCoreBySidResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.mini_code.go b/service/meituan/api.mini_code.go index b5cb459b..c2bd66ec 100644 --- a/service/meituan/api.mini_code.go +++ b/service/meituan/api.mini_code.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) ApiMiniCode(ctx context.Context, notMustParams ...gorequest.Par request, err := c.request(ctx, apiUrl+"/api/miniCode", params, http.MethodGet) // 定义 var response ApiMiniCodeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiMiniCodeResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.mtunion.category.go b/service/meituan/api.mtunion.category.go index 7e6dc2a8..42ae18cd 100644 --- a/service/meituan/api.mtunion.category.go +++ b/service/meituan/api.mtunion.category.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -43,6 +43,6 @@ func (c *Client) ApiMtUnionCategory(ctx context.Context, notMustParams ...gorequ request, err := c.request(ctx, apiUrl+"/api/getqualityscorebysid", params, http.MethodGet) // 定义 var response ApiMtUnionCategoryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiMtUnionCategoryResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.mtunion.city.go b/service/meituan/api.mtunion.city.go index 4bfeaec1..bec0d7d0 100644 --- a/service/meituan/api.mtunion.city.go +++ b/service/meituan/api.mtunion.city.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -43,6 +43,6 @@ func (c *Client) ApiMtUnionCity(ctx context.Context, notMustParams ...gorequest. request, err := c.request(ctx, apiUrl+"/api/getqualityscorebysid", params, http.MethodGet) // 定义 var response ApiMtUnionCityResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiMtUnionCityResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.mtunion.poi.go b/service/meituan/api.mtunion.poi.go index 2b57fd7d..82c21e84 100644 --- a/service/meituan/api.mtunion.poi.go +++ b/service/meituan/api.mtunion.poi.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -58,6 +58,6 @@ func (c *Client) ApiMtUnionPoi(ctx context.Context, notMustParams ...gorequest.P request, err := c.request(ctx, apiUrl+"/api/getqualityscorebysid", params, http.MethodGet) // 定义 var response ApiMtUnionPoiResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiMtUnionPoiResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.mtunion.sku.go b/service/meituan/api.mtunion.sku.go index 31d1575c..045c921b 100644 --- a/service/meituan/api.mtunion.sku.go +++ b/service/meituan/api.mtunion.sku.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -48,6 +48,6 @@ func (c *Client) ApiMtUnionSku(ctx context.Context, notMustParams ...gorequest.P request, err := c.request(ctx, apiUrl+"/api/getqualityscorebysid", params, http.MethodGet) // 定义 var response ApiMtUnionSkuResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiMtUnionSkuResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.order.go b/service/meituan/api.order.go index df039923..5981ba41 100644 --- a/service/meituan/api.order.go +++ b/service/meituan/api.order.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -75,6 +75,6 @@ func (c *Client) ApiOrder(ctx context.Context, notMustParams ...gorequest.Params request, err := c.request(ctx, apiUrl+"/api/order", params, http.MethodGet) // 定义 var response ApiOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/api.orderList.go b/service/meituan/api.orderList.go index e499ee3b..b2a4e444 100644 --- a/service/meituan/api.orderList.go +++ b/service/meituan/api.orderList.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "net/http" @@ -60,6 +60,6 @@ func (c *Client) ApiOrderList(ctx context.Context, notMustParams ...gorequest.Pa request, err := c.request(ctx, apiUrl+"/api/orderList", params, http.MethodGet) // 定义 var response ApiOrderListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderListResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/poi.area.go b/service/meituan/poi.area.go index 40d46098..be22dcc5 100644 --- a/service/meituan/poi.area.go +++ b/service/meituan/poi.area.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,6 +41,6 @@ func (c *Client) PoiArea(ctx context.Context, cityID int) *PoiAreaResult { request, err := c.request(ctx, apiUrl+"/poi/area", params, http.MethodGet) // 定义 var response PoiAreaResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPoiAreaResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/poi.category.go b/service/meituan/poi.category.go index a3dad935..d6dd9bc0 100644 --- a/service/meituan/poi.category.go +++ b/service/meituan/poi.category.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,6 +41,6 @@ func (c *Client) PoiCategory(ctx context.Context, cityID int) *PoiCategoryResult request, err := c.request(ctx, apiUrl+"/poi/category", params, http.MethodGet) // 定义 var response PoiCategoryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPoiCategoryResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/poi.city.go b/service/meituan/poi.city.go index 1f9794be..0673d21b 100644 --- a/service/meituan/poi.city.go +++ b/service/meituan/poi.city.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) PoiCity(ctx context.Context) *PoiCityResult { request, err := c.request(ctx, apiUrl+"/poi/city", map[string]interface{}{}, http.MethodGet) // 定义 var response PoiCityResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPoiCityResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/poi.district.go b/service/meituan/poi.district.go index eb78c5de..14702674 100644 --- a/service/meituan/poi.district.go +++ b/service/meituan/poi.district.go @@ -2,7 +2,7 @@ package meituan import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -37,6 +37,6 @@ func (c *Client) PoiDistrict(ctx context.Context, cityID int) *PoiDistrictResult request, err := c.request(ctx, apiUrl+"/poi/district", params, http.MethodGet) // 定义 var response PoiDistrictResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPoiDistrictResult(response, request.ResponseBody, request, err) } diff --git a/service/meituan/sign.go b/service/meituan/sign.go index 7ff7aae0..c573c225 100644 --- a/service/meituan/sign.go +++ b/service/meituan/sign.go @@ -4,7 +4,7 @@ import ( "bytes" "crypto/md5" "encoding/hex" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "io" "sort" "strconv" @@ -40,7 +40,7 @@ func (c *Client) getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - marshal, _ := json.Marshal(v) + marshal, _ := gojson.Marshal(v) return string(marshal) } } diff --git a/service/nldyp/partner.common.GetSurplusMoney.go b/service/nldyp/partner.common.GetSurplusMoney.go index 93a45d1d..052faef5 100644 --- a/service/nldyp/partner.common.GetSurplusMoney.go +++ b/service/nldyp/partner.common.GetSurplusMoney.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) PartnerCommonGetSurplusMoney(ctx context.Context, notMustParams request, err := c.request(ctx, apiUrl+"/partner/common/GetSurplusMoney", params) // 定义 var response PartnerCommonGetSurplusMoneyResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerCommonGetSurplusMoneyResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.GetOrderData.go b/service/nldyp/partner.data4.GetOrderData.go index 37187e25..96495bdb 100644 --- a/service/nldyp/partner.data4.GetOrderData.go +++ b/service/nldyp/partner.data4.GetOrderData.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -31,6 +31,6 @@ func (c *Client) PartnerData4GetOrderData(ctx context.Context, notMustParams ... request, err := c.request(ctx, apiUrl+"/partner/data4/GetOrderData", params) // 定义 var response PartnerData4GetOrderDataResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetOrderDataResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getAddressLists.go b/service/nldyp/partner.data4.getAddressLists.go index a8d9d115..f245314f 100644 --- a/service/nldyp/partner.data4.getAddressLists.go +++ b/service/nldyp/partner.data4.getAddressLists.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) PartnerData4GetAddressLists(ctx context.Context) *PartnerData4G request, err := c.request(ctx, apiUrl+"/partner/data4/getAddressLists", params) // 定义 var response PartnerData4GetAddressListsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetAddressListsResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getCinema.go b/service/nldyp/partner.data4.getCinema.go index 8c9083c5..d8ca7b01 100644 --- a/service/nldyp/partner.data4.getCinema.go +++ b/service/nldyp/partner.data4.getCinema.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -49,6 +49,6 @@ func (c *Client) PartnerData4GetCinema(ctx context.Context) *PartnerData4GetCine request, err := c.request(ctx, apiUrl+"/partner/data4/getCinema", params) // 定义 var response PartnerData4GetCinemaResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetCinemaResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getCityLists.go b/service/nldyp/partner.data4.getCityLists.go index 173a6765..5045c512 100644 --- a/service/nldyp/partner.data4.getCityLists.go +++ b/service/nldyp/partner.data4.getCityLists.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -37,6 +37,6 @@ func (c *Client) PartnerData4GetCityLists(ctx context.Context) *PartnerData4GetC request, err := c.request(ctx, apiUrl+"/partner/data4/getCityLists", params) // 定义 var response PartnerData4GetCityListsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetCityListsResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getFilmList.go b/service/nldyp/partner.data4.getFilmList.go index 7ca9d242..33c6df8e 100644 --- a/service/nldyp/partner.data4.getFilmList.go +++ b/service/nldyp/partner.data4.getFilmList.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -50,6 +50,6 @@ func (c *Client) PartnerData4GetFilmList(ctx context.Context) *PartnerData4GetFi request, err := c.request(ctx, apiUrl+"/partner/data4/getFilmList", params) // 定义 var response PartnerData4GetFilmListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetFilmListResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getOrderDetail.go b/service/nldyp/partner.data4.getOrderDetail.go index 84f59058..9948bb94 100644 --- a/service/nldyp/partner.data4.getOrderDetail.go +++ b/service/nldyp/partner.data4.getOrderDetail.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -47,6 +47,6 @@ func (c *Client) PartnerData4GetOrderDetail(ctx context.Context, orderNo string) request, err := c.request(ctx, apiUrl+"/partner/data4/getOrderDetail", params) // 定义 var response PartnerData4GetOrderDetailResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetOrderDetailResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getOrderStatus.go b/service/nldyp/partner.data4.getOrderStatus.go index 21458fe0..050f2fb7 100644 --- a/service/nldyp/partner.data4.getOrderStatus.go +++ b/service/nldyp/partner.data4.getOrderStatus.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -55,6 +55,6 @@ func (c *Client) PartnerData4GetOrderStatus(ctx context.Context, notMustParams . request, err := c.request(ctx, apiUrl+"/partner/data4/getOrderStatus", params) // 定义 var response PartnerData4GetOrderStatusResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetOrderStatusResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getPlan.go b/service/nldyp/partner.data4.getPlan.go index 0ad13013..0c47b3c7 100644 --- a/service/nldyp/partner.data4.getPlan.go +++ b/service/nldyp/partner.data4.getPlan.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -51,6 +51,6 @@ func (c *Client) PartnerData4GetPlan(ctx context.Context) *PartnerData4GetPlanRe request, err := c.request(ctx, apiUrl+"/partner/data4/getPlan", params) // 定义 var response PartnerData4GetPlanResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetPlanResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getPlanDetail.go b/service/nldyp/partner.data4.getPlanDetail.go index add2c5bc..6c1fede2 100644 --- a/service/nldyp/partner.data4.getPlanDetail.go +++ b/service/nldyp/partner.data4.getPlanDetail.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -53,6 +53,6 @@ func (c *Client) PartnerData4GetPlanDetail(ctx context.Context, cinemaId int, fe request, err := c.request(ctx, apiUrl+"/partner/data4/getPlanDetail", params) // 定义 var response PartnerData4GetPlanDetailResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetPlanDetailResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.getPlanSeat.go b/service/nldyp/partner.data4.getPlanSeat.go index 07ce30bd..6061a42c 100644 --- a/service/nldyp/partner.data4.getPlanSeat.go +++ b/service/nldyp/partner.data4.getPlanSeat.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -47,6 +47,6 @@ func (c *Client) PartnerData4GetPlanSeat(ctx context.Context, cinemaId int, feat request, err := c.request(ctx, apiUrl+"/partner/data4/getPlanSeat", params) // 定义 var response PartnerData4GetPlanSeatResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4GetPlanSeatResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.lockSeat.go b/service/nldyp/partner.data4.lockSeat.go index 4f075a8a..2baf144c 100644 --- a/service/nldyp/partner.data4.lockSeat.go +++ b/service/nldyp/partner.data4.lockSeat.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -38,6 +38,6 @@ func (c *Client) PartnerData4LockSeat(ctx context.Context, notMustParams ...gore request, err := c.request(ctx, apiUrl+"/partner/data4/lockSeat", params) // 定义 var response PartnerData4LockSeatResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4LockSeatResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.sellTicket.go b/service/nldyp/partner.data4.sellTicket.go index 79955150..a2e01edc 100644 --- a/service/nldyp/partner.data4.sellTicket.go +++ b/service/nldyp/partner.data4.sellTicket.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -40,6 +40,6 @@ func (c *Client) PartnerData4SellTicket(ctx context.Context, orderId, orderNo, n request, err := c.request(ctx, apiUrl+"/partner/data4/sellTicket", params) // 定义 var response PartnerData4SellTicketResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4SellTicketResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/partner.data4.unLockOrder.go b/service/nldyp/partner.data4.unLockOrder.go index 72676566..11e18907 100644 --- a/service/nldyp/partner.data4.unLockOrder.go +++ b/service/nldyp/partner.data4.unLockOrder.go @@ -2,7 +2,7 @@ package nldyp import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -35,6 +35,6 @@ func (c *Client) PartnerData4UnLockOrder(ctx context.Context, notMustParams ...g request, err := c.request(ctx, apiUrl+"/partner/data4/unLockOrder", params) // 定义 var response PartnerData4UnLockOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPartnerData4UnLockOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/nldyp/sign.go b/service/nldyp/sign.go index 01dfb091..d39649ed 100644 --- a/service/nldyp/sign.go +++ b/service/nldyp/sign.go @@ -3,8 +3,8 @@ package nldyp import ( "crypto/md5" "encoding/hex" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gotime" "sort" "strconv" @@ -39,7 +39,7 @@ func getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/pconline/ip.go b/service/pconline/ip.go index 5ab6d47f..af6594cf 100644 --- a/service/pconline/ip.go +++ b/service/pconline/ip.go @@ -1,8 +1,8 @@ package pconline import ( - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "golang.org/x/text/encoding/simplifiedchinese" ) @@ -42,6 +42,6 @@ func (c *Client) Ip(ip string) *IpResult { var decodeBytes, _ = simplifiedchinese.GB18030.NewDecoder().Bytes(request.ResponseBody) // 定义 var response IpResponse - err = json.Unmarshal(decodeBytes, &response) + err = gojson.Unmarshal(decodeBytes, &response) return newIpResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/params.go b/service/pinduoduo/params.go index 86fe6470..011b34db 100644 --- a/service/pinduoduo/params.go +++ b/service/pinduoduo/params.go @@ -1,7 +1,7 @@ package pinduoduo import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "net/url" "sort" "strconv" @@ -84,7 +84,7 @@ func getString(i interface{}) string { return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/pinduoduo/pdd.ddk.all.order.list.increment.get.go b/service/pinduoduo/pdd.ddk.all.order.list.increment.get.go new file mode 100644 index 00000000..e5f3196d --- /dev/null +++ b/service/pinduoduo/pdd.ddk.all.order.list.increment.get.go @@ -0,0 +1 @@ +package pinduoduo diff --git a/service/pinduoduo/pdd.ddk.cms.prom.url.generate.go b/service/pinduoduo/pdd.ddk.cms.prom.url.generate.go index 2ce2b3d2..fb9915e7 100644 --- a/service/pinduoduo/pdd.ddk.cms.prom.url.generate.go +++ b/service/pinduoduo/pdd.ddk.cms.prom.url.generate.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -71,8 +71,8 @@ func (c *Client) CmsPromUrlGenerate(ctx context.Context, notMustParams ...Params request, err := c.request(ctx, params) // 定义 var response CmsPromUrlGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) var responseError CmsPromUrlGenerateError - err = json.Unmarshal(request.ResponseBody, &responseError) + err = gojson.Unmarshal(request.ResponseBody, &responseError) return newCmsPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError) } diff --git a/service/pinduoduo/pdd.ddk.goods.detail.go b/service/pinduoduo/pdd.ddk.goods.detail.go index 06ee0c1b..2e94f3aa 100644 --- a/service/pinduoduo/pdd.ddk.goods.detail.go +++ b/service/pinduoduo/pdd.ddk.goods.detail.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -106,6 +106,6 @@ func (c *Client) GoodsDetail(ctx context.Context, notMustParams ...Params) *Good request, err := c.request(ctx, params) // 定义 var response GoodsDetailResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsDetailResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.goods.pid.generate.go b/service/pinduoduo/pdd.ddk.goods.pid.generate.go index dc6dcc5b..089bb1f3 100644 --- a/service/pinduoduo/pdd.ddk.goods.pid.generate.go +++ b/service/pinduoduo/pdd.ddk.goods.pid.generate.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -38,6 +38,6 @@ func (c *Client) GoodsPidGenerate(ctx context.Context, notMustParams ...Params) request, err := c.request(ctx, params) // 定义 var response GoodsPidGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsPidGenerateResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.goods.promotion.url.generate.go b/service/pinduoduo/pdd.ddk.goods.promotion.url.generate.go index 40d1bf8d..bd89748e 100644 --- a/service/pinduoduo/pdd.ddk.goods.promotion.url.generate.go +++ b/service/pinduoduo/pdd.ddk.goods.promotion.url.generate.go @@ -2,7 +2,6 @@ package pinduoduo import ( "context" - "encoding/json" "github.com/dtapps/go-library/utils/gorequest" ) @@ -64,6 +63,6 @@ func (c *Client) GoodsPromotionUrlGenerate(ctx context.Context, notMustParams .. request, err := c.request(ctx, params) // 定义 var response GoodsPromotionUrlGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsPromotionUrlGenerateResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.goods.recommend.get.go b/service/pinduoduo/pdd.ddk.goods.recommend.get.go index 7ffa593e..1d4af325 100644 --- a/service/pinduoduo/pdd.ddk.goods.recommend.get.go +++ b/service/pinduoduo/pdd.ddk.goods.recommend.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -88,6 +88,6 @@ func (c *Client) GoodsRecommendGet(ctx context.Context, notMustParams ...Params) request, err := c.request(ctx, params) // 定义 var response GoodsRecommendGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsRecommendGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.goods.search.go b/service/pinduoduo/pdd.ddk.goods.search.go index 94968b59..778ecca5 100644 --- a/service/pinduoduo/pdd.ddk.goods.search.go +++ b/service/pinduoduo/pdd.ddk.goods.search.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -102,6 +102,6 @@ func (c *Client) GoodsSearch(ctx context.Context, notMustParams ...Params) *Good request, err := c.request(ctx, params) // 定义 var response GoodsSearchResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsSearchResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.member.authority.query.go b/service/pinduoduo/pdd.ddk.member.authority.query.go index 2fb146e6..9d1e7da4 100644 --- a/service/pinduoduo/pdd.ddk.member.authority.query.go +++ b/service/pinduoduo/pdd.ddk.member.authority.query.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) MemberAuthorityQuery(ctx context.Context, notMustParams ...Para request, err := c.request(ctx, params) // 定义 var response MemberAuthorityQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newMemberAuthorityQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.oauth.cashgift.create.go b/service/pinduoduo/pdd.ddk.oauth.cashgift.create.go index 21c53b5e..33345cdd 100644 --- a/service/pinduoduo/pdd.ddk.oauth.cashgift.create.go +++ b/service/pinduoduo/pdd.ddk.oauth.cashgift.create.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -33,6 +33,6 @@ func (c *PddDdkOauthCashGiftApi) Create(ctx context.Context, notMustParams ...Pa request, err := c.client.request(ctx, params) // 定义 var response PddDdkOauthCashGiftCreateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPddDdkOauthCashGiftCreateResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.oauth.cashgift.data.query.go b/service/pinduoduo/pdd.ddk.oauth.cashgift.data.query.go index 12d11361..a5b373ac 100644 --- a/service/pinduoduo/pdd.ddk.oauth.cashgift.data.query.go +++ b/service/pinduoduo/pdd.ddk.oauth.cashgift.data.query.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -56,6 +56,6 @@ func (c *PddDdkOauthCashGiftApi) DataQuery(ctx context.Context, notMustParams .. request, err := c.client.request(ctx, params) // 定义 var response PddDdkOauthCashGiftDataQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPddDdkOauthCashGiftDataQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.oauth.cashgift.status.update.go b/service/pinduoduo/pdd.ddk.oauth.cashgift.status.update.go index 314e01f0..f27218eb 100644 --- a/service/pinduoduo/pdd.ddk.oauth.cashgift.status.update.go +++ b/service/pinduoduo/pdd.ddk.oauth.cashgift.status.update.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -32,6 +32,6 @@ func (c *PddDdkOauthCashGiftApi) StatusUpdate(ctx context.Context, notMustParams request, err := c.client.request(ctx, params) // 定义 var response PddDdkOauthCashGiftStatusUpdateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPddDdkOauthCashGiftStatusUpdateResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.oauth.cms.prom.url.generate.go b/service/pinduoduo/pdd.ddk.oauth.cms.prom.url.generate.go index f6bf0380..608105b3 100644 --- a/service/pinduoduo/pdd.ddk.oauth.cms.prom.url.generate.go +++ b/service/pinduoduo/pdd.ddk.oauth.cms.prom.url.generate.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -67,6 +67,6 @@ func (c *PddDdkOauthCmsApi) UrlGenerate(ctx context.Context, notMustParams ...Pa request, err := c.client.request(ctx, params) // 定义 var response PddDdkOauthCmsUrlGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPddDdkOauthCmsUrlGenerateResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.detail.go b/service/pinduoduo/pdd.ddk.oauth.goods.detail.go new file mode 100644 index 00000000..1437dbb0 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.detail.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsDetailResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsDetailResult struct { + Result PddDdkOauthGoodsDetailResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsDetailResult(result PddDdkOauthGoodsDetailResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsDetailResult { + return &PddDdkOauthGoodsDetailResult{Result: result, Body: body, Http: http, Err: err} +} + +// Detail 多多进宝商品详情查询 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.detail +func (c *PddDdkOauthGoodsApi) Detail(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsDetailResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.detail", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsDetailResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsDetailResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.pid.generate.go b/service/pinduoduo/pdd.ddk.oauth.goods.pid.generate.go new file mode 100644 index 00000000..73da42c8 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.pid.generate.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsPidGenerateResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsPidGenerateResult struct { + Result PddDdkOauthGoodsPidGenerateResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsPidGenerateResult(result PddDdkOauthGoodsPidGenerateResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsPidGenerateResult { + return &PddDdkOauthGoodsPidGenerateResult{Result: result, Body: body, Http: http, Err: err} +} + +// PidGenerate 多多进宝推广位创建接口 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.pid.generate +func (c *PddDdkOauthGoodsApi) PidGenerate(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsPidGenerateResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.pid.generate", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsPidGenerateResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsPidGenerateResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.pid.query.go b/service/pinduoduo/pdd.ddk.oauth.goods.pid.query.go new file mode 100644 index 00000000..596a9631 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.pid.query.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsPidQueryResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsPidQueryResult struct { + Result PddDdkOauthGoodsPidQueryResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsPidQueryResult(result PddDdkOauthGoodsPidQueryResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsPidQueryResult { + return &PddDdkOauthGoodsPidQueryResult{Result: result, Body: body, Http: http, Err: err} +} + +// PidQuery 多多客已生成推广位信息查询 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.pid.query +func (c *PddDdkOauthGoodsApi) PidQuery(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsPidQueryResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.pid.query", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsPidQueryResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsPidQueryResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.prom.url.generate.go b/service/pinduoduo/pdd.ddk.oauth.goods.prom.url.generate.go new file mode 100644 index 00000000..d53b6a07 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.prom.url.generate.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsPromUrlGenerateResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsPromUrlGenerateResult struct { + Result PddDdkOauthGoodsPromUrlGenerateResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsPromUrlGenerateResult(result PddDdkOauthGoodsPromUrlGenerateResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsPromUrlGenerateResult { + return &PddDdkOauthGoodsPromUrlGenerateResult{Result: result, Body: body, Http: http, Err: err} +} + +// PromUrlGenerate 生成多多进宝推广链接 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.prom.url.generate +func (c *PddDdkOauthGoodsApi) PromUrlGenerate(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsPromUrlGenerateResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.prom.url.generate", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsPromUrlGenerateResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsPromUrlGenerateResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.recommend.get.go b/service/pinduoduo/pdd.ddk.oauth.goods.recommend.get.go new file mode 100644 index 00000000..c601d97b --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.recommend.get.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsRecommendGetResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsRecommendGetResult struct { + Result PddDdkOauthGoodsRecommendGetResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsRecommendGetResult(result PddDdkOauthGoodsRecommendGetResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsRecommendGetResult { + return &PddDdkOauthGoodsRecommendGetResult{Result: result, Body: body, Http: http, Err: err} +} + +// RecommendGet 运营频道商品查询API +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.recommend.get +func (c *PddDdkOauthGoodsApi) RecommendGet(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsRecommendGetResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.recommend.get", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsRecommendGetResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsRecommendGetResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.search.go b/service/pinduoduo/pdd.ddk.oauth.goods.search.go new file mode 100644 index 00000000..ee42adde --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.search.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsSearchResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsSearchResult struct { + Result PddDdkOauthGoodsSearchResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsSearchResult(result PddDdkOauthGoodsSearchResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsSearchResult { + return &PddDdkOauthGoodsSearchResult{Result: result, Body: body, Http: http, Err: err} +} + +// Search 多多进宝商品查询 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.search +func (c *PddDdkOauthGoodsApi) Search(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsSearchResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.search", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsSearchResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsSearchResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.goods.zs.unit.url.gen.go b/service/pinduoduo/pdd.ddk.oauth.goods.zs.unit.url.gen.go new file mode 100644 index 00000000..91fbec5c --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.goods.zs.unit.url.gen.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthGoodsZsUnitUrlGenResponse struct { + OrderDetailResponse struct { + SepMarketFee int `json:"sep_market_fee"` + GoodsPrice int `json:"goods_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + GoodsName string `json:"goods_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + GoodsQuantity int `json:"goods_quantity"` + GoodsId int64 `json:"goods_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + GoodsThumbnailUrl string `json:"goods_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + GoodsCategoryName string `json:"goods_category_name"` + RequestId string `json:"request_id"` + GoodsSign string `json:"goods_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_detail_response"` +} + +type PddDdkOauthGoodsZsUnitUrlGenResult struct { + Result PddDdkOauthGoodsZsUnitUrlGenResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthGoodsZsUnitUrlGenResult(result PddDdkOauthGoodsZsUnitUrlGenResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthGoodsZsUnitUrlGenResult { + return &PddDdkOauthGoodsZsUnitUrlGenResult{Result: result, Body: body, Http: http, Err: err} +} + +// ZsUnitUrlGen 生成招商推广链接 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.goods.zs.unit.url.gen +func (c *PddDdkOauthGoodsApi) ZsUnitUrlGen(ctx context.Context, notMustParams ...Params) *PddDdkOauthGoodsZsUnitUrlGenResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.goods.zs.unit.url.gen", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthGoodsZsUnitUrlGenResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthGoodsZsUnitUrlGenResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.member.authority.query.go b/service/pinduoduo/pdd.ddk.oauth.member.authority.query.go new file mode 100644 index 00000000..4199c798 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.member.authority.query.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthMemberAuthorityQueryResponse struct { + OrderAuthorityQueryResponse struct { + SepMarketFee int `json:"sep_market_fee"` + MemberPrice int `json:"Member_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + MemberName string `json:"Member_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + MemberQuantity int `json:"Member_quantity"` + MemberId int64 `json:"Member_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + MemberThumbnailUrl string `json:"Member_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + MemberCategoryName string `json:"Member_category_name"` + RequestId string `json:"request_id"` + MemberSign string `json:"Member_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_AuthorityQuery_response"` +} + +type PddDdkOauthMemberAuthorityQueryResult struct { + Result PddDdkOauthMemberAuthorityQueryResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthMemberAuthorityQueryResult(result PddDdkOauthMemberAuthorityQueryResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthMemberAuthorityQueryResult { + return &PddDdkOauthMemberAuthorityQueryResult{Result: result, Body: body, Http: http, Err: err} +} + +// AuthorityQuery 查询是否绑定备案 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.member.authority.query +func (c *PddDdkOauthMemberApi) AuthorityQuery(ctx context.Context, notMustParams ...Params) *PddDdkOauthMemberAuthorityQueryResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.member.authority.query", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthMemberAuthorityQueryResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthMemberAuthorityQueryResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.order.detail.get.go b/service/pinduoduo/pdd.ddk.oauth.order.detail.get.go new file mode 100644 index 00000000..0b951f77 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.order.detail.get.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthOrderDetailGetResponse struct { + OrderDetailGetResponse struct { + SepMarketFee int `json:"sep_market_fee"` + OrderPrice int `json:"Order_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + OrderName string `json:"Order_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + OrderQuantity int `json:"Order_quantity"` + OrderId int64 `json:"Order_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + OrderThumbnailUrl string `json:"Order_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + OrderCategoryName string `json:"Order_category_name"` + RequestId string `json:"request_id"` + OrderSign string `json:"Order_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_DetailGet_response"` +} + +type PddDdkOauthOrderDetailGetResult struct { + Result PddDdkOauthOrderDetailGetResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthOrderDetailGetResult(result PddDdkOauthOrderDetailGetResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthOrderDetailGetResult { + return &PddDdkOauthOrderDetailGetResult{Result: result, Body: body, Http: http, Err: err} +} + +// DetailGet 获取订单详情 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.order.detail.get +func (c *PddDdkOauthOrderApi) DetailGet(ctx context.Context, notMustParams ...Params) *PddDdkOauthOrderDetailGetResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.order.detail.get", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthOrderDetailGetResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthOrderDetailGetResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.pid.mediaid.bind.go b/service/pinduoduo/pdd.ddk.oauth.pid.mediaid.bind.go new file mode 100644 index 00000000..a6211ca9 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.pid.mediaid.bind.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthPidMediaIdBindResponse struct { + OrderMediaIdBindResponse struct { + SepMarketFee int `json:"sep_market_fee"` + PidPrice int `json:"Pid_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + PidName string `json:"Pid_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + PidQuantity int `json:"Pid_quantity"` + PidId int64 `json:"Pid_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + PidThumbnailUrl string `json:"Pid_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + PidCategoryName string `json:"Pid_category_name"` + RequestId string `json:"request_id"` + PidSign string `json:"Pid_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_MediaIdBind_response"` +} + +type PddDdkOauthPidMediaIdBindResult struct { + Result PddDdkOauthPidMediaIdBindResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthPidMediaIdBindResult(result PddDdkOauthPidMediaIdBindResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthPidMediaIdBindResult { + return &PddDdkOauthPidMediaIdBindResult{Result: result, Body: body, Http: http, Err: err} +} + +// MediaIdBind 批量绑定推广位的媒体id +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.pid.mediaid.bind +func (c *PddDdkOauthPidApi) MediaIdBind(ctx context.Context, notMustParams ...Params) *PddDdkOauthPidMediaIdBindResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.pid.mediaid.bind", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthPidMediaIdBindResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthPidMediaIdBindResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.resource.url.gen.go b/service/pinduoduo/pdd.ddk.oauth.resource.url.gen.go new file mode 100644 index 00000000..7b745c57 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.resource.url.gen.go @@ -0,0 +1,80 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthResourceUrlGenResponse struct { + OrderUrlGenResponse struct { + SepMarketFee int `json:"sep_market_fee"` + ResourcePrice int `json:"Resource_price"` + SepDuoId int `json:"sep_duo_id"` + Pid string `json:"pid"` + PromotionRate int `json:"promotion_rate"` + CpsSign string `json:"cps_sign"` + Type int `json:"type"` + SubsidyDuoAmountLevel int `json:"subsidy_duo_amount_level"` + OrderStatus int `json:"order_status"` + CatIds []int `json:"cat_ids"` + OrderCreateTime int64 `json:"order_create_time"` + IsDirect int `json:"is_direct"` + OrderGroupSuccessTime int `json:"order_group_success_time"` + MallId int `json:"mall_id"` + OrderAmount int64 `json:"order_amount"` + PriceCompareStatus int `json:"price_compare_status"` + MallName string `json:"mall_name"` + OrderModifyAt int `json:"order_modify_at"` + AuthDuoId int `json:"auth_duo_id"` + CpaNew int `json:"cpa_new"` + ResourceName string `json:"Resource_name"` + BatchNo string `json:"batch_no"` + RedPacketType int `json:"red_packet_type"` + UrlLastGenerateTime int `json:"url_last_generate_time"` + ResourceQuantity int `json:"Resource_quantity"` + ResourceId int64 `json:"Resource_id"` + SepParameters string `json:"sep_parameters"` + SepRate int `json:"sep_rate"` + SubsidyType int `json:"subsidy_type"` + ShareRate int `json:"share_rate"` + CustomParameters string `json:"custom_parameters"` + ResourceThumbnailUrl string `json:"Resource_thumbnail_url"` + PromotionAmount int64 `json:"promotion_amount"` + OrderPayTime int `json:"order_pay_time"` + GroupId int64 `json:"group_id"` + SepPid string `json:"sep_pid"` + ReturnStatus int `json:"return_status"` + OrderStatusDesc string `json:"order_status_desc"` + ShareAmount int `json:"share_amount"` + ResourceCategoryName string `json:"Resource_category_name"` + RequestId string `json:"request_id"` + ResourceSign string `json:"Resource_sign"` + OrderSn string `json:"order_sn"` + ZsDuoId int `json:"zs_duo_id"` + } `json:"order_UrlGen_response"` +} + +type PddDdkOauthResourceUrlGenResult struct { + Result PddDdkOauthResourceUrlGenResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthResourceUrlGenResult(result PddDdkOauthResourceUrlGenResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthResourceUrlGenResult { + return &PddDdkOauthResourceUrlGenResult{Result: result, Body: body, Http: http, Err: err} +} + +// UrlGen 拼多多主站频道推广接口 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.resource.url.gen +func (c *PddDdkOauthResourceApi) UrlGen(ctx context.Context, notMustParams ...Params) *PddDdkOauthResourceUrlGenResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.resource.url.gen", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthResourceUrlGenResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthResourceUrlGenResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.oauth.rp.prom.url.generate.go b/service/pinduoduo/pdd.ddk.oauth.rp.prom.url.generate.go new file mode 100644 index 00000000..ea71bf04 --- /dev/null +++ b/service/pinduoduo/pdd.ddk.oauth.rp.prom.url.generate.go @@ -0,0 +1,72 @@ +package pinduoduo + +import ( + "context" + "github.com/dtapps/go-library/utils/gojson" + "github.com/dtapps/go-library/utils/gorequest" +) + +type PddDdkOauthRpPromUrlGenerateResponse struct { + RpPromotionUrlGenerateResponse struct { + ResourceList []struct { + Desc string `json:"desc"` + Url string `json:"url"` + } `json:"resource_list"` + UrlList []struct { + MobileShortUrl string `json:"mobile_short_url"` + MobileUrl string `json:"mobile_url"` + MultiGroupMobileShortUrl string `json:"multi_group_mobile_short_url"` + MultiGroupMobileUrl string `json:"multi_group_mobile_url"` + MultiGroupShortUrl string `json:"multi_group_short_url"` + MultiGroupUrl string `json:"multi_group_url"` + QqAppInfo struct { + AppId string `json:"app_id"` + BannerUrl string `json:"banner_url"` + Desc string `json:"desc"` + PagePath string `json:"page_path"` + QqAppIconUrl string `json:"qq_app_icon_url"` + SourceDisplayName string `json:"source_display_name"` + Title string `json:"title"` + UserName string `json:"user_name"` + } `json:"qq_app_info"` + SchemaUrl string `json:"schema_url"` + ShortUrl string `json:"short_url"` + TzSchemaUrl string `json:"tz_schema_url"` + Url string `json:"url"` + WeAppInfo struct { + AppId string `json:"app_id"` + BannerUrl string `json:"banner_url"` + Desc string `json:"desc"` + PagePath string `json:"page_path"` + SourceDisplayName string `json:"source_display_name"` + Title string `json:"title"` + UserName string `json:"user_name"` + WeAppIconUrl string `json:"we_app_icon_url"` + } `json:"we_app_info"` + } `json:"url_list"` + } `json:"rp_promotion_url_generate_response"` +} + +type PddDdkOauthRpPromUrlGenerateResult struct { + Result PddDdkOauthRpPromUrlGenerateResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 +} + +func newPddDdkOauthRpPromUrlGenerateResult(result PddDdkOauthRpPromUrlGenerateResponse, body []byte, http gorequest.Response, err error) *PddDdkOauthRpPromUrlGenerateResult { + return &PddDdkOauthRpPromUrlGenerateResult{Result: result, Body: body, Http: http, Err: err} +} + +// PromUrlGenerate 生成营销工具推广链接 +// https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.oauth.rp.prom.url.generate +func (c *PddDdkOauthRpApi) PromUrlGenerate(ctx context.Context, notMustParams ...Params) *PddDdkOauthRpPromUrlGenerateResult { + // 参数 + params := NewParamsWithType("pdd.ddk.oauth.rp.prom.url.generate", notMustParams...) + // 请求 + request, err := c.client.request(ctx, params) + // 定义 + var response PddDdkOauthRpPromUrlGenerateResponse + err = gojson.Unmarshal(request.ResponseBody, &response) + return newPddDdkOauthRpPromUrlGenerateResult(response, request.ResponseBody, request, err) +} diff --git a/service/pinduoduo/pdd.ddk.order.detail.get.go b/service/pinduoduo/pdd.ddk.order.detail.get.go index c1d9314e..dd4ff0a1 100644 --- a/service/pinduoduo/pdd.ddk.order.detail.get.go +++ b/service/pinduoduo/pdd.ddk.order.detail.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -76,6 +76,6 @@ func (c *Client) OrderDetailGet(ctx context.Context, orderSn string) *OrderDetai request, err := c.request(ctx, params) // 定义 var response OrderDetailGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newOrderDetailGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.order.list.increment.get.go b/service/pinduoduo/pdd.ddk.order.list.increment.get.go index 1c7d5224..f8bc4d7b 100644 --- a/service/pinduoduo/pdd.ddk.order.list.increment.get.go +++ b/service/pinduoduo/pdd.ddk.order.list.increment.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -79,6 +79,6 @@ func (c *Client) OrderListIncrementGet(ctx context.Context, notMustParams ...Par request, err := c.request(ctx, params) // 定义 var response OrderListIncrementGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newOrderListIncrementGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.order.list.range.get.go b/service/pinduoduo/pdd.ddk.order.list.range.get.go index 0b6f1ec9..cb1076bb 100644 --- a/service/pinduoduo/pdd.ddk.order.list.range.get.go +++ b/service/pinduoduo/pdd.ddk.order.list.range.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -79,6 +79,6 @@ func (c *Client) OrderListRangeGet(ctx context.Context, notMustParams ...Params) request, err := c.request(ctx, params) // 定义 var response OrderListRangeGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newOrderListRangeGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.ddk.resource.url.gen.go b/service/pinduoduo/pdd.ddk.resource.url.gen.go index 149a29e7..2ed43207 100644 --- a/service/pinduoduo/pdd.ddk.resource.url.gen.go +++ b/service/pinduoduo/pdd.ddk.resource.url.gen.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -60,8 +60,8 @@ func (c *Client) ResourceUrlGen(ctx context.Context, notMustParams ...Params) *R request, err := c.request(ctx, params) // 定义 var response ResourceUrlGenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) var responseError ResourceUrlGenError - err = json.Unmarshal(request.ResponseBody, &responseError) + err = gojson.Unmarshal(request.ResponseBody, &responseError) return newResourceUrlGenResult(response, request.ResponseBody, request, err, responseError) } diff --git a/service/pinduoduo/pdd.ddk.rp.prom.url.generate.go b/service/pinduoduo/pdd.ddk.rp.prom.url.generate.go index 35a48a9f..8a8ebe6a 100644 --- a/service/pinduoduo/pdd.ddk.rp.prom.url.generate.go +++ b/service/pinduoduo/pdd.ddk.rp.prom.url.generate.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -75,8 +75,8 @@ func (c *Client) RpPromUrlGenerate(ctx context.Context, notMustParams ...Params) request, err := c.request(ctx, params) // 定义 var response RpPromUrlGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) var responseError RpPromUrlGenerateError - err = json.Unmarshal(request.ResponseBody, &responseError) + err = gojson.Unmarshal(request.ResponseBody, &responseError) return newRpPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError) } diff --git a/service/pinduoduo/pdd.ddk.top.goods.list.query.go b/service/pinduoduo/pdd.ddk.top.goods.list.query.go index ce13ec1b..2b69cfb2 100644 --- a/service/pinduoduo/pdd.ddk.top.goods.list.query.go +++ b/service/pinduoduo/pdd.ddk.top.goods.list.query.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -68,6 +68,6 @@ func (c *Client) TopGoodsListQuery(ctx context.Context, notMustParams ...Params) request, err := c.request(ctx, params) // 定义 var response TopGoodsListQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTopGoodsListQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.goods.cats.get.go b/service/pinduoduo/pdd.goods.cats.get.go index 140fd407..a71ed910 100644 --- a/service/pinduoduo/pdd.goods.cats.get.go +++ b/service/pinduoduo/pdd.goods.cats.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -39,6 +39,6 @@ func (c *Client) GoodsCatsGet(ctx context.Context, parentOptId int) *GoodsCatsGe request, err := c.request(ctx, params) // 定义 var response GoodsCatsGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsCatsGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pinduoduo/pdd.goods.opt.get.go b/service/pinduoduo/pdd.goods.opt.get.go index 95296217..57c1d870 100644 --- a/service/pinduoduo/pdd.goods.opt.get.go +++ b/service/pinduoduo/pdd.goods.opt.get.go @@ -2,7 +2,7 @@ package pinduoduo import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -39,6 +39,6 @@ func (c *Client) GoodsOptGet(ctx context.Context, parentOptId int) *GoodsOptGetR request, err := c.request(ctx, params) // 定义 var response GoodsOptGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGoodsOptGetResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/api.order.create-soon-order.go b/service/pintoto/api.order.create-soon-order.go index 25354d90..3038f63e 100644 --- a/service/pintoto/api.order.create-soon-order.go +++ b/service/pintoto/api.order.create-soon-order.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -46,15 +46,15 @@ func newApiOrderCreateSoonOrderResult(result ApiOrderCreateSoonOrderResponse, bo func (c *Client) ApiOrderCreateSoonOrder(ctx context.Context, param ApiOrderCreateSoonOrder) *ApiOrderCreateSoonOrderResult { // api params params := map[string]interface{}{} - b, _ := json.Marshal(¶m) + b, _ := gojson.Marshal(¶m) var m map[string]interface{} - _ = json.Unmarshal(b, &m) + _ = gojson.Unmarshal(b, &m) for k, v := range m { params[k] = v } request, err := c.request(ctx, apiUrl+"/api/order/create-soon-order", params) // 定义 var response ApiOrderCreateSoonOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderCreateSoonOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/api.order.create.go b/service/pintoto/api.order.create.go index 6c9bf370..51a48e3e 100644 --- a/service/pintoto/api.order.create.go +++ b/service/pintoto/api.order.create.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -31,6 +31,6 @@ func (c *Client) ApiOrderCreate(ctx context.Context, notMustParams ...gorequest. request, err := c.request(ctx, apiUrl+"/api/order/create", params) // 定义 var response ApiOrderCreateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderCreateResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/api.order.query.go b/service/pintoto/api.order.query.go index 5f33f4eb..cd31f28b 100644 --- a/service/pintoto/api.order.query.go +++ b/service/pintoto/api.order.query.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -55,6 +55,6 @@ func (c *Client) ApiOrderQuery(ctx context.Context, thirdOrderId string) *ApiOrd request, err := c.request(ctx, apiUrl+"/api/order/query", params) // 定义 var response ApiOrderQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiOrderQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/api.user.info.go b/service/pintoto/api.user.info.go index 7709f79a..61f9f802 100644 --- a/service/pintoto/api.user.info.go +++ b/service/pintoto/api.user.info.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) ApiUserInfo(ctx context.Context) *ApiUserInfoResult { request, err := c.request(ctx, apiUrl+"/api/user/info", map[string]interface{}{}) // 定义 var response ApiUserInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiUserInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_cinema_list.go b/service/pintoto/movie_info_get_cinema_list.go index f0e01890..c9b235b3 100644 --- a/service/pintoto/movie_info_get_cinema_list.go +++ b/service/pintoto/movie_info_get_cinema_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -48,6 +48,6 @@ func (c *Client) GetCinemaList(ctx context.Context, cityId int) *GetCinemaListRe request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-cinema-list", params) // 定义 var response GetCinemaListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCinemaListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_city_area.go b/service/pintoto/movie_info_get_city_area.go index 46b0a804..13aeb69a 100644 --- a/service/pintoto/movie_info_get_city_area.go +++ b/service/pintoto/movie_info_get_city_area.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -39,6 +39,6 @@ func (c *Client) GetCityArea(ctx context.Context, cityId int) *GetCityAreaResult // 请求 request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-city-area", params) var response GetCityAreaResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCityAreaResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_city_list.go b/service/pintoto/movie_info_get_city_list.go index b34c6ecf..4381641c 100644 --- a/service/pintoto/movie_info_get_city_list.go +++ b/service/pintoto/movie_info_get_city_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -37,6 +37,6 @@ func newGetCityListResult(result GetCityListResponse, body []byte, http goreques func (c *Client) GetCityList(ctx context.Context) *GetCityListResult { request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-city-list", map[string]interface{}{}) var response GetCityListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCityListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_hot_list.go b/service/pintoto/movie_info_get_hot_list.go index fa1932db..c0b3d78b 100644 --- a/service/pintoto/movie_info_get_hot_list.go +++ b/service/pintoto/movie_info_get_hot_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -53,6 +53,6 @@ func (c *Client) GetHotList(ctx context.Context, cityId int) *GetHotListResult { request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-hot-list", params) // 定义 var response GetHotListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetHotListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_schedule_list.go b/service/pintoto/movie_info_get_schedule_list.go index eef70c2a..f06ed761 100644 --- a/service/pintoto/movie_info_get_schedule_list.go +++ b/service/pintoto/movie_info_get_schedule_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -57,6 +57,6 @@ func (c *Client) GetScheduleList(ctx context.Context, cinemaId int) *GetSchedule request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-schedule-list", params) // 定义 var response GetScheduleListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetScheduleListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_sea.go b/service/pintoto/movie_info_get_sea.go index fb95d772..8d17a7c8 100644 --- a/service/pintoto/movie_info_get_sea.go +++ b/service/pintoto/movie_info_get_sea.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -54,6 +54,6 @@ func (c *Client) GetSeat(ctx context.Context, showId string) *GetSeatResult { request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-seat", params) // 定义 var response GetSeatResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetSeatResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_show_date.go b/service/pintoto/movie_info_get_show_date.go index aeaf85a7..b5ec9830 100644 --- a/service/pintoto/movie_info_get_show_date.go +++ b/service/pintoto/movie_info_get_show_date.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -38,6 +38,6 @@ func (c *Client) GetShowDate(ctx context.Context, cityId, filmId int) *GetShowDa request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-show-date", params) // 定义 var response GetShowDateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetShowDateResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_show_list.go b/service/pintoto/movie_info_get_show_list.go index 2df4081d..8c43cfc1 100644 --- a/service/pintoto/movie_info_get_show_list.go +++ b/service/pintoto/movie_info_get_show_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -52,15 +52,15 @@ func newGetShowListResult(result GetShowListResponse, body []byte, http goreques func (c *Client) GetShowList(ctx context.Context, param GetShowList) *GetShowListResult { // api params params := map[string]interface{}{} - b, _ := json.Marshal(¶m) + b, _ := gojson.Marshal(¶m) var m map[string]interface{} - _ = json.Unmarshal(b, &m) + _ = gojson.Unmarshal(b, &m) for k, v := range m { params[k] = v } request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-show-list", params) // 定义 var response GetShowListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetShowListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movie_info_get_soon_list.go b/service/pintoto/movie_info_get_soon_list.go index 75cc10fa..642b5b8a 100644 --- a/service/pintoto/movie_info_get_soon_list.go +++ b/service/pintoto/movie_info_get_soon_list.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -53,6 +53,6 @@ func (c *Client) GetSoonList(ctx context.Context, cityId int) *GetSoonListResult request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-soon-list", params) // 定义 var response GetSoonListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetSoonListResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/movieapi.movie-info.get-version.go b/service/pintoto/movieapi.movie-info.get-version.go index ef6c4101..b6d66060 100644 --- a/service/pintoto/movieapi.movie-info.get-version.go +++ b/service/pintoto/movieapi.movie-info.get-version.go @@ -2,7 +2,7 @@ package pintoto import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -29,6 +29,6 @@ func (c *Client) GetVersion(ctx context.Context) *GetVersionResult { request, err := c.request(ctx, apiUrl+"/movieapi/movie-info/get-version", map[string]interface{}{}) // 定义 var response GetVersionResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetVersionResult(response, request.ResponseBody, request, err) } diff --git a/service/pintoto/sign.go b/service/pintoto/sign.go index 52aed7e3..5cf7a685 100644 --- a/service/pintoto/sign.go +++ b/service/pintoto/sign.go @@ -2,8 +2,8 @@ package pintoto import ( "crypto/md5" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "net/url" "sort" "strconv" @@ -35,7 +35,7 @@ func (c *Client) getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/sendcloud/apiv2.userinfo.get.go b/service/sendcloud/apiv2.userinfo.get.go index d0f9e364..d4e5d996 100644 --- a/service/sendcloud/apiv2.userinfo.get.go +++ b/service/sendcloud/apiv2.userinfo.get.go @@ -1,7 +1,7 @@ package sendcloud import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -63,6 +63,6 @@ func (c *Client) ApiV2UserinfoGet() *ApiV2UserinfoGetResult { request, err := c.request(apiUrl+"/apiv2/userinfo/get", params, http.MethodGet) // 定义 var response ApiV2UserinfoGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newApiV2UserinfoGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/params.go b/service/taobao/params.go index 26445b11..f02e6d35 100644 --- a/service/taobao/params.go +++ b/service/taobao/params.go @@ -1,7 +1,7 @@ package taobao import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "net/url" "sort" "strconv" @@ -77,7 +77,7 @@ func getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/service/taobao/taobao.tbk.dg.newuser.order.get.go b/service/taobao/taobao.tbk.dg.newuser.order.get.go index 4e55f472..3c47aefc 100644 --- a/service/taobao/taobao.tbk.dg.newuser.order.get.go +++ b/service/taobao/taobao.tbk.dg.newuser.order.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) TbkDgNewuserOrderGet(ctx context.Context, notMustParams ...Para request, err := c.request(ctx, params) // 定义 var response TbkDgNewuserOrderGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkDgNewuserOrderGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/taobao.tbk.order.details.get.go b/service/taobao/taobao.tbk.order.details.get.go index 183a2e98..cef328f1 100644 --- a/service/taobao/taobao.tbk.order.details.get.go +++ b/service/taobao/taobao.tbk.order.details.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -90,6 +90,6 @@ func (c *Client) TbkOrderDetailsGet(ctx context.Context, notMustParams ...Params request, err := c.request(ctx, params) // 定义 var response TbkOrderDetailsGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkOrderDetailsGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.activity.info.get.go b/service/taobao/tbk.activity.info.get.go index 13373d57..f87ae267 100644 --- a/service/taobao/tbk.activity.info.get.go +++ b/service/taobao/tbk.activity.info.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -43,6 +43,6 @@ func (c *Client) TbkActivityInfoGet(ctx context.Context, notMustParams ...Params request, err := c.request(ctx, params) // 定义 var response TbkActivityInfoGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkActivityInfoGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.coupon.get.go b/service/taobao/tbk.coupon.get.go index 54cb2267..e21e89e0 100644 --- a/service/taobao/tbk.coupon.get.go +++ b/service/taobao/tbk.coupon.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -66,6 +66,6 @@ func (c *Client) TbkCouponGet(ctx context.Context, notMustParams ...Params) *Tbk request, err := c.request(ctx, params) // 定义 var response TbkCouponGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkCouponGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.dg.material.optional.go b/service/taobao/tbk.dg.material.optional.go index c0d32f38..593b70e1 100644 --- a/service/taobao/tbk.dg.material.optional.go +++ b/service/taobao/tbk.dg.material.optional.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -87,6 +87,6 @@ func (c *Client) TbkDgMaterialOptional(ctx context.Context, notMustParams ...Par request, err := c.request(ctx, params) // 定义 var response TbkDgMaterialOptionalResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkDgMaterialOptionalResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.dg.optimus.material.go b/service/taobao/tbk.dg.optimus.material.go index d0f7b3ad..e0201e05 100644 --- a/service/taobao/tbk.dg.optimus.material.go +++ b/service/taobao/tbk.dg.optimus.material.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -71,6 +71,6 @@ func (c *Client) TbkDgOptimusMaterial(ctx context.Context, notMustParams ...Para request, err := c.request(ctx, params) // 定义 var response TbkDgOptimusMaterialResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkDgOptimusMaterialResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.item.info.get.go b/service/taobao/tbk.item.info.get.go index b483e104..dc637dfe 100644 --- a/service/taobao/tbk.item.info.get.go +++ b/service/taobao/tbk.item.info.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -66,6 +66,6 @@ func (c *Client) TbkItemInfoGet(ctx context.Context, notMustParams ...Params) *T request, err := c.request(ctx, params) // 定义 var response TbkItemInfoGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkItemInfoGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.shop.get.go b/service/taobao/tbk.shop.get.go index 77d9edf9..605311bb 100644 --- a/service/taobao/tbk.shop.get.go +++ b/service/taobao/tbk.shop.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -43,6 +43,6 @@ func (c *Client) TbkShopGet(ctx context.Context, notMustParams ...Params) *TbkSh request, err := c.request(ctx, params) // 定义 var response TbkShopGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkShopGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.shop.recommend.get.go b/service/taobao/tbk.shop.recommend.get.go index 41a8128d..35370538 100644 --- a/service/taobao/tbk.shop.recommend.get.go +++ b/service/taobao/tbk.shop.recommend.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -41,6 +41,6 @@ func (c *Client) TbkShopRecommendGet(ctx context.Context, notMustParams ...Param request, err := c.request(ctx, params) // 定义 var response TbkShopRecommendGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkShopRecommendGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.spread.get.go b/service/taobao/tbk.spread.get.go index c0ecb0c2..a5d4b5ee 100644 --- a/service/taobao/tbk.spread.get.go +++ b/service/taobao/tbk.spread.get.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -39,6 +39,6 @@ func (c *Client) TbkSpreadGet(ctx context.Context, notMustParams ...Params) *Tbk request, err := c.request(ctx, params) // 定义 var response TbkSpreadGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkSpreadGetResult(response, request.ResponseBody, request, err) } diff --git a/service/taobao/tbk.tpwd.create.go b/service/taobao/tbk.tpwd.create.go index 318a7d05..2490d53e 100644 --- a/service/taobao/tbk.tpwd.create.go +++ b/service/taobao/tbk.tpwd.create.go @@ -2,7 +2,7 @@ package taobao import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) TbkTPwdCreate(ctx context.Context, notMustParams ...Params) *Tb request, err := c.request(ctx, params) // 定义 var response TbkTPwdCreateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTbkTPwdCreateResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/cgi-bin.getcallbackip.go b/service/wechatminiprogram/cgi-bin.getcallbackip.go index 4de119c2..1ad8bbe6 100644 --- a/service/wechatminiprogram/cgi-bin.getcallbackip.go +++ b/service/wechatminiprogram/cgi-bin.getcallbackip.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -31,6 +31,6 @@ func (c *Client) GetCallBackIp(ctx context.Context) *GetCallBackIpResult { request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/getcallbackip?access_token=%s", c.getAccessToken(ctx)), map[string]interface{}{}, http.MethodGet) // 定义 var response GetCallBackIpResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCallBackIpResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/cgi-bin.message.subscribe.send.go b/service/wechatminiprogram/cgi-bin.message.subscribe.send.go index a2fc008c..30e8a41d 100644 --- a/service/wechatminiprogram/cgi-bin.message.subscribe.send.go +++ b/service/wechatminiprogram/cgi-bin.message.subscribe.send.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -33,6 +33,6 @@ func (c *Client) SubscribeMessageSend(ctx context.Context, notMustParams ...gore request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/message/subscribe/send?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response SubscribeMessageSendResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newSubscribeMessageSendResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/cgi-bin.token.go b/service/wechatminiprogram/cgi-bin.token.go index cc535a8a..024e27b9 100644 --- a/service/wechatminiprogram/cgi-bin.token.go +++ b/service/wechatminiprogram/cgi-bin.token.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) CgiBinToken(ctx context.Context) *CgiBinTokenResult { request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", c.GetAppId(), c.GetAppSecret()), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/cgi-bin.wxaapp.createwxaqrcode.go b/service/wechatminiprogram/cgi-bin.wxaapp.createwxaqrcode.go index 6338e9fe..dea403ab 100644 --- a/service/wechatminiprogram/cgi-bin.wxaapp.createwxaqrcode.go +++ b/service/wechatminiprogram/cgi-bin.wxaapp.createwxaqrcode.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) CgiBinWxaAppCreateWxaQrCode(ctx context.Context, notMustParams request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/wxaapp/createwxaqrcode?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response CgiBinWxaAppCreateWxaQrCodeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinWxaAppCreateWxaQrCodeResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/sns.jscode2session.go b/service/wechatminiprogram/sns.jscode2session.go index ba8a4eaa..c403c7e4 100644 --- a/service/wechatminiprogram/sns.jscode2session.go +++ b/service/wechatminiprogram/sns.jscode2session.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) SnsJsCode2session(ctx context.Context, jsCode string) *SnsJsCod request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code", c.GetAppId(), c.GetAppSecret(), jsCode), map[string]interface{}{}, http.MethodGet) // 定义 var response SnsJsCode2sessionResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newSnsJsCode2sessionResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/user_info.go b/service/wechatminiprogram/user_info.go index 283ec18d..656f8484 100644 --- a/service/wechatminiprogram/user_info.go +++ b/service/wechatminiprogram/user_info.go @@ -5,8 +5,8 @@ import ( "crypto/aes" "crypto/cipher" "encoding/base64" - "encoding/json" "errors" + "github.com/dtapps/go-library/utils/gojson" "strings" ) @@ -65,7 +65,7 @@ func (c *Client) UserInfo(ctx context.Context, param UserInfo) *UserInfoResult { if err != nil { return newUserInfoResult(response, err) } - err = json.Unmarshal(cipherText, &response) + err = gojson.Unmarshal(cipherText, &response) if err != nil { return newUserInfoResult(response, err) } diff --git a/service/wechatminiprogram/user_phone.go b/service/wechatminiprogram/user_phone.go index 23f79d1e..10f82b53 100644 --- a/service/wechatminiprogram/user_phone.go +++ b/service/wechatminiprogram/user_phone.go @@ -5,8 +5,8 @@ import ( "crypto/aes" "crypto/cipher" "encoding/base64" - "encoding/json" "errors" + "github.com/dtapps/go-library/utils/gojson" ) type UserPhone struct { @@ -59,7 +59,7 @@ func (c *Client) UserPhone(ctx context.Context, param UserPhone) *UserPhoneResul if err != nil { return newUserPhoneResult(response, err) } - err = json.Unmarshal(cipherText, &response) + err = gojson.Unmarshal(cipherText, &response) if err != nil { return newUserPhoneResult(response, err) } diff --git a/service/wechatminiprogram/wxa.business.getliveinfo.go b/service/wechatminiprogram/wxa.business.getliveinfo.go index 152b1b27..6662cb29 100644 --- a/service/wechatminiprogram/wxa.business.getliveinfo.go +++ b/service/wechatminiprogram/wxa.business.getliveinfo.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -64,6 +64,6 @@ func (c *Client) BusinessGetLiveInfo(ctx context.Context, notMustParams ...goreq request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/business/getliveinfo?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response BusinessGetLiveInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newBusinessGetLiveInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.business.getuserphonenumber.go b/service/wechatminiprogram/wxa.business.getuserphonenumber.go index 31208949..36117e94 100644 --- a/service/wechatminiprogram/wxa.business.getuserphonenumber.go +++ b/service/wechatminiprogram/wxa.business.getuserphonenumber.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,6 +44,6 @@ func (c *Client) WxaBusinessGetUserPhoneNumber(ctx context.Context, code string) request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/business/getuserphonenumber?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaBusinessGetUserPhoneNumberResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaBusinessGetUserPhoneNumberResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.generate_urllink.go b/service/wechatminiprogram/wxa.generate_urllink.go index 4a41b4a3..0e762d89 100644 --- a/service/wechatminiprogram/wxa.generate_urllink.go +++ b/service/wechatminiprogram/wxa.generate_urllink.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) WxaGenerateUrlLink(ctx context.Context, notMustParams ...gorequ request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/generate_urllink?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaGenerateUrlLinkResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaGenerateUrlLinkResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.generatescheme.go b/service/wechatminiprogram/wxa.generatescheme.go index 3a602697..a1907fe7 100644 --- a/service/wechatminiprogram/wxa.generatescheme.go +++ b/service/wechatminiprogram/wxa.generatescheme.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) WxaGenerateScheme(ctx context.Context, notMustParams ...goreque request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/generatescheme?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaGenerateSchemeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaGenerateSchemeResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.getwxacode.go b/service/wechatminiprogram/wxa.getwxacode.go index 4fe62676..809bd164 100644 --- a/service/wechatminiprogram/wxa.getwxacode.go +++ b/service/wechatminiprogram/wxa.getwxacode.go @@ -3,9 +3,9 @@ package wechatminiprogram import ( "bytes" "context" - "encoding/json" "errors" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gostorage" "net/http" @@ -38,7 +38,7 @@ func (c *Client) WxaGetWxaCode(ctx context.Context, notMustParams ...gorequest.P request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/getwxacode?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaGetWxaCodeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaGetWxaCodeResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.getwxacodeunlimit.go b/service/wechatminiprogram/wxa.getwxacodeunlimit.go index 5246b57a..83a6c199 100644 --- a/service/wechatminiprogram/wxa.getwxacodeunlimit.go +++ b/service/wechatminiprogram/wxa.getwxacodeunlimit.go @@ -3,9 +3,9 @@ package wechatminiprogram import ( "bytes" "context" - "encoding/json" "errors" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gostorage" "net/http" @@ -38,7 +38,7 @@ func (c *Client) WxaGetWxaCodeUnLimit(ctx context.Context, notMustParams ...gore request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/getwxacodeunlimit?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaGetWxaCodeUnLimitResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaGetWxaCodeUnLimitResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.query_urllink.go b/service/wechatminiprogram/wxa.query_urllink.go index a014b081..1e85f572 100644 --- a/service/wechatminiprogram/wxa.query_urllink.go +++ b/service/wechatminiprogram/wxa.query_urllink.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -54,6 +54,6 @@ func (c *Client) WxaQueryUrlLink(ctx context.Context, urlLink string) *WxaQueryU request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/query_urllink?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaQueryUrlLinkResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaQueryUrlLinkResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxa.queryscheme.go b/service/wechatminiprogram/wxa.queryscheme.go index b31fe4b5..d048cf58 100644 --- a/service/wechatminiprogram/wxa.queryscheme.go +++ b/service/wechatminiprogram/wxa.queryscheme.go @@ -2,8 +2,8 @@ package wechatminiprogram import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,6 +45,6 @@ func (c *Client) WxaQueryScheme(ctx context.Context, notMustParams ...gorequest. request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/wxa/queryscheme?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response WxaQuerySchemeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaQuerySchemeResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatminiprogram/wxaapi.feedback.list.go b/service/wechatminiprogram/wxaapi.feedback.list.go index ba5b26d5..1e3e757a 100644 --- a/service/wechatminiprogram/wxaapi.feedback.list.go +++ b/service/wechatminiprogram/wxaapi.feedback.list.go @@ -2,7 +2,7 @@ package wechatminiprogram import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,6 +45,6 @@ func (c *Client) WxaApiFeedbackList(ctx context.Context, notMustParams ...gorequ request, err := c.request(ctx, apiUrl+"/wxaapi/feedback/list", params, http.MethodGet) // 定义 var response WxaApiFeedbackListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWxaApiFeedbackListResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/cgi-bin.ticket.getticket.go b/service/wechatoffice/cgi-bin.ticket.getticket.go index 5d844bb8..44cb1e8b 100644 --- a/service/wechatoffice/cgi-bin.ticket.getticket.go +++ b/service/wechatoffice/cgi-bin.ticket.getticket.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -33,6 +33,6 @@ func (c *Client) CgiBinTicketGetTicket(ctx context.Context, Type string) *CgiBin request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/ticket/getticket?access_token=%s&type=%s", c.getAccessToken(ctx), Type), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinTicketGetTicketResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinTicketGetTicketResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/cgi-bin.token.go b/service/wechatoffice/cgi-bin.token.go index dbc5b64c..77386942 100644 --- a/service/wechatoffice/cgi-bin.token.go +++ b/service/wechatoffice/cgi-bin.token.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) CgiBinToken(ctx context.Context) *CgiBinTokenResult { request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", c.GetAppId(), c.GetAppSecret()), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/cgi-bin.user.get.go b/service/wechatoffice/cgi-bin.user.get.go index 77ccf61f..f6f44d36 100644 --- a/service/wechatoffice/cgi-bin.user.get.go +++ b/service/wechatoffice/cgi-bin.user.get.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) CgiBinUserGet(ctx context.Context, nextOpenid string) *CgiBinUs request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/user/get?access_token=%s&next_openid=%s", c.getAccessToken(ctx), nextOpenid), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinUserGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinUserGetResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/cgi-bin.user.info.go b/service/wechatoffice/cgi-bin.user.info.go index 69555a8f..6ef6c65f 100644 --- a/service/wechatoffice/cgi-bin.user.info.go +++ b/service/wechatoffice/cgi-bin.user.info.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,6 +45,6 @@ func (c *Client) CgiBinUserInfo(ctx context.Context, openid string) *CgiBinUserI request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN", c.getAccessToken(ctx), openid), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinUserInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinUserInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/debug.cgi-bin.ticket.check.go b/service/wechatoffice/debug.cgi-bin.ticket.check.go index 5df3f9e1..40e1c343 100644 --- a/service/wechatoffice/debug.cgi-bin.ticket.check.go +++ b/service/wechatoffice/debug.cgi-bin.ticket.check.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -31,6 +31,6 @@ func (c *Client) DebugCgiBinTicketCheck(ctx context.Context) *DebugCgiBinTicketC request, err := c.request(ctx, fmt.Sprintf("https://mp.weixin.qq.com/debug/cgi-bin/ticket/check?ticket=%s", c.getJsapiTicket(ctx)), map[string]interface{}{}, http.MethodGet) // 定义 var response DebugCgiBinTicketCheckResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newDebugCgiBinTicketCheckResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/getcallbackip.go b/service/wechatoffice/getcallbackip.go index 25b00af1..5bd694ba 100644 --- a/service/wechatoffice/getcallbackip.go +++ b/service/wechatoffice/getcallbackip.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -31,6 +31,6 @@ func (c *Client) GetCallBackIp(ctx context.Context) *GetCallBackIpResult { request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/getcallbackip?access_token=%s", c.getAccessToken(ctx)), map[string]interface{}{}, http.MethodGet) // 定义 var response GetCallBackIpResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCallBackIpResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/message.template.send.go b/service/wechatoffice/message.template.send.go index 0c000c43..c0c4f7cb 100644 --- a/service/wechatoffice/message.template.send.go +++ b/service/wechatoffice/message.template.send.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) MessageTemplateSend(ctx context.Context, notMustParams ...goreq request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/message/template/send?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response MessageTemplateSendResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newMessageTemplateSendResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/sns.jscode2session.go b/service/wechatoffice/sns.jscode2session.go index b0afd6a9..b640ecdf 100644 --- a/service/wechatoffice/sns.jscode2session.go +++ b/service/wechatoffice/sns.jscode2session.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -32,6 +32,6 @@ func (c *Client) SnsJsCode2session(ctx context.Context, jsCode string) *SnsJsCod request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code", c.GetAppId(), c.GetAppSecret(), jsCode), map[string]interface{}{}, http.MethodGet) // 定义 var response SnsJsCode2sessionResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newSnsJsCode2sessionResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/sns.oauth2.access_token.go b/service/wechatoffice/sns.oauth2.access_token.go index 5882e863..9cebb06b 100644 --- a/service/wechatoffice/sns.oauth2.access_token.go +++ b/service/wechatoffice/sns.oauth2.access_token.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) SnsOauth2AccessToken(ctx context.Context, code string) *SnsOaut request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code", c.GetAppId(), c.GetAppSecret(), code), map[string]interface{}{}, http.MethodGet) // 定义 var response SnsOauth2AccessTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newSnsOauth2AccessTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatoffice/sns.userinfo.go b/service/wechatoffice/sns.userinfo.go index 67e7f90d..b89a5926 100644 --- a/service/wechatoffice/sns.userinfo.go +++ b/service/wechatoffice/sns.userinfo.go @@ -2,8 +2,8 @@ package wechatoffice import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -38,6 +38,6 @@ func (c *Client) SnsUserinfo(ctx context.Context, accessToken, openid string) *S request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN", accessToken, openid), map[string]interface{}{}, http.MethodGet) // 定义 var response SnsUserinfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newSnsUserinfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatopen/cgi-bin.account.getaccountbasicinfo.go b/service/wechatopen/cgi-bin.account.getaccountbasicinfo.go index 5ffe7935..dc8d12d8 100644 --- a/service/wechatopen/cgi-bin.account.getaccountbasicinfo.go +++ b/service/wechatopen/cgi-bin.account.getaccountbasicinfo.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -74,7 +74,7 @@ func (c *Client) CgiBinAccountGetAccountBasicInfo(ctx context.Context, notMustPa } // 定义 var response CgiBinAccountGetAccountBasicInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_authorizer_token.go b/service/wechatopen/cgi-bin.component.api_authorizer_token.go index 974d337d..9ac9edf5 100644 --- a/service/wechatopen/cgi-bin.component.api_authorizer_token.go +++ b/service/wechatopen/cgi-bin.component.api_authorizer_token.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,7 +50,7 @@ func (c *Client) CgiBinComponentApiAuthorizerToken(ctx context.Context, authoriz } // 定义 var response CgiBinComponentApiAuthorizerTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_component_token.go b/service/wechatopen/cgi-bin.component.api_component_token.go index 4c8f6bc4..532bfb26 100644 --- a/service/wechatopen/cgi-bin.component.api_component_token.go +++ b/service/wechatopen/cgi-bin.component.api_component_token.go @@ -2,7 +2,7 @@ package wechatopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -43,7 +43,7 @@ func (c *Client) CgiBinComponentApiComponentToken(ctx context.Context) (*CgiBinC } // 定义 var response CgiBinComponentApiComponentTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_create_preauthcode.go b/service/wechatopen/cgi-bin.component.api_create_preauthcode.go index 33d35bd7..653396f7 100644 --- a/service/wechatopen/cgi-bin.component.api_create_preauthcode.go +++ b/service/wechatopen/cgi-bin.component.api_create_preauthcode.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -43,7 +43,7 @@ func (c *Client) CgiBinComponentApiCreatePreAuthCoden(ctx context.Context) (*Cgi } // 定义 var response CgiBinComponentApiCreatePreAuthCodenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_get_authorizer_info.go b/service/wechatopen/cgi-bin.component.api_get_authorizer_info.go index b1b581c0..950964ef 100644 --- a/service/wechatopen/cgi-bin.component.api_get_authorizer_info.go +++ b/service/wechatopen/cgi-bin.component.api_get_authorizer_info.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -105,7 +105,7 @@ func (c *Client) CgiBinComponentApiGetAuthorizerInfo(ctx context.Context) (*CgiB } // 定义 var response CgiBinComponentApiGetAuthorizerInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_query_auth.go b/service/wechatopen/cgi-bin.component.api_query_auth.go index bbd0b7c1..f4f63b96 100644 --- a/service/wechatopen/cgi-bin.component.api_query_auth.go +++ b/service/wechatopen/cgi-bin.component.api_query_auth.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -57,7 +57,7 @@ func (c *Client) CgiBinComponentApiQueryAuth(ctx context.Context, authorizationC } // 定义 var response CgiBinComponentApiQueryAuthResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.api_start_push_ticket.go b/service/wechatopen/cgi-bin.component.api_start_push_ticket.go index 26e8d6b5..738cfcdd 100644 --- a/service/wechatopen/cgi-bin.component.api_start_push_ticket.go +++ b/service/wechatopen/cgi-bin.component.api_start_push_ticket.go @@ -2,7 +2,7 @@ package wechatopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) CgiBinComponentApiStartPushTicket(ctx context.Context) (*CgiBin } // 定义 var response CgiBinComponentApiStartPushTicketResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.fastregisterweapp.create.go b/service/wechatopen/cgi-bin.component.fastregisterweapp.create.go index a899bdee..41febc91 100644 --- a/service/wechatopen/cgi-bin.component.fastregisterweapp.create.go +++ b/service/wechatopen/cgi-bin.component.fastregisterweapp.create.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) CgiBinComponentFastRegisterWeAppCreate(ctx context.Context, not } // 定义 var response CgiBinComponentFastRegisterWeAppCreateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.fastregisterweapp.search.go b/service/wechatopen/cgi-bin.component.fastregisterweapp.search.go index a2cc06e7..c8853eea 100644 --- a/service/wechatopen/cgi-bin.component.fastregisterweapp.search.go +++ b/service/wechatopen/cgi-bin.component.fastregisterweapp.search.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) CgiBinComponentFastRegisterWeAppSearch(ctx context.Context, not } // 定义 var response CgiBinComponentFastRegisterWeAppSearchResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.getprivacysetting.go b/service/wechatopen/cgi-bin.component.getprivacysetting.go index 62f46f4c..22ce40b4 100644 --- a/service/wechatopen/cgi-bin.component.getprivacysetting.go +++ b/service/wechatopen/cgi-bin.component.getprivacysetting.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -78,7 +78,7 @@ func (c *Client) CgiBinComponentGetPrivacySetting(ctx context.Context, privacyVe } // 定义 var response CgiBinComponentGetPrivacySettingResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.component.setprivacysetting.go b/service/wechatopen/cgi-bin.component.setprivacysetting.go index bd15330b..0155d221 100644 --- a/service/wechatopen/cgi-bin.component.setprivacysetting.go +++ b/service/wechatopen/cgi-bin.component.setprivacysetting.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) CgiBinComponentSetPrivacySetting(ctx context.Context, notMustPa } // 定义 var response CgiBinComponentSetPrivacySettingResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.get_api_domain_ip.go b/service/wechatopen/cgi-bin.get_api_domain_ip.go index cd066a19..40897b88 100644 --- a/service/wechatopen/cgi-bin.get_api_domain_ip.go +++ b/service/wechatopen/cgi-bin.get_api_domain_ip.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,7 +34,7 @@ func (c *Client) CgiBinGetApiDomainIp(ctx context.Context, componentAccessToken } // 定义 var response GetCallBackIpResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.material.get_material.go b/service/wechatopen/cgi-bin.material.get_material.go index 5b54fef1..ea0c921a 100644 --- a/service/wechatopen/cgi-bin.material.get_material.go +++ b/service/wechatopen/cgi-bin.material.get_material.go @@ -3,9 +3,9 @@ package wechatopen import ( "bytes" "context" - "encoding/json" "errors" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gostorage" "net/http" @@ -49,7 +49,7 @@ func (c *Client) CgiBinMaterialGetMaterial(ctx context.Context, mediaId string, // 定义 var response CgiBinMaterialGetMaterialResponse // 判断内容是否为图片 - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { // 可能是图片 return newCgiBinMaterialGetMaterialResult(CgiBinMaterialGetMaterialResponse{}, request.ResponseBody, request), nil diff --git a/service/wechatopen/cgi-bin.open.sameentity.go b/service/wechatopen/cgi-bin.open.sameentity.go index 97ddbe19..57773ede 100644 --- a/service/wechatopen/cgi-bin.open.sameentity.go +++ b/service/wechatopen/cgi-bin.open.sameentity.go @@ -2,7 +2,7 @@ package wechatopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) CgiBinOpenSameEnTity(ctx context.Context, notMustParams ...gore } // 定义 var response CgiBinOpenSameEnTityResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.shorturl.go b/service/wechatopen/cgi-bin.shorturl.go index 479933ac..732a410b 100644 --- a/service/wechatopen/cgi-bin.shorturl.go +++ b/service/wechatopen/cgi-bin.shorturl.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) CgiBinShortUrl(ctx context.Context, longUrl string, notMustPara request, err := c.request(ctx, fmt.Sprintf(apiUrl+"/cgi-bin/shorturl?access_token=%s", c.GetAuthorizerAccessToken(ctx)), params, http.MethodPost) // 定义 var response CgiBinShortUrlResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.wxopen.qrcodejumpadd.go b/service/wechatopen/cgi-bin.wxopen.qrcodejumpadd.go index c021fd1c..8dfcb557 100644 --- a/service/wechatopen/cgi-bin.wxopen.qrcodejumpadd.go +++ b/service/wechatopen/cgi-bin.wxopen.qrcodejumpadd.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) CgiBinWxOpenQrCodeJumpAdd(ctx context.Context, notMustParams .. } // 定义 var response CgiBinWxOpenQrCodeJumpAddResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.wxopen.qrcodejumpdelete.go b/service/wechatopen/cgi-bin.wxopen.qrcodejumpdelete.go index 49f8ed76..a258dad1 100644 --- a/service/wechatopen/cgi-bin.wxopen.qrcodejumpdelete.go +++ b/service/wechatopen/cgi-bin.wxopen.qrcodejumpdelete.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,7 +45,7 @@ func (c *Client) CgiBinWxOpenQrCodeJumpDelete(ctx context.Context, prefix string } // 定义 var response CgiBinWxOpenQrCodeJumpDeleteResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.wxopen.qrcodejumpdownloa.go b/service/wechatopen/cgi-bin.wxopen.qrcodejumpdownloa.go index 650e27bd..22e4a2f7 100644 --- a/service/wechatopen/cgi-bin.wxopen.qrcodejumpdownloa.go +++ b/service/wechatopen/cgi-bin.wxopen.qrcodejumpdownloa.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -46,7 +46,7 @@ func (c *Client) CgiBinWxOpenQrCodeJumpDownload(ctx context.Context, notMustPara } // 定义 var response CgiBinWxOpenQrCodeJumpDownloadResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.wxopen.qrcodejumpget.go b/service/wechatopen/cgi-bin.wxopen.qrcodejumpget.go index 11084fa9..a8e5efb6 100644 --- a/service/wechatopen/cgi-bin.wxopen.qrcodejumpget.go +++ b/service/wechatopen/cgi-bin.wxopen.qrcodejumpget.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -55,7 +55,7 @@ func (c *Client) CgiBinWxOpenQrCodeJumpGet(ctx context.Context, notMustParams .. } // 定义 var response CgiBinWxOpenQrCodeJumpGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/cgi-bin.wxopen.qrcodejumppublish.go b/service/wechatopen/cgi-bin.wxopen.qrcodejumppublish.go index 9b15b1d6..ec2bc5fc 100644 --- a/service/wechatopen/cgi-bin.wxopen.qrcodejumppublish.go +++ b/service/wechatopen/cgi-bin.wxopen.qrcodejumppublish.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,7 +45,7 @@ func (c *Client) CgiBinWxOpenQrCodeJumpPublish(ctx context.Context, prefix strin } // 定义 var response CgiBinWxOpenQrCodeJumpPublishResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/sns.component.jscode2session.go b/service/wechatopen/sns.component.jscode2session.go index 3b5725ed..4a26aa93 100644 --- a/service/wechatopen/sns.component.jscode2session.go +++ b/service/wechatopen/sns.component.jscode2session.go @@ -5,8 +5,8 @@ import ( "crypto/aes" "crypto/cipher" "encoding/base64" - "encoding/json" "errors" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "strings" @@ -54,7 +54,7 @@ func (c *Client) SnsComponentJsCode2session(ctx context.Context, jsCode string, } // 定义 var response SnsComponentJsCode2sessionResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } @@ -115,7 +115,7 @@ func (r *SnsComponentJsCode2sessionResult) UserInfo(param UserInfo) *UserInfoRes if err != nil { return newUserInfoResult(response, err) } - err = json.Unmarshal(cipherText, &response) + err = gojson.Unmarshal(cipherText, &response) if err != nil { return newUserInfoResult(response, err) } diff --git a/service/wechatopen/tcb.wxpaylist.go b/service/wechatopen/tcb.wxpaylist.go index 84522722..52c0a502 100644 --- a/service/wechatopen/tcb.wxpaylist.go +++ b/service/wechatopen/tcb.wxpaylist.go @@ -2,7 +2,7 @@ package wechatopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -48,7 +48,7 @@ func (c *Client) TckWxPayList(ctx context.Context, notMustParams ...gorequest.Pa } // 定义 var response TckWxPayListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.addtotemplate.go b/service/wechatopen/wxa.addtotemplate.go index 65aa268d..3f02294f 100644 --- a/service/wechatopen/wxa.addtotemplate.go +++ b/service/wechatopen/wxa.addtotemplate.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -42,7 +42,7 @@ func (c *Client) WxaAddToTemplate(ctx context.Context, draftId string, templateT } // 定义 var response WxaAddToTemplateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.bind_tester.go b/service/wechatopen/wxa.bind_tester.go index fd9c9cb6..a17db9bf 100644 --- a/service/wechatopen/wxa.bind_tester.go +++ b/service/wechatopen/wxa.bind_tester.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -46,7 +46,7 @@ func (c *Client) WxaBindTester(ctx context.Context, wechatid string, notMustPara } // 定义 var response WxaBindTesterResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.business.getuserphonenumber.go b/service/wechatopen/wxa.business.getuserphonenumber.go index fa6e8a97..2eecb625 100644 --- a/service/wechatopen/wxa.business.getuserphonenumber.go +++ b/service/wechatopen/wxa.business.getuserphonenumber.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -54,7 +54,7 @@ func (c *Client) WxaBusinessGetUserPhoneNumber(ctx context.Context, code string, } // 定义 var response WxaBusinessGetUserPhoneNumberResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.commit.go b/service/wechatopen/wxa.commit.go index 6dcedd4d..642dfb62 100644 --- a/service/wechatopen/wxa.commit.go +++ b/service/wechatopen/wxa.commit.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) WxaCommit(ctx context.Context, notMustParams ...gorequest.Param } // 定义 var response WxaCommitResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.deletetemplate.go b/service/wechatopen/wxa.deletetemplate.go index 02b2a00d..b3c40cfc 100644 --- a/service/wechatopen/wxa.deletetemplate.go +++ b/service/wechatopen/wxa.deletetemplate.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,7 +41,7 @@ func (c *Client) WxaDeleteTemplate(ctx context.Context, templateId string, notMu } // 定义 var response WxaDeleteTemplateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_auditstatus.go b/service/wechatopen/wxa.get_auditstatus.go index 6c4c6c82..9faa0d56 100644 --- a/service/wechatopen/wxa.get_auditstatus.go +++ b/service/wechatopen/wxa.get_auditstatus.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -49,7 +49,7 @@ func (c *Client) WxaGetAuditStatus(ctx context.Context, auditid int64, notMustPa } // 定义 var response WxaGetAuditStatusResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_category.go b/service/wechatopen/wxa.get_category.go index 5765e720..3d7a3c69 100644 --- a/service/wechatopen/wxa.get_category.go +++ b/service/wechatopen/wxa.get_category.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -52,7 +52,7 @@ func (c *Client) WxaGetCategory(ctx context.Context, notMustParams ...gorequest. } // 定义 var response WxaGetCategoryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_effective_domain.go b/service/wechatopen/wxa.get_effective_domain.go index f061676f..0e4925e2 100644 --- a/service/wechatopen/wxa.get_effective_domain.go +++ b/service/wechatopen/wxa.get_effective_domain.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -68,7 +68,7 @@ func (c *Client) WxaGetEffectiveDomain(ctx context.Context, notMustParams ...gor } // 定义 var response WxaGetEffectiveDomainResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_latest_auditstatus.go b/service/wechatopen/wxa.get_latest_auditstatus.go index 706c261f..0f4a2f72 100644 --- a/service/wechatopen/wxa.get_latest_auditstatus.go +++ b/service/wechatopen/wxa.get_latest_auditstatus.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -48,7 +48,7 @@ func (c *Client) WxaGetLatestAuditStatus(ctx context.Context, notMustParams ...g } // 定义 var response WxaGetLatestAuditStatusResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_page.go b/service/wechatopen/wxa.get_page.go index ff591293..4fefd686 100644 --- a/service/wechatopen/wxa.get_page.go +++ b/service/wechatopen/wxa.get_page.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -45,7 +45,7 @@ func (c *Client) WxaGetPage(ctx context.Context, notMustParams ...gorequest.Para } // 定义 var response WxaGetPageResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.get_qrcode.go b/service/wechatopen/wxa.get_qrcode.go index 6f1ccd7c..9eb103f6 100644 --- a/service/wechatopen/wxa.get_qrcode.go +++ b/service/wechatopen/wxa.get_qrcode.go @@ -3,8 +3,8 @@ package wechatopen import ( "bytes" "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gostorage" "net/http" @@ -52,7 +52,7 @@ func (c *Client) WxaGetQrcode(ctx context.Context, path string, notMustParams .. // 判断内容是否为图片 if request.HeaderIsImg() { } else { - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.gettemplatedraftlist.go b/service/wechatopen/wxa.gettemplatedraftlist.go index 48019688..d7867701 100644 --- a/service/wechatopen/wxa.gettemplatedraftlist.go +++ b/service/wechatopen/wxa.gettemplatedraftlist.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,7 +50,7 @@ func (c *Client) WxaGetTemplateDraftList(ctx context.Context, notMustParams ...g } // 定义 var response WxaGetTemplateDraftListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.gettemplatelist.go b/service/wechatopen/wxa.gettemplatelist.go index 5c4751a1..b3581f9c 100644 --- a/service/wechatopen/wxa.gettemplatelist.go +++ b/service/wechatopen/wxa.gettemplatelist.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -51,7 +51,7 @@ func (c *Client) WxaGetTemplateList(ctx context.Context, notMustParams ...gorequ } // 定义 var response WxaGetTemplateListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.getversioninfo.go b/service/wechatopen/wxa.getversioninfo.go index 426b33df..45cee2b0 100644 --- a/service/wechatopen/wxa.getversioninfo.go +++ b/service/wechatopen/wxa.getversioninfo.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -54,7 +54,7 @@ func (c *Client) WxaGetVersionInfo(ctx context.Context, notMustParams ...goreque } // 定义 var response WxaGetVersionInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.getwxacodeunlimit.go b/service/wechatopen/wxa.getwxacodeunlimit.go index d6707d46..1fee7841 100644 --- a/service/wechatopen/wxa.getwxacodeunlimit.go +++ b/service/wechatopen/wxa.getwxacodeunlimit.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -49,7 +49,7 @@ func (c *Client) WxaGetWxaCodeUnLimit(ctx context.Context, notMustParams ...gore // 判断内容是否为图片 if request.HeaderIsImg() { } else { - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.memberauth.go b/service/wechatopen/wxa.memberauth.go index 99075f0c..6985d51c 100644 --- a/service/wechatopen/wxa.memberauth.go +++ b/service/wechatopen/wxa.memberauth.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -48,7 +48,7 @@ func (c *Client) WxaMemberAuth(ctx context.Context, notMustParams ...gorequest.P } // 定义 var response WxaMemberAuthResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.modify_domain.go b/service/wechatopen/wxa.modify_domain.go index f036cf78..8844eaa9 100644 --- a/service/wechatopen/wxa.modify_domain.go +++ b/service/wechatopen/wxa.modify_domain.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -53,7 +53,7 @@ func (c *Client) WxaModifyDomain(ctx context.Context, notMustParams ...gorequest } // 定义 var response WxaModifyDomainResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.modify_domain_directly.go b/service/wechatopen/wxa.modify_domain_directly.go index 6618f89e..df904b04 100644 --- a/service/wechatopen/wxa.modify_domain_directly.go +++ b/service/wechatopen/wxa.modify_domain_directly.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -53,7 +53,7 @@ func (c *Client) WxaModifyDomainDirectly(ctx context.Context, notMustParams ...g } // 定义 var response WxaModifyDomainDirectlyResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.release.go b/service/wechatopen/wxa.release.go index 8400e8c7..00c24ceb 100644 --- a/service/wechatopen/wxa.release.go +++ b/service/wechatopen/wxa.release.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) WxaRelease(ctx context.Context, notMustParams ...gorequest.Para } // 定义 var response WxaReleaseResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.revertcoderelease.go b/service/wechatopen/wxa.revertcoderelease.go index 5aa9b113..6b132116 100644 --- a/service/wechatopen/wxa.revertcoderelease.go +++ b/service/wechatopen/wxa.revertcoderelease.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,7 +50,7 @@ func (c *Client) WxaRevertCodeRelease(ctx context.Context, notMustParams ...gore } // 定义 var response WxaRevertCodeReleaseResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.security.apply_privacy_interface.go b/service/wechatopen/wxa.security.apply_privacy_interface.go index 17905f34..ec01be5b 100644 --- a/service/wechatopen/wxa.security.apply_privacy_interface.go +++ b/service/wechatopen/wxa.security.apply_privacy_interface.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,7 +41,7 @@ func (c *Client) WxaSecurityApplyPrivacyInterface(ctx context.Context, notMustPa } // 定义 var response WxaSecurityApplyPrivacyInterfaceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.security.applysetorderpathinfo.go b/service/wechatopen/wxa.security.applysetorderpathinfo.go index c7eafc01..a69b9735 100644 --- a/service/wechatopen/wxa.security.applysetorderpathinfo.go +++ b/service/wechatopen/wxa.security.applysetorderpathinfo.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaSecurityApplySetOrderPathInfo(ctx context.Context, notMustPa } // 定义 var response WxaSecurityApplySetOrderPathInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.security.get_privacy_interface.go b/service/wechatopen/wxa.security.get_privacy_interface.go index 4dd20a75..955a043f 100644 --- a/service/wechatopen/wxa.security.get_privacy_interface.go +++ b/service/wechatopen/wxa.security.get_privacy_interface.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -51,7 +51,7 @@ func (c *Client) WxaSecurityGetPrivacyInterface(ctx context.Context, notMustPara } // 定义 var response WxaSecurityGetPrivacyInterfaceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.security.getorderpathinfo.go b/service/wechatopen/wxa.security.getorderpathinfo.go index 59d55aff..ddb2723c 100644 --- a/service/wechatopen/wxa.security.getorderpathinfo.go +++ b/service/wechatopen/wxa.security.getorderpathinfo.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -51,7 +51,7 @@ func (c *Client) WxaSecurityGetOrderPathInfo(ctx context.Context, infoType int, } // 定义 var response WxaSecurityGetOrderPathInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.setwebviewdomain.go b/service/wechatopen/wxa.setwebviewdomain.go index 8ab72bb5..6be9babc 100644 --- a/service/wechatopen/wxa.setwebviewdomain.go +++ b/service/wechatopen/wxa.setwebviewdomain.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaSetWebViewDoMain(ctx context.Context, notMustParams ...goreq } // 定义 var response WxaSetWebViewDoMainResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.submit_audit.go b/service/wechatopen/wxa.submit_audit.go index 4037e18b..50271972 100644 --- a/service/wechatopen/wxa.submit_audit.go +++ b/service/wechatopen/wxa.submit_audit.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,7 +41,7 @@ func (c *Client) WxaSubmitAudit(ctx context.Context, notMustParams ...gorequest. } // 定义 var response WxaSubmitAuditResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxa.unbind_tester.go b/service/wechatopen/wxa.unbind_tester.go index f5f80896..1d2513bf 100644 --- a/service/wechatopen/wxa.unbind_tester.go +++ b/service/wechatopen/wxa.unbind_tester.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,7 +44,7 @@ func (c *Client) WxaUnbindTester(ctx context.Context, wechatid, userstr string, } // 定义 var response WxaUnbindTesterResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.add_embedded.go b/service/wechatopen/wxaapi.wxaembedded.add_embedded.go index 3b49fbc8..a926a767 100644 --- a/service/wechatopen/wxaapi.wxaembedded.add_embedded.go +++ b/service/wechatopen/wxaapi.wxaembedded.add_embedded.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaApiWxaembeddedAddEmbedded(ctx context.Context, notMustParams } // 定义 var response WxaApiWxaembeddedAddEmbeddedResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.del_authorize.go b/service/wechatopen/wxaapi.wxaembedded.del_authorize.go index 1e7b2593..78959f80 100644 --- a/service/wechatopen/wxaapi.wxaembedded.del_authorize.go +++ b/service/wechatopen/wxaapi.wxaembedded.del_authorize.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaApiWxaembeddedDelEmbedded(ctx context.Context, notMustParams } // 定义 var response WxaApiWxaembeddedDelEmbeddedResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.del_embedded.go b/service/wechatopen/wxaapi.wxaembedded.del_embedded.go index 267d9f35..e120e7ed 100644 --- a/service/wechatopen/wxaapi.wxaembedded.del_embedded.go +++ b/service/wechatopen/wxaapi.wxaembedded.del_embedded.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaApiWxaembeddedDelAuthorize(ctx context.Context, notMustParam } // 定义 var response WxaApiWxaembeddedDelAuthorizeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.get_list.go b/service/wechatopen/wxaapi.wxaembedded.get_list.go index a8ae2d4d..499348d1 100644 --- a/service/wechatopen/wxaapi.wxaembedded.get_list.go +++ b/service/wechatopen/wxaapi.wxaembedded.get_list.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -49,7 +49,7 @@ func (c *Client) WxaApiWxaembeddedGetList(ctx context.Context, notMustParams ... } // 定义 var response WxaApiWxaembeddedGetListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.get_own_list.go b/service/wechatopen/wxaapi.wxaembedded.get_own_list.go index 2f4edad1..26fb1c06 100644 --- a/service/wechatopen/wxaapi.wxaembedded.get_own_list.go +++ b/service/wechatopen/wxaapi.wxaembedded.get_own_list.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -49,7 +49,7 @@ func (c *Client) WxaApiWxAembeddedGetOwnList(ctx context.Context, notMustParams } // 定义 var response WxaApiWxAembeddedGetOwnListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatopen/wxaapi.wxaembedded.set_authorize.go b/service/wechatopen/wxaapi.wxaembedded.set_authorize.go index f5a93d0d..eae0d910 100644 --- a/service/wechatopen/wxaapi.wxaembedded.set_authorize.go +++ b/service/wechatopen/wxaapi.wxaembedded.set_authorize.go @@ -2,8 +2,8 @@ package wechatopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -40,7 +40,7 @@ func (c *Client) WxaApiWxAembeddedSetAuthorize(ctx context.Context, notMustParam } // 定义 var response WxaApiWxAembeddedSetAuthorizeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) if err != nil { return nil, err } diff --git a/service/wechatpayapiv3/merchant-service.complaints-v2.go b/service/wechatpayapiv3/merchant-service.complaints-v2.go index f49c145c..9bfe7a6e 100644 --- a/service/wechatpayapiv3/merchant-service.complaints-v2.go +++ b/service/wechatpayapiv3/merchant-service.complaints-v2.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -74,6 +74,6 @@ func (c *Client) MerchantServiceComplaintsV2(ctx context.Context, notMustParams } // 定义 var response MerchantServiceComplaintsV2Response - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newMerchantServiceComplaintsV2Result(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/pay.transactions.id.go b/service/wechatpayapiv3/pay.transactions.id.go index bd01ac96..7d902f5f 100644 --- a/service/wechatpayapiv3/pay.transactions.id.go +++ b/service/wechatpayapiv3/pay.transactions.id.go @@ -2,8 +2,8 @@ package wechatpayapiv3 import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -72,6 +72,6 @@ func (c *Client) PayTransactionsId(ctx context.Context, transactionId string) *P } // 定义 var response PayTransactionsIdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPayTransactionsIdResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/pay.transactions.jsapi.go b/service/wechatpayapiv3/pay.transactions.jsapi.go index eeeba452..b8d8051b 100644 --- a/service/wechatpayapiv3/pay.transactions.jsapi.go +++ b/service/wechatpayapiv3/pay.transactions.jsapi.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) PayTransactionsJsapi(ctx context.Context, notMustParams ...gore } // 定义 var response PayTransactionsJsapiResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPayTransactionsJsapiResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/pay.transactions.jsapi.notify.gin.go b/service/wechatpayapiv3/pay.transactions.jsapi.notify.gin.go index f651ba14..02cde3b7 100644 --- a/service/wechatpayapiv3/pay.transactions.jsapi.notify.gin.go +++ b/service/wechatpayapiv3/pay.transactions.jsapi.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" ) @@ -34,7 +34,7 @@ func (c *Client) PayTransactionsJsapiNotifyGin(ctx context.Context, ginCtx *gin. return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayapiv3/pay.transactions.out-trade-no.go b/service/wechatpayapiv3/pay.transactions.out-trade-no.go index a9208e8c..0af2c180 100644 --- a/service/wechatpayapiv3/pay.transactions.out-trade-no.go +++ b/service/wechatpayapiv3/pay.transactions.out-trade-no.go @@ -2,8 +2,8 @@ package wechatpayapiv3 import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -72,6 +72,6 @@ func (c *Client) PayTransactionsOutTradeNo(ctx context.Context, outTradeNo strin } // 定义 var response PayTransactionsOutTradeNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPayTransactionsOutTradeNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/refund.domestic.refunds.go b/service/wechatpayapiv3/refund.domestic.refunds.go index ffeaac3e..672c79e4 100644 --- a/service/wechatpayapiv3/refund.domestic.refunds.go +++ b/service/wechatpayapiv3/refund.domestic.refunds.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -72,6 +72,6 @@ func (c *Client) RefundDomesticRefunds(ctx context.Context, notMustParams ...gor } // 定义 var response RefundDomesticRefundsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRefundDomesticRefundsResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/refund.domestic.refunds.notify.gin.go b/service/wechatpayapiv3/refund.domestic.refunds.notify.gin.go index 7e3908c0..3dd376d8 100644 --- a/service/wechatpayapiv3/refund.domestic.refunds.notify.gin.go +++ b/service/wechatpayapiv3/refund.domestic.refunds.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" ) @@ -34,7 +34,7 @@ func (c *Client) RefundDomesticRefundsNotifyGin(ctx context.Context, ginCtx *gin return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayapiv3/refund.domestic.refunds.out_refund_no.go b/service/wechatpayapiv3/refund.domestic.refunds.out_refund_no.go index d8eb5c9d..8e923a82 100644 --- a/service/wechatpayapiv3/refund.domestic.refunds.out_refund_no.go +++ b/service/wechatpayapiv3/refund.domestic.refunds.out_refund_no.go @@ -2,8 +2,8 @@ package wechatpayapiv3 import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -71,6 +71,6 @@ func (c *Client) RefundDomesticRefundsOutRefundNo(ctx context.Context, outRefund } // 定义 var response RefundDomesticRefundsOutRefundNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRefundDomesticRefundsOutRefundNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/sign.go b/service/wechatpayapiv3/sign.go index d41e566a..fafebb28 100644 --- a/service/wechatpayapiv3/sign.go +++ b/service/wechatpayapiv3/sign.go @@ -9,10 +9,10 @@ import ( "crypto/sha256" "crypto/x509" "encoding/base64" - "encoding/json" "encoding/pem" "errors" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorandom" "net/url" "time" @@ -56,7 +56,7 @@ func (c *Client) haSha256(str string) []byte { func (c *Client) authorization(method string, paramMap map[string]interface{}, rawUrl string) (token string, err error) { var body string if len(paramMap) != 0 { - paramJsonBytes, err := json.Marshal(paramMap) + paramJsonBytes, err := gojson.Marshal(paramMap) if err != nil { return token, err } diff --git a/service/wechatpayapiv3/transfer-detail.electronic-receipts.get.go b/service/wechatpayapiv3/transfer-detail.electronic-receipts.get.go index 9cbdc437..df3834bc 100644 --- a/service/wechatpayapiv3/transfer-detail.electronic-receipts.get.go +++ b/service/wechatpayapiv3/transfer-detail.electronic-receipts.get.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,6 +41,6 @@ func (c *Client) TransferDetailElectronicReceiptsGet(ctx context.Context, notMus } // 定义 var response TransferDetailElectronicReceiptsGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferDetailElectronicReceiptsGetResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer-detail.electronic-receipts.post.go b/service/wechatpayapiv3/transfer-detail.electronic-receipts.post.go index 14136746..7f1598ea 100644 --- a/service/wechatpayapiv3/transfer-detail.electronic-receipts.post.go +++ b/service/wechatpayapiv3/transfer-detail.electronic-receipts.post.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -41,6 +41,6 @@ func (c *Client) TransferDetailElectronicReceiptsPost(ctx context.Context, notMu } // 定义 var response TransferDetailElectronicReceiptsPostResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferDetailElectronicReceiptsPostResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.details.detail-id.detail_id.go b/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.details.detail-id.detail_id.go index 85425d4c..ade33936 100644 --- a/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.details.detail-id.detail_id.go +++ b/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.details.detail-id.detail_id.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -48,6 +48,6 @@ func (c *Client) TransferBatchesBatchIdBatchIdDetailsDetailIdDetailId(ctx contex } // 定义 var response TransferBatchesBatchIdBatchIdDetailsDetailIdDetailIdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesBatchIdBatchIdDetailsDetailIdDetailIdResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.go b/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.go index 85199b19..24455724 100644 --- a/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.go +++ b/service/wechatpayapiv3/transfer.batches.batch-id.batch_id.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -58,6 +58,6 @@ func (c *Client) TransferBatchesBatchIdBatchId(ctx context.Context, batchId stri } // 定义 var response TransferBatchesBatchIdBatchIdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesBatchIdBatchIdResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.go b/service/wechatpayapiv3/transfer.batches.go index 3eed318d..a0433adc 100644 --- a/service/wechatpayapiv3/transfer.batches.go +++ b/service/wechatpayapiv3/transfer.batches.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -37,6 +37,6 @@ func (c *Client) TransferBatches(ctx context.Context, notMustParams ...gorequest } // 定义 var response TransferBatchesResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.out-batch-no.go b/service/wechatpayapiv3/transfer.batches.out-batch-no.go index 87a98872..7645932e 100644 --- a/service/wechatpayapiv3/transfer.batches.out-batch-no.go +++ b/service/wechatpayapiv3/transfer.batches.out-batch-no.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -58,6 +58,6 @@ func (c *Client) TransferBatchesOutBatchNo(ctx context.Context, notMustParams .. } // 定义 var response TransferBatchesOutBatchNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesOutBatchNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.details.out-detail-no.out_detail_no.go b/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.details.out-detail-no.out_detail_no.go index 27d16ecc..bb3de877 100644 --- a/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.details.out-detail-no.out_detail_no.go +++ b/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.details.out-detail-no.out_detail_no.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -48,6 +48,6 @@ func (c *Client) TransferBatchesOutBatchNoOutBatchNoDetailsOutDetailNoOutDetailN } // 定义 var response TransferBatchesOutBatchNoOutBatchNoDetailsOutDetailNoOutDetailNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesOutBatchNoOutBatchNoDetailsOutDetailNoOutDetailNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.go b/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.go index 6e5cf932..73d80d97 100644 --- a/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.go +++ b/service/wechatpayapiv3/transfer.batches.out-batch-no.out_batch_no.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -58,6 +58,6 @@ func (c *Client) TransferBatchesOutBatchNoOutBatchNo(ctx context.Context, outBat } // 定义 var response TransferBatchesOutBatchNoOutBatchNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBatchesOutBatchNoOutBatchNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.bill-receipt.go b/service/wechatpayapiv3/transfer.bill-receipt.go index 69c7a0ea..5186f87f 100644 --- a/service/wechatpayapiv3/transfer.bill-receipt.go +++ b/service/wechatpayapiv3/transfer.bill-receipt.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -42,6 +42,6 @@ func (c *Client) TransferBillReceipt(ctx context.Context, notMustParams ...goreq } // 定义 var response TransferBillReceiptResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBillReceiptResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayapiv3/transfer.bill-receipt.out_batch_no.go b/service/wechatpayapiv3/transfer.bill-receipt.out_batch_no.go index 1bf045ac..0c13e1d6 100644 --- a/service/wechatpayapiv3/transfer.bill-receipt.out_batch_no.go +++ b/service/wechatpayapiv3/transfer.bill-receipt.out_batch_no.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -42,6 +42,6 @@ func (c *Client) TransferBillReceiptOutBatchNo(ctx context.Context, outBatchNo s } // 定义 var response TransferBillReceiptOutBatchNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newTransferBillReceiptOutBatchNoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayopen/bill.fundflowbill.get.go b/service/wechatpayopen/bill.fundflowbill.get.go index e060c238..5a660fac 100644 --- a/service/wechatpayopen/bill.fundflowbill.get.go +++ b/service/wechatpayopen/bill.fundflowbill.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -37,9 +37,9 @@ func (c *Client) BillFundFlowBillGet(ctx context.Context, notMustParams ...goreq } // 定义 var response BillFundFlowBillGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newBillFundFlowBillGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/bill.sub-merchant-fundflowbill.get.go b/service/wechatpayopen/bill.sub-merchant-fundflowbill.get.go index f691b207..7e639bd4 100644 --- a/service/wechatpayopen/bill.sub-merchant-fundflowbill.get.go +++ b/service/wechatpayopen/bill.sub-merchant-fundflowbill.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -44,9 +44,9 @@ func (c *Client) billSubMerchantFundFlowBillGet(ctx context.Context, notMustPara } // 定义 var response billSubMerchantFundFlowBillGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newbillSubMerchantFundFlowBillGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/bill.tradebill.get.go b/service/wechatpayopen/bill.tradebill.get.go index 3d253de1..73251de0 100644 --- a/service/wechatpayopen/bill.tradebill.get.go +++ b/service/wechatpayopen/bill.tradebill.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -38,9 +38,9 @@ func (c *Client) BillTradeBillGet(ctx context.Context, notMustParams ...goreques } // 定义 var response BillTradeBillGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newBillTradeBillGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/certificates.go b/service/wechatpayopen/certificates.go index 302016bf..6ceaefb6 100644 --- a/service/wechatpayopen/certificates.go +++ b/service/wechatpayopen/certificates.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -43,6 +43,6 @@ func (c *Client) Certificates(ctx context.Context) *CertificatesResult { } // 定义 var response CertificatesResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCertificatesResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayopen/ecommerce.fund.balance.go b/service/wechatpayopen/ecommerce.fund.balance.go index 4e0a40f2..96e7d963 100644 --- a/service/wechatpayopen/ecommerce.fund.balance.go +++ b/service/wechatpayopen/ecommerce.fund.balance.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -39,6 +39,6 @@ func (c *Client) EcommerceFundBalance(ctx context.Context, accountType string) * } // 定义 var response EcommerceFundBalanceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newEcommerceFundBalanceResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayopen/ecommerce.fund.enddaybalance.go b/service/wechatpayopen/ecommerce.fund.enddaybalance.go index d292e88a..81281f89 100644 --- a/service/wechatpayopen/ecommerce.fund.enddaybalance.go +++ b/service/wechatpayopen/ecommerce.fund.enddaybalance.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -38,6 +38,6 @@ func (c *Client) EcommerceFundEndDayBalance(ctx context.Context, date string) *E } // 定义 var response EcommerceFundEndDayBalanceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newEcommerceFundEndDayBalanceResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatpayopen/merchant.fund.balance.go b/service/wechatpayopen/merchant.fund.balance.go index a5d2a666..99185d73 100644 --- a/service/wechatpayopen/merchant.fund.balance.go +++ b/service/wechatpayopen/merchant.fund.balance.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -38,9 +38,9 @@ func (c *Client) MerchantFundBalance(ctx context.Context, accountType string) *M } // 定义 var response MerchantFundBalanceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newMerchantFundBalanceResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/merchant.fund.dayendbalance.go b/service/wechatpayopen/merchant.fund.dayendbalance.go index 873b3808..7d614a98 100644 --- a/service/wechatpayopen/merchant.fund.dayendbalance.go +++ b/service/wechatpayopen/merchant.fund.dayendbalance.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -39,9 +39,9 @@ func (c *Client) MerchantFundDayEndBalance(ctx context.Context, accountType, dat } // 定义 var response MerchantFundDayEndBalanceResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newMerchantFundDayEndBalanceResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.h5.go b/service/wechatpayopen/pay.partner.transactions.h5.go index 42d86cf1..25e217b6 100644 --- a/service/wechatpayopen/pay.partner.transactions.h5.go +++ b/service/wechatpayopen/pay.partner.transactions.h5.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -39,9 +39,9 @@ func (c *Client) PayPartnerTransactionsH5(ctx context.Context, notMustParams ... } // 结果 var response PayPartnerTransactionsH5Response - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsH5Result(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.id.go b/service/wechatpayopen/pay.partner.transactions.id.go index 67915e7c..9a7f8424 100644 --- a/service/wechatpayopen/pay.partner.transactions.id.go +++ b/service/wechatpayopen/pay.partner.transactions.id.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -76,9 +76,9 @@ func (c *Client) PayPartnerTransactionsId(ctx context.Context, transactionId str } // 定义 var response PayPartnerTransactionsIdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsIdResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go b/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go index 3d1d6973..fd9aaac3 100644 --- a/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go +++ b/service/wechatpayopen/pay.partner.transactions.id.transaction_id.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -63,9 +63,9 @@ func (c *Client) PayPartnerTransactionsIdTransactionIdGet(ctx context.Context, t } // 定义 var response PayPartnerTransactionsIdTransactionIdGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsIdTransactionIdGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.jsapi.go b/service/wechatpayopen/pay.partner.transactions.jsapi.go index 3176eb93..3b7a2d2c 100644 --- a/service/wechatpayopen/pay.partner.transactions.jsapi.go +++ b/service/wechatpayopen/pay.partner.transactions.jsapi.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -39,9 +39,9 @@ func (c *Client) PayPartnerTransactionsJsapi(ctx context.Context, notMustParams } // 结果 var response PayPartnerTransactionsJsapiResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsJsapiResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.jsapi.notify.gin.go b/service/wechatpayopen/pay.partner.transactions.jsapi.notify.gin.go index 4a68fffe..b041fe80 100644 --- a/service/wechatpayopen/pay.partner.transactions.jsapi.notify.gin.go +++ b/service/wechatpayopen/pay.partner.transactions.jsapi.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" ) @@ -34,7 +34,7 @@ func (c *Client) PayPartnerTransactionsJsapiNotifyGin(ctx context.Context, ginCt return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayopen/pay.partner.transactions.native.post.go b/service/wechatpayopen/pay.partner.transactions.native.post.go index d1bb01b5..d190db6a 100644 --- a/service/wechatpayopen/pay.partner.transactions.native.post.go +++ b/service/wechatpayopen/pay.partner.transactions.native.post.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -38,9 +38,9 @@ func (c *Client) PayPartnerTransactionsNativePost(ctx context.Context, notMustPa } // 定义 var response PayPartnerTransactionsNativePostResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsNativePostResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.native.post.notify.gin.go b/service/wechatpayopen/pay.partner.transactions.native.post.notify.gin.go index dbd69332..f180d988 100644 --- a/service/wechatpayopen/pay.partner.transactions.native.post.notify.gin.go +++ b/service/wechatpayopen/pay.partner.transactions.native.post.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" "time" ) @@ -35,7 +35,7 @@ func (c *Client) PayPartnerTransactionsNativePostNotifyGin(ctx context.Context, return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.go index 8dd8a3eb..d1a68f8c 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.go @@ -2,8 +2,8 @@ package wechatpayopen import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -79,9 +79,9 @@ func (c *Client) PayPartnerTransactionsOutTradeNo(ctx context.Context, outTradeN } // 定义 var response PayPartnerTransactionsOutTradeNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsOutTradeNoResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go index 6a5b6c1c..fde07f2f 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.close.post.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -32,6 +32,6 @@ func (c *Client) PayPartnerTransactionsOutTradeNoOutTradeNoClosePost(ctx context } // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsOutTradeNoOutTradeNoClosePostResult(request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go index 07839fdf..c44093d2 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.out_trade_no.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -60,9 +60,9 @@ func (c *Client) PayPartnerTransactionsOutTradeNoOutTradeNoGet(ctx context.Conte } // 定义 var response PayPartnerTransactionsOutTradeNoOutTradeNoGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newPayPartnerTransactionsOutTradeNoOutTradeNoGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.merchant-configs.go b/service/wechatpayopen/profitsharing.merchant-configs.go index ed140450..8b89fa61 100644 --- a/service/wechatpayopen/profitsharing.merchant-configs.go +++ b/service/wechatpayopen/profitsharing.merchant-configs.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -36,9 +36,9 @@ func (c *Client) ProfitSharingMerchantConfigs(ctx context.Context) *ProfitSharin } // 定义 var response ProfitSharingMerchantConfigsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingMerchantConfigsResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.orders.go b/service/wechatpayopen/profitsharing.orders.go index 3c469d65..3cf3e51e 100644 --- a/service/wechatpayopen/profitsharing.orders.go +++ b/service/wechatpayopen/profitsharing.orders.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -53,9 +53,9 @@ func (c *Client) ProfitSharingOrders(ctx context.Context, notMustParams ...goreq } // 定义 var response ProfitSharingOrdersResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingOrdersResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.orders.out_order_no.go b/service/wechatpayopen/profitsharing.orders.out_order_no.go index 5267f5b1..569304e7 100644 --- a/service/wechatpayopen/profitsharing.orders.out_order_no.go +++ b/service/wechatpayopen/profitsharing.orders.out_order_no.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -53,9 +53,9 @@ func (c *Client) ProfitSharingOrdersOutOrderNo(ctx context.Context, transactionI } // 定义 var response ProfitSharingOrdersOutOrderNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingOrdersOutOrderNoResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.orders.unfreeze.go b/service/wechatpayopen/profitsharing.orders.unfreeze.go index 721bbd00..4c4a9cd0 100644 --- a/service/wechatpayopen/profitsharing.orders.unfreeze.go +++ b/service/wechatpayopen/profitsharing.orders.unfreeze.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -54,9 +54,9 @@ func (c *Client) ProfitSharingOrdersUnfreeze(ctx context.Context, transactionId, } // 定义 var response ProfitSharingOrdersUnfreezeResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingOrdersUnfreezeResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.receivers.add.go b/service/wechatpayopen/profitsharing.receivers.add.go index ff8b3424..5aaa2cf1 100644 --- a/service/wechatpayopen/profitsharing.receivers.add.go +++ b/service/wechatpayopen/profitsharing.receivers.add.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -60,9 +60,9 @@ func (c *Client) ProfitSharingReceiversAdd(ctx context.Context, Type, account, n } // 定义 var response ProfitSharingReceiversAddResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingReceiversAddResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.receivers.delete.go b/service/wechatpayopen/profitsharing.receivers.delete.go index a9e0cce2..4a97d10f 100644 --- a/service/wechatpayopen/profitsharing.receivers.delete.go +++ b/service/wechatpayopen/profitsharing.receivers.delete.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -50,9 +50,9 @@ func (c *Client) ProfitSharingReceiversDelete(ctx context.Context, Type, account } // 定义 var response ProfitSharingReceiversDeleteResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingReceiversDeleteResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.receivers.notify.gin.go b/service/wechatpayopen/profitsharing.receivers.notify.gin.go index 70339163..069e0a4c 100644 --- a/service/wechatpayopen/profitsharing.receivers.notify.gin.go +++ b/service/wechatpayopen/profitsharing.receivers.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" ) @@ -34,7 +34,7 @@ func (c *Client) ProfitSharingReceiversNotifyGin(ctx context.Context, ginCtx *gi return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayopen/profitsharing.return-orders.go b/service/wechatpayopen/profitsharing.return-orders.go index 3163a47d..dd3631ea 100644 --- a/service/wechatpayopen/profitsharing.return-orders.go +++ b/service/wechatpayopen/profitsharing.return-orders.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -47,9 +47,9 @@ func (c *Client) ProfitSharingReturnOrders(ctx context.Context, notMustParams .. } // 定义 var response ProfitSharingReturnOrdersResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingReturnOrdersResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.return-orders.out_return_no.go b/service/wechatpayopen/profitsharing.return-orders.out_return_no.go index dce69abb..a9223878 100644 --- a/service/wechatpayopen/profitsharing.return-orders.out_return_no.go +++ b/service/wechatpayopen/profitsharing.return-orders.out_return_no.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -49,9 +49,9 @@ func (c *Client) ProfitSharingReturnOrdersOutReturnNo(ctx context.Context, outRe } // 定义 var response ProfitSharingReturnOrdersOutReturnNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingReturnOrdersOutReturnNoResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/profitsharing.transactions.amounts.go b/service/wechatpayopen/profitsharing.transactions.amounts.go index ef4dad4e..2b2163ae 100644 --- a/service/wechatpayopen/profitsharing.transactions.amounts.go +++ b/service/wechatpayopen/profitsharing.transactions.amounts.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -36,9 +36,9 @@ func (c *Client) ProfitSharingTransactionsAmounts(ctx context.Context, transacti } // 定义 var response ProfitSharingTransactionsAmountsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newProfitSharingTransactionsAmountsResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/refund.domestic.refunds.go b/service/wechatpayopen/refund.domestic.refunds.go index fedc646d..cee0e0c5 100644 --- a/service/wechatpayopen/refund.domestic.refunds.go +++ b/service/wechatpayopen/refund.domestic.refunds.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -75,9 +75,9 @@ func (c *Client) RefundDomesticRefunds(ctx context.Context, notMustParams ...gor } // 定义 var response RefundDomesticRefundsResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newRefundDomesticRefundsResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/refund.domestic.refunds.notify.gin.go b/service/wechatpayopen/refund.domestic.refunds.notify.gin.go index 25138728..51575687 100644 --- a/service/wechatpayopen/refund.domestic.refunds.notify.gin.go +++ b/service/wechatpayopen/refund.domestic.refunds.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" ) @@ -34,7 +34,7 @@ func (c *Client) RefundDomesticRefundsNoNotifyGin(ctx context.Context, ginCtx *g return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.get.go b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.get.go index 0c3f0fb1..b379987b 100644 --- a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.get.go +++ b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.get.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -75,9 +75,9 @@ func (c *Client) RefundDomesticRefundsOutRefundNoGet(ctx context.Context, outRef } // 定义 var response RefundDomesticRefundsOutRefundNoGetResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newRefundDomesticRefundsOutRefundNoGetResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go index dbf166ee..ff41c6ad 100644 --- a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go +++ b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -74,9 +74,9 @@ func (c *Client) RefundDomesticRefundsOutRefundNo(ctx context.Context, outRefund } // 定义 var response RefundDomesticRefundsOutRefundNoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newRefundDomesticRefundsOutRefundNoResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/refund.domestic.refunds.post.go b/service/wechatpayopen/refund.domestic.refunds.post.go index 1561e22d..41c39efc 100644 --- a/service/wechatpayopen/refund.domestic.refunds.post.go +++ b/service/wechatpayopen/refund.domestic.refunds.post.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" "time" @@ -76,9 +76,9 @@ func (c *Client) RefundDomesticRefundsPost(ctx context.Context, outRefundNo stri } // 定义 var response RefundDomesticRefundsPostResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) // 错误 var apiError ApiError - err = json.Unmarshal(request.ResponseBody, &apiError) + err = gojson.Unmarshal(request.ResponseBody, &apiError) return newRefundDomesticRefundsPostResult(response, request.ResponseBody, request, err, apiError) } diff --git a/service/wechatpayopen/refund.domestic.refunds.post.notify.gin.go b/service/wechatpayopen/refund.domestic.refunds.post.notify.gin.go index 00f51f32..a99c0c7b 100644 --- a/service/wechatpayopen/refund.domestic.refunds.post.notify.gin.go +++ b/service/wechatpayopen/refund.domestic.refunds.post.notify.gin.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/gin-gonic/gin" "time" ) @@ -35,7 +35,7 @@ func (c *Client) RefundDomesticRefundsPostNotifyGin(ctx context.Context, ginCtx return validateJson, response, gcm, err } - err = json.Unmarshal(gcm, &response) + err = gojson.Unmarshal(gcm, &response) return validateJson, response, gcm, err } diff --git a/service/wechatqy/cgi-bin.gettoken.go b/service/wechatqy/cgi-bin.gettoken.go index 49f3098b..8b6742d8 100644 --- a/service/wechatqy/cgi-bin.gettoken.go +++ b/service/wechatqy/cgi-bin.gettoken.go @@ -2,8 +2,8 @@ package wechatqy import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) CgiBinGetToken(ctx context.Context, notMustParams ...gorequest. request, err := c.request(ctx, apiUrl+fmt.Sprintf("/cgi-bin/gettoken?corpid=%s&corpsecret=%s", c.GetAppId(), c.GetSecret()), params, http.MethodGet) // 定义 var response CgiBinGetTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinGetTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatqy/cgi-bin.user.getuserinfo.go b/service/wechatqy/cgi-bin.user.getuserinfo.go index 473f3ade..24242a77 100644 --- a/service/wechatqy/cgi-bin.user.getuserinfo.go +++ b/service/wechatqy/cgi-bin.user.getuserinfo.go @@ -2,8 +2,8 @@ package wechatqy import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -37,6 +37,6 @@ func (c *Client) CgiBinUserGetUserInfo(ctx context.Context, code, accessToken st request, err := c.request(ctx, apiUrl+fmt.Sprintf("/cgi-bin/user/getuserinfo?access_token=%s&code=%s", accessToken, code), params, http.MethodGet) // 定义 var response CgiBinUserGetUserInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinUserGetUserInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatqy/webhook.send.go b/service/wechatqy/webhook.send.go index e70fb143..9df959a0 100644 --- a/service/wechatqy/webhook.send.go +++ b/service/wechatqy/webhook.send.go @@ -2,8 +2,8 @@ package wechatqy import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -36,6 +36,6 @@ func (c *Client) WebhookSend(ctx context.Context, notMustParams ...gorequest.Par request, err := c.request(ctx, apiUrl+fmt.Sprintf("/cgi-bin/webhook/send?key=%s&type=%s", c.GetKey(), "text"), params, http.MethodPost) // 定义 var response WebhookSendResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newWebhookSendResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/cgi_bin.token.go b/service/wechatunion/cgi_bin.token.go index 81ae88ac..4e4b5f3d 100644 --- a/service/wechatunion/cgi_bin.token.go +++ b/service/wechatunion/cgi_bin.token.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -34,6 +34,6 @@ func (c *Client) CgiBinToken(ctx context.Context) *CgiBinTokenResult { request, err := c.request(ctx, fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", c.GetAppId(), c.GetAppSecret()), map[string]interface{}{}, http.MethodGet) // 定义 var response CgiBinTokenResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newCgiBinTokenResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/getcallbackip.go b/service/wechatunion/getcallbackip.go index 737572bd..fc96a965 100644 --- a/service/wechatunion/getcallbackip.go +++ b/service/wechatunion/getcallbackip.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -30,6 +30,6 @@ func (c *Client) GetCallBackIp(ctx context.Context) *GetCallBackIpResult { request, err := c.request(ctx, fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=%s", c.getAccessToken(ctx)), map[string]interface{}{}, "GET") // 定义 var response GetCallBackIpResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newGetCallBackIpResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/order.go b/service/wechatunion/order.go index 9c1a8e75..dd981c01 100644 --- a/service/wechatunion/order.go +++ b/service/wechatunion/order.go @@ -70,7 +70,7 @@ func (c *Client) OrderSearch(ctx context.Context, notMustParams ...gorequest.Par //if err != nil { // return result, err //} - //err = json.Unmarshal(body, &result) + //err =gojson.Unmarshal(body, &result) //if err != nil { // return result, err //} diff --git a/service/wechatunion/promoter.order.info.go b/service/wechatunion/promoter.order.info.go index 2afdf0e5..2e93fa17 100644 --- a/service/wechatunion/promoter.order.info.go +++ b/service/wechatunion/promoter.order.info.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -68,6 +68,6 @@ func (c *Client) PromoterOrderInfo(ctx context.Context, orderId ...string) *Prom request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/order/info?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response PromoterOrderInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterOrderInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.order.search.go b/service/wechatunion/promoter.order.search.go index 4889e1b9..acc58ade 100644 --- a/service/wechatunion/promoter.order.search.go +++ b/service/wechatunion/promoter.order.search.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -65,6 +65,6 @@ func (c *Client) PromoterOrderSearch(ctx context.Context, notMustParams ...goreq request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/order/search?access_token=%s", c.getAccessToken(ctx)), params, http.MethodGet) // 定义 var response PromoterOrderSearchResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterOrderSearchResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.product.category.go b/service/wechatunion/promoter.product.category.go index 2728f7f1..01ae52be 100644 --- a/service/wechatunion/promoter.product.category.go +++ b/service/wechatunion/promoter.product.category.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) PromoterProductCategory(ctx context.Context) *PromoterProductCa request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/product/category?access_token=%s", c.getAccessToken(ctx)), map[string]interface{}{}, http.MethodGet) // 定义 var response PromoterProductCategoryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterProductCategoryResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.product.generate.go b/service/wechatunion/promoter.product.generate.go index 8aa6b359..a5156067 100644 --- a/service/wechatunion/promoter.product.generate.go +++ b/service/wechatunion/promoter.product.generate.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -64,6 +64,6 @@ func (c *Client) PromoterProductGenerate(ctx context.Context, notMustParams ...g request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/product/generate?access_token=%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response PromoterProductGenerateResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterProductGenerateResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.product.list.go b/service/wechatunion/promoter.product.list.go index e95fa4ca..b129ca4f 100644 --- a/service/wechatunion/promoter.product.list.go +++ b/service/wechatunion/promoter.product.list.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -147,6 +147,6 @@ func (c *Client) PromoterProductList(ctx context.Context, notMustParams ...goreq request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/product/list?access_token=%s", c.getAccessToken(ctx)), params, http.MethodGet) // 定义 var response PromoterProductListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterProductListResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.product.select.go b/service/wechatunion/promoter.product.select.go index 8854e410..bf8054d0 100644 --- a/service/wechatunion/promoter.product.select.go +++ b/service/wechatunion/promoter.product.select.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -148,6 +148,6 @@ func (c *Client) PromoterProductSelect(ctx context.Context, notMustParams ...gor request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/product/select?access_token=%s", c.getAccessToken(ctx)), params, http.MethodGet) // 定义 var response PromoterProductSelectResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromoterProductSelectResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.promotion.add.go b/service/wechatunion/promoter.promotion.add.go index f5e258bc..c8dd0dc4 100644 --- a/service/wechatunion/promoter.promotion.add.go +++ b/service/wechatunion/promoter.promotion.add.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) PromotionAdd(ctx context.Context, promotionSourceName string) * request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/promotion/add?access_token%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response PromotionAddResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromotionAddResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.promotion.del.go b/service/wechatunion/promoter.promotion.del.go index 1441b808..700cd8dc 100644 --- a/service/wechatunion/promoter.promotion.del.go +++ b/service/wechatunion/promoter.promotion.del.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -35,6 +35,6 @@ func (c *Client) PromotionDel(ctx context.Context, promotionSourcePid, promotion request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/promotion/del?access_token%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response PromotionDelResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromotionDelResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.promotion.list.go b/service/wechatunion/promoter.promotion.list.go index f146e21c..46945a06 100644 --- a/service/wechatunion/promoter.promotion.list.go +++ b/service/wechatunion/promoter.promotion.list.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -43,6 +43,6 @@ func (c *Client) PromotionList(ctx context.Context, start int, limit int) *Promo request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/promotion/list?access_token%s", c.getAccessToken(ctx)), params, http.MethodGet) // 定义 var response PromotionListResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromotionListResult(response, request.ResponseBody, request, err) } diff --git a/service/wechatunion/promoter.promotion.upd.go b/service/wechatunion/promoter.promotion.upd.go index 27694615..896ee679 100644 --- a/service/wechatunion/promoter.promotion.upd.go +++ b/service/wechatunion/promoter.promotion.upd.go @@ -2,8 +2,8 @@ package wechatunion import ( "context" - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "net/http" ) @@ -33,6 +33,6 @@ func (c *Client) PromotionUpd(ctx context.Context, notMustParams ...gorequest.Pa request, err := c.request(ctx, apiUrl+fmt.Sprintf("/promoter/promotion/upd?access_token%s", c.getAccessToken(ctx)), params, http.MethodPost) // 定义 var response PromotionUpdResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newPromotionUpdResult(response, request.ResponseBody, request, err) } diff --git a/service/weishi/api.go b/service/weishi/api.go index d1e7016e..0b908329 100644 --- a/service/weishi/api.go +++ b/service/weishi/api.go @@ -2,8 +2,8 @@ package weishi import ( "context" - "encoding/json" "errors" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/mvdan/xurls" "regexp" @@ -1086,6 +1086,6 @@ func (c *Client) Analysis(ctx context.Context, content string) *AnalysisResult { // 定义 var response AnalysisResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newAnalysisResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.power.add_card.go b/service/wikeyun/rest.power.add_card.go index 910f609e..37b19ce9 100644 --- a/service/wikeyun/rest.power.add_card.go +++ b/service/wikeyun/rest.power.add_card.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -43,6 +43,6 @@ func (c *Client) RestPowerAddCard(ctx context.Context, notMustParams ...goreques request, err := c.request(ctx, apiUrl+"/rest/Power/addCard", params) // 定义 var response RestPowerAddCardResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestPowerAddCardResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.power.cancel.go b/service/wikeyun/rest.power.cancel.go index 2cba65ec..64ecff9c 100644 --- a/service/wikeyun/rest.power.cancel.go +++ b/service/wikeyun/rest.power.cancel.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) RestPowerCancel(ctx context.Context, orderNumber string) *RestP request, err := c.request(ctx, apiUrl+"/rest/Power/cancel", params) // 定义 var response RestPowerCancelResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestPowerCancelResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.power.del_card.go b/service/wikeyun/rest.power.del_card.go index 855f2793..2ae21ee5 100644 --- a/service/wikeyun/rest.power.del_card.go +++ b/service/wikeyun/rest.power.del_card.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -35,6 +35,6 @@ func (c *Client) RestPowerDelCard(ctx context.Context, cardId string) *RestPower request, err := c.request(ctx, apiUrl+"/rest/Power/delCard", params) // 定义 var response RestPowerDelCardResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestPowerDelCardResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.power.push_order.go b/service/wikeyun/rest.power.push_order.go index f31a1078..e7bc9748 100644 --- a/service/wikeyun/rest.power.push_order.go +++ b/service/wikeyun/rest.power.push_order.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) RestPowerPushOrder(ctx context.Context, notMustParams ...gorequ request, err := c.request(ctx, apiUrl+"/rest/Power/pushOrder", params) // 定义 var response RestPowerPushOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestPowerPushOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.power.query.go b/service/wikeyun/rest.power.query.go index 6acec60e..98b42e0d 100644 --- a/service/wikeyun/rest.power.query.go +++ b/service/wikeyun/rest.power.query.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -46,7 +46,7 @@ func (c *Client) RestPowerQuery(ctx context.Context, orderNumber string) *RestPo request, err := c.request(ctx, apiUrl+"/rest/Power/query", params) // 定义 var response RestPowerQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestPowerQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.recharge.cancel.go b/service/wikeyun/rest.recharge.cancel.go index 5a5edf84..70d1d6fc 100644 --- a/service/wikeyun/rest.recharge.cancel.go +++ b/service/wikeyun/rest.recharge.cancel.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -34,6 +34,6 @@ func (c *Client) RestRechargeCancel(ctx context.Context, orderNumber string) *Re request, err := c.request(ctx, apiUrl+"/rest/Recharge/cancel", params) // 定义 var response RestRechargeCancelResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestRechargeCancelResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.recharge.mobileInfo.go b/service/wikeyun/rest.recharge.mobileInfo.go index d331f220..2211a095 100644 --- a/service/wikeyun/rest.recharge.mobileInfo.go +++ b/service/wikeyun/rest.recharge.mobileInfo.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -54,6 +54,6 @@ func (c *Client) RestRechargeMobileInfo(ctx context.Context, orderNumber string) request, err := c.request(ctx, apiUrl+"/rest/Recharge/mobileInfo", params) // 定义 var response RestRechargeMobileInfoResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestRechargeMobileInfoResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.recharge.push_order.go b/service/wikeyun/rest.recharge.push_order.go index d5b09482..bd79832a 100644 --- a/service/wikeyun/rest.recharge.push_order.go +++ b/service/wikeyun/rest.recharge.push_order.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -35,6 +35,6 @@ func (c *Client) RestRechargePushOrder(ctx context.Context, notMustParams ...gor request, err := c.request(ctx, apiUrl+"/rest/Recharge/pushOrder", params) // 定义 var response RestRechargePushOrderResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestRechargePushOrderResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.recharge.query.go b/service/wikeyun/rest.recharge.query.go index 902774e3..1bab65f7 100644 --- a/service/wikeyun/rest.recharge.query.go +++ b/service/wikeyun/rest.recharge.query.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -45,7 +45,7 @@ func (c *Client) RestRechargeQuery(ctx context.Context, orderNumber string) *Res request, err := c.request(ctx, apiUrl+"/rest/Recharge/query", params) // 定义 var response RestRechargeQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestRechargeQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.recharge.verify.go b/service/wikeyun/rest.recharge.verify.go index ba2e8b1c..af38dae8 100644 --- a/service/wikeyun/rest.recharge.verify.go +++ b/service/wikeyun/rest.recharge.verify.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -36,6 +36,6 @@ func (c *Client) RestRechargeVerify(ctx context.Context, mobile string, amount i request, err := c.request(ctx, apiUrl+"/rest/Recharge/verify", params) // 定义 var response RestRechargeVerifyResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestRechargeVerifyResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/rest.user.query.go b/service/wikeyun/rest.user.query.go index b6cd9065..b9491fa1 100644 --- a/service/wikeyun/rest.user.query.go +++ b/service/wikeyun/rest.user.query.go @@ -2,7 +2,7 @@ package wikeyun import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" ) @@ -35,6 +35,6 @@ func (c *Client) RestUserQuery(ctx context.Context) *RestUserQueryResult { request, err := c.request(ctx, apiUrl+"/rest/User/query", map[string]interface{}{}) // 定义 var response RestUserQueryResponse - err = json.Unmarshal(request.ResponseBody, &response) + err = gojson.Unmarshal(request.ResponseBody, &response) return newRestUserQueryResult(response, request.ResponseBody, request, err) } diff --git a/service/wikeyun/sign.go b/service/wikeyun/sign.go index a9eeb74b..85115ea8 100644 --- a/service/wikeyun/sign.go +++ b/service/wikeyun/sign.go @@ -3,7 +3,7 @@ package wikeyun import ( "crypto/md5" "encoding/hex" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "sort" "strconv" "strings" @@ -70,7 +70,7 @@ func getString(i interface{}) string { case bool: return strconv.FormatBool(v) default: - bytes, _ := json.Marshal(v) + bytes, _ := gojson.Marshal(v) return string(bytes) } } diff --git a/utils/dorm/json.go b/utils/dorm/json.go index afd82b7d..7161e329 100644 --- a/utils/dorm/json.go +++ b/utils/dorm/json.go @@ -1,16 +1,18 @@ package dorm -import "encoding/json" +import ( + "github.com/dtapps/go-library/utils/gojson" +) // JsonDecodeNoError json字符串转结构体，不报错 func JsonDecodeNoError(b []byte) map[string]interface{} { var data map[string]interface{} - _ = json.Unmarshal(b, &data) + _ = gojson.Unmarshal(b, &data) return data } // JsonEncodeNoError 结构体转json字符串，不报错 func JsonEncodeNoError(data interface{}) string { - jsons, _ := json.Marshal(data) + jsons, _ := gojson.Marshal(data) return string(jsons) } diff --git a/utils/dorm/redis_cache.go b/utils/dorm/redis_cache.go index 3be9993c..e2b175b9 100644 --- a/utils/dorm/redis_cache.go +++ b/utils/dorm/redis_cache.go @@ -2,7 +2,7 @@ package dorm import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "time" ) @@ -62,7 +62,7 @@ func (rc *RedisClientCache) GetString(ctx context.Context, key string) (ret stri func (rc *RedisClientCache) GetInterface(ctx context.Context, key string, result interface{}) { f := func() string { - marshal, _ := json.Marshal(rc.GetterInterface()) + marshal, _ := gojson.Marshal(rc.GetterInterface()) return string(marshal) } @@ -74,7 +74,7 @@ func (rc *RedisClientCache) GetInterface(ctx context.Context, key string, result ret, _ = rc.operation.Get(ctx, key).Result() } - err = json.Unmarshal([]byte(ret), result) + err = gojson.Unmarshal([]byte(ret), result) return } @@ -85,12 +85,12 @@ func (rc *RedisClientCache) GetInterfaceKey(ctx context.Context, key string, res if err != nil { return err } - err = json.Unmarshal([]byte(ret), result) + err = gojson.Unmarshal([]byte(ret), result) return nil } // SetInterfaceKey 设置key值 func (rc *RedisClientCache) SetInterfaceKey(ctx context.Context, key string, value interface{}) (string, error) { - marshal, _ := json.Marshal(value) + marshal, _ := gojson.Marshal(value) return rc.operation.Set(ctx, key, marshal, rc.defaultExpiration).Result() } diff --git a/utils/dorm/redis_simple_cache.go b/utils/dorm/redis_simple_cache.go index c0a7df21..94d212f4 100644 --- a/utils/dorm/redis_simple_cache.go +++ b/utils/dorm/redis_simple_cache.go @@ -2,7 +2,7 @@ package dorm import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "time" ) @@ -43,7 +43,7 @@ func (c *SimpleCache) GetCache(ctx context.Context, key string) (ret interface{} if c.Serializer == SerializerJson { f := func() string { obj := c.JsonGetter() - b, err := json.Marshal(obj) + b, err := gojson.Marshal(obj) if err != nil { return "" } diff --git a/utils/dorm/redis_simple_json_cache.go b/utils/dorm/redis_simple_json_cache.go index 235958e2..341391fd 100644 --- a/utils/dorm/redis_simple_json_cache.go +++ b/utils/dorm/redis_simple_json_cache.go @@ -2,7 +2,7 @@ package dorm import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "time" ) @@ -32,7 +32,7 @@ func (c *SimpleJsonCache) SetCache(ctx context.Context, key string, value interf func (c *SimpleJsonCache) GetCache(ctx context.Context, key string) (ret interface{}) { f := func() string { obj := c.DBGetter() - b, err := json.Marshal(obj) + b, err := gojson.Marshal(obj) if err != nil { return "" } diff --git a/utils/dorm/xml.go b/utils/dorm/xml.go index d5a93c8c..1ee1a0f9 100644 --- a/utils/dorm/xml.go +++ b/utils/dorm/xml.go @@ -1,8 +1,8 @@ package dorm import ( - "encoding/json" "github.com/basgys/goxml2json" + "github.com/dtapps/go-library/utils/gojson" "strings" ) @@ -11,7 +11,7 @@ func XmlDecodeNoError(b []byte) map[string]interface{} { xtj := strings.NewReader(string(b)) jtx, _ := xml2json.Convert(xtj) var data map[string]interface{} - _ = json.Unmarshal(jtx.Bytes(), &data) + _ = gojson.Unmarshal(jtx.Bytes(), &data) return data } diff --git a/utils/gocache/redis.go b/utils/gocache/redis.go index 8a989e0a..40a9ef23 100644 --- a/utils/gocache/redis.go +++ b/utils/gocache/redis.go @@ -2,8 +2,8 @@ package gocache import ( "context" - "encoding/json" "github.com/dtapps/go-library/utils/dorm" + "github.com/dtapps/go-library/utils/gojson" "time" ) @@ -36,7 +36,7 @@ func (r *Redis) Set(key string, value interface{}, expiration time.Duration) (st // SetInterface 设置一个key的值 func (r *Redis) SetInterface(key string, value interface{}, expiration time.Duration) (string, error) { r.setLog(key) - marshal, _ := json.Marshal(value) + marshal, _ := gojson.Marshal(value) return r.Client.GetDb().Set(context.Background(), key, marshal, expiration).Result() } @@ -49,7 +49,7 @@ func (r *Redis) SetDefaultExpiration(key string, value interface{}) (string, err // SetInterfaceDefaultExpiration 设置一个key的值，使用全局默认过期时间 func (r *Redis) SetInterfaceDefaultExpiration(key string, value interface{}) (string, error) { r.setLog(key) - marshal, _ := json.Marshal(value) + marshal, _ := gojson.Marshal(value) return r.Client.GetDb().Set(context.Background(), key, marshal, r.config.DefaultExpiration).Result() } @@ -66,7 +66,7 @@ func (r *Redis) GetInterface(key string, result interface{}) error { if err != nil { return err } - err = json.Unmarshal([]byte(ret), result) + err = gojson.Unmarshal([]byte(ret), result) return nil } diff --git a/utils/gocache/redis_cache.go b/utils/gocache/redis_cache.go index 48e04bb7..df246d12 100644 --- a/utils/gocache/redis_cache.go +++ b/utils/gocache/redis_cache.go @@ -1,7 +1,7 @@ package gocache import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "time" ) @@ -54,7 +54,7 @@ func (rc *RedisCache) GetString(key string) (ret string) { func (rc *RedisCache) GetInterface(key string, result interface{}) { f := func() string { - marshal, _ := json.Marshal(rc.GetterInterface()) + marshal, _ := gojson.Marshal(rc.GetterInterface()) return string(marshal) } @@ -66,7 +66,7 @@ func (rc *RedisCache) GetInterface(key string, result interface{}) { ret, _ = rc.operation.Get(key) } - err = json.Unmarshal([]byte(ret), result) + err = gojson.Unmarshal([]byte(ret), result) return } diff --git a/utils/goip/ip.go b/utils/goip/ip.go index 01f1645c..350b2439 100644 --- a/utils/goip/ip.go +++ b/utils/goip/ip.go @@ -2,7 +2,7 @@ package goip import ( "context" - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "log" "net" @@ -69,7 +69,7 @@ func GetOutsideIp(ctx context.Context) string { } // 解析 var responseJson respGetOutsideIp - err = json.Unmarshal(response.ResponseBody, &responseJson) + err = gojson.Unmarshal(response.ResponseBody, &responseJson) if err != nil { log.Printf("[GetOutsideIp]json.Unmarshal：%s\n", err) return "0.0.0.0" diff --git a/utils/gojson/gojson.go b/utils/gojson/gojson.go index 74c3f775..9fa9992e 100644 --- a/utils/gojson/gojson.go +++ b/utils/gojson/gojson.go @@ -2,6 +2,14 @@ package gojson import "github.com/dtapps/go-library/utils/gojson/json" +func Marshal(v any) ([]byte, error) { + return json.Marshal(v) +} + +func Unmarshal(data []byte, v any) error { + return json.Unmarshal(data, v) +} + func Encode(v interface{}) (string, error) { bytes, err := json.Marshal(v) if err != nil { diff --git a/utils/golog/gin.go b/utils/golog/gin.go index 1de1c135..7e708677 100644 --- a/utils/golog/gin.go +++ b/utils/golog/gin.go @@ -3,10 +3,10 @@ package golog import ( "bytes" "context" - "encoding/json" "errors" "github.com/dtapps/go-library/utils/dorm" "github.com/dtapps/go-library/utils/goip" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gorequest" "github.com/dtapps/go-library/utils/gotime" "github.com/dtapps/go-library/utils/gotrace_id" @@ -115,7 +115,7 @@ func (w bodyLogWriter) WriteString(s string) (int, error) { } func (c *GinClient) jsonUnmarshal(data string) (result interface{}) { - _ = json.Unmarshal([]byte(data), &result) + _ = gojson.Unmarshal([]byte(data), &result) return } @@ -155,7 +155,7 @@ func (c *GinClient) Middleware() gin.HandlerFunc { // 判断是否有内容 if len(data) > 0 { - err := json.Unmarshal(data, &jsonBody) + err := gojson.Unmarshal(data, &jsonBody) if err != nil { dataJson = false } diff --git a/utils/goparams/goparams.go b/utils/goparams/goparams.go index a2f09ab0..79cc08bb 100644 --- a/utils/goparams/goparams.go +++ b/utils/goparams/goparams.go @@ -1,8 +1,8 @@ package goparams import ( - "encoding/json" "github.com/dtapps/go-library/utils/godecimal" + "github.com/dtapps/go-library/utils/gojson" "log" "net/url" ) @@ -49,7 +49,7 @@ func GetParamsString(src interface{}) string { case float32, float64: return godecimal.NewInterface(src).String() } - data, err := json.Marshal(src) + data, err := gojson.Marshal(src) if err != nil { log.Fatal(err) } diff --git a/utils/gorequest/http.go b/utils/gorequest/http.go index abcf8993..866f5892 100644 --- a/utils/gorequest/http.go +++ b/utils/gorequest/http.go @@ -6,10 +6,10 @@ import ( "compress/gzip" "context" "crypto/tls" - "encoding/json" "errors" "fmt" cookiemonster "github.com/MercuryEngineering/CookieMonster" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gostring" "github.com/dtapps/go-library/utils/gotime" "github.com/dtapps/go-library/utils/gotrace_id" @@ -266,7 +266,7 @@ func request(app *App, ctx context.Context) (httpResponse Response, err error) { var reqBody io.Reader if httpResponse.RequestMethod == http.MethodPost && app.httpContentType == httpParamsModeJson { - jsonStr, err := json.Marshal(httpResponse.RequestParams) + jsonStr, err := gojson.Marshal(httpResponse.RequestParams) if err != nil { app.Error = errors.New(fmt.Sprintf("解析出错 %s", err)) return httpResponse, app.Error diff --git a/utils/gorequest/params.go b/utils/gorequest/params.go index 895cc534..c34de6e7 100644 --- a/utils/gorequest/params.go +++ b/utils/gorequest/params.go @@ -1,7 +1,7 @@ package gorequest import ( - "encoding/json" + "github.com/dtapps/go-library/utils/gojson" "github.com/dtapps/go-library/utils/gostring" "log" ) @@ -46,7 +46,7 @@ func GetParamsString(src interface{}) string { case float32, float64: return gostring.ToString(src) } - data, err := json.Marshal(src) + data, err := gojson.Marshal(src) if err != nil { log.Fatal(err) } diff --git a/utils/phpjson/phpjson.go b/utils/phpjson/phpjson.go index 16d8eafa..8a69a3aa 100644 --- a/utils/phpjson/phpjson.go +++ b/utils/phpjson/phpjson.go @@ -1,14 +1,14 @@ package phpjson import ( - "encoding/json" "fmt" + "github.com/dtapps/go-library/utils/gojson" "reflect" "strings" ) func Encode(v interface{}) (string, error) { - bytes, err := json.Marshal(v) + bytes, err := gojson.Marshal(v) if err != nil { return "", err } @@ -16,7 +16,7 @@ func Encode(v interface{}) (string, error) { } func MarshalToString(msg interface{}) (string, error) { - j, e := json.Marshal(msg) + j, e := gojson.Marshal(msg) if e != nil { return "", e }