- update sendcloud

master
李光春 2 years ago
parent b56a52027a
commit e8245ea687

@ -16,7 +16,7 @@ func (c *Client) postgresqlLog(request gorequest.Response) {
RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【请求】头部
ResponseHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容

@ -16,7 +16,7 @@ func (c *Client) postgresqlLog(api string, request gorequest.Response) {
RequestApi: api, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【请求】头部
ResponseHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容

@ -16,7 +16,7 @@ func (c *Client) postgresqlLog(request gorequest.Response) {
RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【请求】头部
ResponseHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容

@ -46,23 +46,23 @@ type ApiV2UserinfoGetResult struct {
Err error // 错误
}
func NewApiV2UserinfoGetResult(result ApiV2UserinfoGetResponse, body []byte, http gorequest.Response, err error) *ApiV2UserinfoGetResult {
func newApiV2UserinfoGetResult(result ApiV2UserinfoGetResponse, body []byte, http gorequest.Response, err error) *ApiV2UserinfoGetResult {
return &ApiV2UserinfoGetResult{Result: result, Body: body, Http: http, Err: err}
}
// ApiV2UserinfoGet 获取单个订单信息。
// 仅能获取自己购买的订单。
// http://doc.cqmeihu.cn/sales/ApiV2UserinfoGet-info.html
func (app App) ApiV2UserinfoGet() *ApiV2UserinfoGetResult {
func (c *Client) ApiV2UserinfoGet() *ApiV2UserinfoGetResult {
// 参数
param := NewParams()
param.Set("apiUser", app.apiUser)
param.Set("apiKey", app.apiKey)
params := app.NewParamsWith(param)
param := gorequest.NewParams()
param.Set("apiUser", c.GetApiUser())
param.Set("apiKey", c.GetApiKey())
params := gorequest.NewParamsWith(param)
// 请求
request, err := app.request("https://api.sendcloud.net/apiv2/userinfo/get", params, http.MethodGet)
request, err := c.request(apiUrl+"/apiv2/userinfo/get", params, http.MethodGet)
// 定义
var response ApiV2UserinfoGetResponse
err = json.Unmarshal(request.ResponseBody, &response)
return NewApiV2UserinfoGetResult(response, request.ResponseBody, request, err)
return newApiV2UserinfoGetResult(response, request.ResponseBody, request, err)
}

@ -1,71 +0,0 @@
package sendcloud
import (
"go.dtapp.net/library/utils/golog"
"go.dtapp.net/library/utils/gomongo"
"go.dtapp.net/library/utils/gorequest"
"gorm.io/gorm"
)
// App 公共请求参数
type App struct {
apiUser string // API_USER
apiKey string // API_KEY
mongo *gomongo.Client // 日志数据库
pgsql *gorm.DB // pgsql数据库
client *gorequest.App // 请求客户端
log *golog.Api // 日志服务
logTableName string // 日志表名
logStatus bool // 日志状态
}
func NewApp(apiUser string, apiKey string, pgsql *gorm.DB) *App {
app := &App{apiUser: apiUser, apiKey: apiKey}
app.client = gorequest.NewHttp()
if pgsql != nil {
app.pgsql = pgsql
app.logStatus = true
app.logTableName = "sendcloud"
app.log = golog.NewApi(&golog.ApiConfig{
Db: pgsql,
TableName: app.logTableName,
})
}
return app
}
func (app *App) request(url string, params map[string]interface{}, method string) (resp gorequest.Response, err error) {
// 公共参数
//params["userid"] = app.userId
//params["pwd"] = app.pwd
//// 签名
//params["userkey"] = gomd5.ToUpper(fmt.Sprintf("%s%s", app.signStr, app.key))
// 创建请求
client := app.client
// 设置请求地址
client.SetUri(url)
// 设置方式
client.SetMethod(method)
// 设置格式
client.SetContentTypeForm()
// 设置参数
client.SetParams(params)
// 发起请求
request, err := client.Request()
if err != nil {
return gorequest.Response{}, err
}
// 日志
if app.logStatus == true {
go app.postgresqlLog(request)
}
return request, err
}

@ -0,0 +1,42 @@
package sendcloud
import (
"go.dtapp.net/library/utils/golog"
"go.dtapp.net/library/utils/gomongo"
"go.dtapp.net/library/utils/gorequest"
"gorm.io/gorm"
)
type ConfigClient struct {
ApiUser string // API_USER
ApiKey string // API_KEY
MongoDb *gomongo.Client // 日志数据库
PgsqlDb *gorm.DB // pgsql数据库
}
type Client struct {
client *gorequest.App // 请求客户端
log *golog.ApiClient // 日志服务
logStatus bool // 日志状态
config *ConfigClient // 配置
}
func NewClient(config *ConfigClient) (*Client, error) {
var err error
c := &Client{config: config}
c.client = gorequest.NewHttp()
if c.config.PgsqlDb != nil {
c.logStatus = true
c.log, err = golog.NewApiClient(&golog.ConfigApiClient{
Db: c.config.PgsqlDb,
TableName: logTable,
})
if err != nil {
return nil, err
}
}
return c, nil
}

@ -0,0 +1,9 @@
package sendcloud
const (
apiUrl = "https://api.sendcloud.net"
)
const (
logTable = "sendcloud"
)

@ -0,0 +1,9 @@
package sendcloud
func (c *Client) GetApiUser() string {
return c.config.ApiUser
}
func (c *Client) GetApiKey() string {
return c.config.ApiKey
}

@ -1,27 +0,0 @@
package sendcloud
// Params 请求参数
type Params map[string]interface{}
func NewParams() Params {
p := make(Params)
return p
}
func (app *App) NewParamsWith(params ...Params) Params {
p := make(Params)
for _, v := range params {
p.SetParams(v)
}
return p
}
func (p Params) Set(key string, value interface{}) {
p[key] = value
}
func (p Params) SetParams(params Params) {
for key, value := range params {
p[key] = value
}
}

@ -8,19 +8,19 @@ import (
)
// 记录日志
func (app *App) postgresqlLog(request gorequest.Response) {
app.log.Record(golog.ApiPostgresqlLog{
RequestTime: request.RequestTime, //【请求】时间
func (c *Client) postgresqlLog(request gorequest.Response) {
c.log.Record(golog.ApiPostgresqlLog{
RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间
RequestUri: request.RequestUri, //【请求】链接
RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接
RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部
RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【请求】头部
ResponseHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容
ResponseContentLength: request.ResponseContentLength, //【返回】大小
ResponseTime: request.ResponseTime, //【返回】时间
ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间
})
}

@ -0,0 +1,39 @@
package sendcloud
import "go.dtapp.net/library/utils/gorequest"
func (c *Client) request(url string, params map[string]interface{}, method string) (resp gorequest.Response, err error) {
// 公共参数
//params["userid"] = c.userId
//params["pwd"] = c.pwd
//// 签名
//params["userkey"] = gomd5.ToUpper(fmt.Sprintf("%s%s", c.signStr, c.key))
// 创建请求
client := c.client
// 设置请求地址
client.SetUri(url)
// 设置方式
client.SetMethod(method)
// 设置格式
client.SetContentTypeForm()
// 设置参数
client.SetParams(params)
// 发起请求
request, err := client.Request()
if err != nil {
return gorequest.Response{}, err
}
// 日志
if c.logStatus == true {
go c.postgresqlLog(request)
}
return request, err
}
Loading…
Cancel
Save