From c9a70ad16f909809c24649be5318dbc45a30466d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Thu, 30 Dec 2021 15:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/dingdanxia/jd.jy_order_details.go | 4 ++-- service/dingdanxia/waimai.meituan_orders.go | 4 ++-- service/jd/union.open.goods.jingfen.query.go | 4 ++-- service/jd/union.open.goods.promotiongoodsinfo.query.go | 4 ++-- service/jd/union.open.promotion.common.get.go | 4 ++-- service/wechatminiprogram/auth.code2_session.go | 6 +++--- service/wechatminiprogram/business.getliveinfo.go | 6 +++--- service/wechatminiprogram/cgi-bin.token.go | 6 +++--- service/wechatminiprogram/getcallbackip.go | 6 +++--- service/wechatminiprogram/subscribe_message.send.go | 6 +++--- service/wechatoffice/auth.code2_session.go | 6 +++--- service/wechatoffice/cgi-bin.token.go | 6 +++--- service/wechatoffice/getcallbackip.go | 6 +++--- service/wechatoffice/getticket.go | 6 +++--- service/wechatoffice/message.template.send.go | 6 +++--- service/wechatoffice/sns.oauth2.access_token.go | 6 +++--- service/wechatoffice/sns.userinfo.go | 6 +++--- service/wechatunion/target.go | 1 - service/wechatunion/type.go | 7 ------- 19 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 service/wechatunion/target.go delete mode 100644 service/wechatunion/type.go diff --git a/service/dingdanxia/jd.jy_order_details.go b/service/dingdanxia/jd.jy_order_details.go index 615418a7..d70d0724 100644 --- a/service/dingdanxia/jd.jy_order_details.go +++ b/service/dingdanxia/jd.jy_order_details.go @@ -28,12 +28,12 @@ type JdJyOrderDetailsResponse struct { type JdJyOrderDetailsResult struct { Result JdJyOrderDetailsResponse // 结果 - body []byte // 内容 + Body []byte // 内容 Err error // 错误 } func NewJdJyOrderDetailsResult(result JdJyOrderDetailsResponse, body []byte, err error) *JdJyOrderDetailsResult { - return &JdJyOrderDetailsResult{Result: result, body: body, Err: err} + return &JdJyOrderDetailsResult{Result: result, Body: body, Err: err} } // JdJyOrderDetails 【官方不维护】 京佣订单 diff --git a/service/dingdanxia/waimai.meituan_orders.go b/service/dingdanxia/waimai.meituan_orders.go index 936bd6d6..923830c9 100644 --- a/service/dingdanxia/waimai.meituan_orders.go +++ b/service/dingdanxia/waimai.meituan_orders.go @@ -28,12 +28,12 @@ type WaimaiMeituanOrdersResponse struct { type WaimaiMeituanOrdersResult struct { Result WaimaiMeituanOrdersResponse // 结果 - body []byte // 内容 + Body []byte // 内容 Err error // 错误 } func NewWaimaiMeituanOrdersResult(result WaimaiMeituanOrdersResponse, body []byte, err error) *WaimaiMeituanOrdersResult { - return &WaimaiMeituanOrdersResult{Result: result, body: body, Err: err} + return &WaimaiMeituanOrdersResult{Result: result, Body: body, Err: err} } // WaimaiMeituanOrders 美团联盟外卖/闪购/优选/酒店订单查询API diff --git a/service/jd/union.open.goods.jingfen.query.go b/service/jd/union.open.goods.jingfen.query.go index 3c411d34..4eb5f3b5 100644 --- a/service/jd/union.open.goods.jingfen.query.go +++ b/service/jd/union.open.goods.jingfen.query.go @@ -108,12 +108,12 @@ type UnionOpenGoodsJIngFenQueryQueryResult struct { type UnionOpenGoodsJIngFenQueryResult struct { Responce UnionOpenGoodsJIngFenQueryResultResponse // 结果 Result UnionOpenGoodsJIngFenQueryQueryResult // 结果 - body []byte // 内容 + Body []byte // 内容 Err error // 错误 } func NewUnionOpenGoodsJIngFenQueryResult(responce UnionOpenGoodsJIngFenQueryResultResponse, result UnionOpenGoodsJIngFenQueryQueryResult, body []byte, err error) *UnionOpenGoodsJIngFenQueryResult { - return &UnionOpenGoodsJIngFenQueryResult{Responce: responce, Result: result, body: body, Err: err} + return &UnionOpenGoodsJIngFenQueryResult{Responce: responce, Result: result, Body: body, Err: err} } // UnionOpenGoodsJIngFenQuery diff --git a/service/jd/union.open.goods.promotiongoodsinfo.query.go b/service/jd/union.open.goods.promotiongoodsinfo.query.go index 477f3504..a67be49a 100644 --- a/service/jd/union.open.goods.promotiongoodsinfo.query.go +++ b/service/jd/union.open.goods.promotiongoodsinfo.query.go @@ -43,12 +43,12 @@ type UnionOpenGoodsPromotionGoodsInfoQueryQueryResult struct { type UnionOpenGoodsPromotionGoodsInfoQueryResult struct { Responce UnionOpenGoodsPromotionGoodsInfoQueryResultResponse // 结果 Result UnionOpenGoodsPromotionGoodsInfoQueryQueryResult // 结果 - body []byte // 内容 + Body []byte // 内容 Err error // 错误 } func NewUnionOpenGoodsPromotionGoodsInfoQueryResult(responce UnionOpenGoodsPromotionGoodsInfoQueryResultResponse, result UnionOpenGoodsPromotionGoodsInfoQueryQueryResult, body []byte, err error) *UnionOpenGoodsPromotionGoodsInfoQueryResult { - return &UnionOpenGoodsPromotionGoodsInfoQueryResult{Responce: responce, Result: result, body: body, Err: err} + return &UnionOpenGoodsPromotionGoodsInfoQueryResult{Responce: responce, Result: result, Body: body, Err: err} } // UnionOpenGoodsPromotionGoodsInfoQuery diff --git a/service/jd/union.open.promotion.common.get.go b/service/jd/union.open.promotion.common.get.go index ffc270f3..ea64f0f5 100644 --- a/service/jd/union.open.promotion.common.get.go +++ b/service/jd/union.open.promotion.common.get.go @@ -22,12 +22,12 @@ type UnionOpenPromotionCommonGetGetResult struct { type UnionOpenPromotionCommonGetResult struct { Responce UnionOpenPromotionCommonGetResultResponse // 结果 Result UnionOpenPromotionCommonGetGetResult // 结果 - body []byte // 内容 + Body []byte // 内容 Err error // 错误 } func NewUnionOpenPromotionCommonGetResult(responce UnionOpenPromotionCommonGetResultResponse, result UnionOpenPromotionCommonGetGetResult, body []byte, err error) *UnionOpenPromotionCommonGetResult { - return &UnionOpenPromotionCommonGetResult{Responce: responce, Result: result, body: body, Err: err} + return &UnionOpenPromotionCommonGetResult{Responce: responce, Result: result, Body: body, Err: err} } // UnionOpenPromotionCommonGet diff --git a/service/wechatminiprogram/auth.code2_session.go b/service/wechatminiprogram/auth.code2_session.go index bdbae17b..263bef8e 100644 --- a/service/wechatminiprogram/auth.code2_session.go +++ b/service/wechatminiprogram/auth.code2_session.go @@ -16,12 +16,12 @@ type AuthCode2SessionResponse struct { type AuthCode2SessionResult struct { Result AuthCode2SessionResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewAuthCode2SessionResult(result AuthCode2SessionResponse, byte []byte, err error) *AuthCode2SessionResult { - return &AuthCode2SessionResult{Result: result, Byte: byte, Err: err} +func NewAuthCode2SessionResult(result AuthCode2SessionResponse, body []byte, err error) *AuthCode2SessionResult { + return &AuthCode2SessionResult{Result: result, Body: body, Err: err} } func (app *App) AuthCode2Session(jsCode string) *AuthCode2SessionResult { diff --git a/service/wechatminiprogram/business.getliveinfo.go b/service/wechatminiprogram/business.getliveinfo.go index 50f5eda4..1626f56e 100644 --- a/service/wechatminiprogram/business.getliveinfo.go +++ b/service/wechatminiprogram/business.getliveinfo.go @@ -43,12 +43,12 @@ type BusinessGetLiveInfoResponse struct { type BusinessGetLiveInfoResult struct { Result BusinessGetLiveInfoResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewBusinessGetLiveInfoResult(result BusinessGetLiveInfoResponse, byte []byte, err error) *BusinessGetLiveInfoResult { - return &BusinessGetLiveInfoResult{Result: result, Byte: byte, Err: err} +func NewBusinessGetLiveInfoResult(result BusinessGetLiveInfoResponse, body []byte, err error) *BusinessGetLiveInfoResult { + return &BusinessGetLiveInfoResult{Result: result, Body: body, Err: err} } // BusinessGetLiveInfo 获取直播间列表 diff --git a/service/wechatminiprogram/cgi-bin.token.go b/service/wechatminiprogram/cgi-bin.token.go index 359b5847..741269a0 100644 --- a/service/wechatminiprogram/cgi-bin.token.go +++ b/service/wechatminiprogram/cgi-bin.token.go @@ -15,12 +15,12 @@ type AuthGetAccessTokenResponse struct { type AuthGetAccessTokenResult struct { Result AuthGetAccessTokenResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *AuthGetAccessTokenResult { - return &AuthGetAccessTokenResult{Result: result, Byte: byte, Err: err} +func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, body []byte, err error) *AuthGetAccessTokenResult { + return &AuthGetAccessTokenResult{Result: result, Body: body, Err: err} } // AuthGetAccessToken diff --git a/service/wechatminiprogram/getcallbackip.go b/service/wechatminiprogram/getcallbackip.go index 6ae824dd..f952b53b 100644 --- a/service/wechatminiprogram/getcallbackip.go +++ b/service/wechatminiprogram/getcallbackip.go @@ -12,12 +12,12 @@ type GetCallBackIpResponse struct { type GetCallBackIpResult struct { Result GetCallBackIpResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *GetCallBackIpResult { - return &GetCallBackIpResult{Result: result, Byte: byte, Err: err} +func NewGetCallBackIpResult(result GetCallBackIpResponse, body []byte, err error) *GetCallBackIpResult { + return &GetCallBackIpResult{Result: result, Body: body, Err: err} } // GetCallBackIp 获取微信callback IP地址 diff --git a/service/wechatminiprogram/subscribe_message.send.go b/service/wechatminiprogram/subscribe_message.send.go index 558a90e6..7d0c9f10 100644 --- a/service/wechatminiprogram/subscribe_message.send.go +++ b/service/wechatminiprogram/subscribe_message.send.go @@ -23,12 +23,12 @@ type SubscribeMessageSendResponse struct { type SubscribeMessageSendResult struct { Result SubscribeMessageSendResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewSubscribeMessageSendResult(result SubscribeMessageSendResponse, byte []byte, err error) *SubscribeMessageSendResult { - return &SubscribeMessageSendResult{Result: result, Byte: byte, Err: err} +func NewSubscribeMessageSendResult(result SubscribeMessageSendResponse, body []byte, err error) *SubscribeMessageSendResult { + return &SubscribeMessageSendResult{Result: result, Body: body, Err: err} } // SubscribeMessageSend 发送订阅消息 diff --git a/service/wechatoffice/auth.code2_session.go b/service/wechatoffice/auth.code2_session.go index 0e9a6b7b..15c85021 100644 --- a/service/wechatoffice/auth.code2_session.go +++ b/service/wechatoffice/auth.code2_session.go @@ -16,12 +16,12 @@ type AuthCode2SessionResponse struct { type AuthCode2SessionResult struct { Result AuthCode2SessionResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewAuthCode2SessionResult(result AuthCode2SessionResponse, byte []byte, err error) *AuthCode2SessionResult { - return &AuthCode2SessionResult{Result: result, Byte: byte, Err: err} +func NewAuthCode2SessionResult(result AuthCode2SessionResponse, body []byte, err error) *AuthCode2SessionResult { + return &AuthCode2SessionResult{Result: result, Body: body, Err: err} } func (app *App) AuthCode2Session(jsCode string) *AuthCode2SessionResult { diff --git a/service/wechatoffice/cgi-bin.token.go b/service/wechatoffice/cgi-bin.token.go index 34fcdcd1..d026f643 100644 --- a/service/wechatoffice/cgi-bin.token.go +++ b/service/wechatoffice/cgi-bin.token.go @@ -15,12 +15,12 @@ type AuthGetAccessTokenResponse struct { type AuthGetAccessTokenResult struct { Result AuthGetAccessTokenResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *AuthGetAccessTokenResult { - return &AuthGetAccessTokenResult{Result: result, Byte: byte, Err: err} +func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, body []byte, err error) *AuthGetAccessTokenResult { + return &AuthGetAccessTokenResult{Result: result, Body: body, Err: err} } // AuthGetAccessToken diff --git a/service/wechatoffice/getcallbackip.go b/service/wechatoffice/getcallbackip.go index 898afe20..64277ebb 100644 --- a/service/wechatoffice/getcallbackip.go +++ b/service/wechatoffice/getcallbackip.go @@ -12,12 +12,12 @@ type GetCallBackIpResponse struct { type GetCallBackIpResult struct { Result GetCallBackIpResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *GetCallBackIpResult { - return &GetCallBackIpResult{Result: result, Byte: byte, Err: err} +func NewGetCallBackIpResult(result GetCallBackIpResponse, body []byte, err error) *GetCallBackIpResult { + return &GetCallBackIpResult{Result: result, Body: body, Err: err} } // GetCallBackIp 获取微信callback IP地址 diff --git a/service/wechatoffice/getticket.go b/service/wechatoffice/getticket.go index 090aac4b..92f69c4d 100644 --- a/service/wechatoffice/getticket.go +++ b/service/wechatoffice/getticket.go @@ -15,12 +15,12 @@ type GetTicketRespons struct { type GetTicketResult struct { Result GetTicketRespons // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewGetTicketResult(result GetTicketRespons, byte []byte, err error) *GetTicketResult { - return &GetTicketResult{Result: result, Byte: byte, Err: err} +func NewGetTicketResult(result GetTicketRespons, body []byte, err error) *GetTicketResult { + return &GetTicketResult{Result: result, Body: body, Err: err} } // GetTicket 获取api_ticket diff --git a/service/wechatoffice/message.template.send.go b/service/wechatoffice/message.template.send.go index ead362db..06e0cc61 100644 --- a/service/wechatoffice/message.template.send.go +++ b/service/wechatoffice/message.template.send.go @@ -14,12 +14,12 @@ type MessageTemplateSendResponse struct { type MessageTemplateSendResult struct { Result MessageTemplateSendResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewMessageTemplateSendResult(result MessageTemplateSendResponse, byte []byte, err error) *MessageTemplateSendResult { - return &MessageTemplateSendResult{Result: result, Byte: byte, Err: err} +func NewMessageTemplateSendResult(result MessageTemplateSendResponse, body []byte, err error) *MessageTemplateSendResult { + return &MessageTemplateSendResult{Result: result, Body: body, Err: err} } // MessageTemplateSend 模板消息 diff --git a/service/wechatoffice/sns.oauth2.access_token.go b/service/wechatoffice/sns.oauth2.access_token.go index 02b36c12..64bbfea3 100644 --- a/service/wechatoffice/sns.oauth2.access_token.go +++ b/service/wechatoffice/sns.oauth2.access_token.go @@ -16,12 +16,12 @@ type Oauth2AccessTokenResponse struct { type Oauth2AccessTokenResult struct { Result Oauth2AccessTokenResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewOauth2AccessTokenResult(result Oauth2AccessTokenResponse, byte []byte, err error) *Oauth2AccessTokenResult { - return &Oauth2AccessTokenResult{Result: result, Byte: byte, Err: err} +func NewOauth2AccessTokenResult(result Oauth2AccessTokenResponse, body []byte, err error) *Oauth2AccessTokenResult { + return &Oauth2AccessTokenResult{Result: result, Body: body, Err: err} } // Oauth2AccessToken 通过code换取网页授权access_token diff --git a/service/wechatoffice/sns.userinfo.go b/service/wechatoffice/sns.userinfo.go index dc25ffd1..d3d3fe1f 100644 --- a/service/wechatoffice/sns.userinfo.go +++ b/service/wechatoffice/sns.userinfo.go @@ -20,12 +20,12 @@ type SnsUserinfoResponse struct { type SnsUserinfoResult struct { Result SnsUserinfoResponse // 结果 - Byte []byte // 内容 + Body []byte // 内容 Err error // 错误 } -func NewSnsUserinfoResult(result SnsUserinfoResponse, byte []byte, err error) *SnsUserinfoResult { - return &SnsUserinfoResult{Result: result, Byte: byte, Err: err} +func NewSnsUserinfoResult(result SnsUserinfoResponse, body []byte, err error) *SnsUserinfoResult { + return &SnsUserinfoResult{Result: result, Body: body, Err: err} } // SnsUserinfo 拉取用户信息(需scope为 snsapi_userinfo) diff --git a/service/wechatunion/target.go b/service/wechatunion/target.go deleted file mode 100644 index 01612bad..00000000 --- a/service/wechatunion/target.go +++ /dev/null @@ -1 +0,0 @@ -package wechatunion diff --git a/service/wechatunion/type.go b/service/wechatunion/type.go deleted file mode 100644 index 5b27a76a..00000000 --- a/service/wechatunion/type.go +++ /dev/null @@ -1,7 +0,0 @@ -package wechatunion - -const ( - commissionStatus_SettlementPending = "SETTLEMENT_PENDING" // 待结算 - commissionStatus_SettlementSuccess = "SETTLEMENT_SUCCESS" // 已结算 - commissionStatus_SettlementCanceled = "SETTLEMENT_CANCELED" // 取消结算 -)