- update pconline

- update pinduoduo

service/pconline/ip.go

@@ -27,7 +27,7 @@ type IpResult struct {
 	Err    error              // 错误
 }
 
-func NewIpResult(result IpResponse, body []byte, http gorequest.Response, err error) *IpResult {
+func newIpResult(result IpResponse, body []byte, http gorequest.Response, err error) *IpResult {
 	return &IpResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -36,12 +36,12 @@ func (c *Client) Ip(ip string) *IpResult {
 	// 请求
 	request, err := c.request(apiUrl + fmt.Sprintf("/ipJson.jsp?json=true&ip=%s", ip))
 	if err != nil {
-		return NewIpResult(IpResponse{}, request.ResponseBody, request, err)
+		return newIpResult(IpResponse{}, request.ResponseBody, request, err)
 	}
 	// 转码
 	var decodeBytes, _ = simplifiedchinese.GB18030.NewDecoder().Bytes(request.ResponseBody)
 	// 定义
 	var response IpResponse
 	err = json.Unmarshal(decodeBytes, &response)
-	return NewIpResult(response, request.ResponseBody, request, err)
+	return newIpResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/client.go

@@ -20,30 +20,31 @@ type ConfigClient struct {
 }
 
 type Client struct {
-	client       *gorequest.App // 请求客户端
-	log          *golog.Api     // 日志服务
-	logTableName string         // 日志表名
-	logStatus    bool           // 日志状态
-	config       *ConfigClient  // 配置
+	client    *gorequest.App   // 请求客户端
+	log       *golog.ApiClient // 日志服务
+	logStatus bool             // 日志状态
+	config    *ConfigClient    // 配置
 }
 
-func NewClient(config *ConfigClient) *Client {
+func NewClient(config *ConfigClient) (*Client, error) {
 
+	var err error
 	c := &Client{config: config}
-	c.config = config
 
 	c.client = gorequest.NewHttp()
-	c.client.Uri = "https://gw-api.pinduoduo.com/api/router"
+	c.client.Uri = apiUrl
 	if c.config.PgsqlDb != nil {
 		c.logStatus = true
-		c.logTableName = "pinduoduo"
-		c.log = golog.NewApi(&golog.ApiConfig{
+		c.log, err = golog.NewApiClient(&golog.ConfigApiClient{
 			Db:        c.config.PgsqlDb,
-			TableName: c.logTableName,
+			TableName: logTable,
 		})
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	return c
+	return c, nil
 }
 
 type ErrResp struct {
@@ -61,31 +62,6 @@ type CustomParametersResult struct {
 	Uid string `json:"uid"`
 }
 
-func (c *Client) request(params map[string]interface{}) (resp gorequest.Response, err error) {
-
-	// 签名
-	c.Sign(params)
-
-	// 创建请求
-	client := c.client
-
-	// 设置参数
-	client.SetParams(params)
-
-	// 发起请求
-	request, err := client.Get()
-	if err != nil {
-		return gorequest.Response{}, err
-	}
-
-	// 日志
-	if c.logStatus == true {
-		go c.postgresqlLog(gostring.ToString(params["type"]), request)
-	}
-
-	return request, err
-}
-
 func (c *Client) SalesTipParseInt64(salesTip string) int64 {
 	parseInt, err := strconv.ParseInt(salesTip, 10, 64)
 	if err != nil {

service/pinduoduo/const.go

@@ -0,0 +1,9 @@
+package pinduoduo
+
+const (
+	apiUrl = "https://whois.pconline.com.cn"
+)
+
+const (
+	logTable = "pinduoduo"
+)

service/pinduoduo/pdd.ddk.cms.prom.url.generate.go

@@ -56,7 +56,7 @@ type CmsPromUrlGenerateResult struct {
 	Error  CmsPromUrlGenerateError    // 错误结果
 }
 
-func NewCmsPromUrlGenerateResult(result CmsPromUrlGenerateResponse, body []byte, http gorequest.Response, err error, error CmsPromUrlGenerateError) *CmsPromUrlGenerateResult {
+func newCmsPromUrlGenerateResult(result CmsPromUrlGenerateResponse, body []byte, http gorequest.Response, err error, error CmsPromUrlGenerateError) *CmsPromUrlGenerateResult {
 	return &CmsPromUrlGenerateResult{Result: result, Body: body, Http: http, Err: err, Error: error}
 }
 
@@ -73,5 +73,5 @@ func (c *Client) CmsPromUrlGenerate(notMustParams ...Params) *CmsPromUrlGenerate
 	err = json.Unmarshal(request.ResponseBody, &response)
 	var responseError CmsPromUrlGenerateError
 	err = json.Unmarshal(request.ResponseBody, &responseError)
-	return NewCmsPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError)
+	return newCmsPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError)
 }

service/pinduoduo/pdd.ddk.goods.detail.go

@@ -91,7 +91,7 @@ type GoodsDetailResult struct {
 	Err    error               // 错误
 }
 
-func NewGoodsDetailResult(result GoodsDetailResponse, body []byte, http gorequest.Response, err error) *GoodsDetailResult {
+func newGoodsDetailResult(result GoodsDetailResponse, body []byte, http gorequest.Response, err error) *GoodsDetailResult {
 	return &GoodsDetailResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -106,5 +106,5 @@ func (c *Client) GoodsDetail(notMustParams ...Params) *GoodsDetailResult {
 	// 定义
 	var response GoodsDetailResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsDetailResult(response, request.ResponseBody, request, err)
+	return newGoodsDetailResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.goods.pid.generate.go

@@ -24,7 +24,7 @@ type GoodsPidGenerateResult struct {
 	Err    error                    // 错误
 }
 
-func NewGoodsPidGenerateResult(result GoodsPidGenerateResponse, body []byte, http gorequest.Response, err error) *GoodsPidGenerateResult {
+func newGoodsPidGenerateResult(result GoodsPidGenerateResponse, body []byte, http gorequest.Response, err error) *GoodsPidGenerateResult {
 	return &GoodsPidGenerateResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -38,5 +38,5 @@ func (c *Client) GoodsPidGenerate(notMustParams ...Params) *GoodsPidGenerateResu
 	// 定义
 	var response GoodsPidGenerateResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsPidGenerateResult(response, request.ResponseBody, request, err)
+	return newGoodsPidGenerateResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.goods.promotion.url.generate.go

@@ -44,7 +44,7 @@ type GoodsPromotionUrlGenerateResult struct {
 	Err    error                             // 错误
 }
 
-func NewGoodsPromotionUrlGenerateResult(result GoodsPromotionUrlGenerateResponse, body []byte, http gorequest.Response, err error) *GoodsPromotionUrlGenerateResult {
+func newGoodsPromotionUrlGenerateResult(result GoodsPromotionUrlGenerateResponse, body []byte, http gorequest.Response, err error) *GoodsPromotionUrlGenerateResult {
 	return &GoodsPromotionUrlGenerateResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -59,5 +59,5 @@ func (c *Client) GoodsPromotionUrlGenerate(notMustParams ...Params) *GoodsPromot
 	// 定义
 	var response GoodsPromotionUrlGenerateResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsPromotionUrlGenerateResult(response, request.ResponseBody, request, err)
+	return newGoodsPromotionUrlGenerateResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.goods.recommend.get.go

@@ -73,7 +73,7 @@ type GoodsRecommendGetResult struct {
 	Err    error                     // 错误
 }
 
-func NewGoodsRecommendGetResult(result GoodsRecommendGetResponse, body []byte, http gorequest.Response, err error) *GoodsRecommendGetResult {
+func newGoodsRecommendGetResult(result GoodsRecommendGetResponse, body []byte, http gorequest.Response, err error) *GoodsRecommendGetResult {
 	return &GoodsRecommendGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -88,5 +88,5 @@ func (c *Client) GoodsRecommendGet(notMustParams ...Params) *GoodsRecommendGetRe
 	// 定义
 	var response GoodsRecommendGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsRecommendGetResult(response, request.ResponseBody, request, err)
+	return newGoodsRecommendGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.goods.search.go

@@ -87,7 +87,7 @@ type GoodsSearchResult struct {
 	Err    error               // 错误
 }
 
-func NewGoodsSearchResult(result GoodsSearchResponse, body []byte, http gorequest.Response, err error) *GoodsSearchResult {
+func newGoodsSearchResult(result GoodsSearchResponse, body []byte, http gorequest.Response, err error) *GoodsSearchResult {
 	return &GoodsSearchResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -102,5 +102,5 @@ func (c *Client) GoodsSearch(notMustParams ...Params) *GoodsSearchResult {
 	// 定义
 	var response GoodsSearchResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsSearchResult(response, request.ResponseBody, request, err)
+	return newGoodsSearchResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.member.authority.query.go

@@ -19,7 +19,7 @@ type MemberAuthorityQueryResult struct {
 	Err    error                        // 错误
 }
 
-func NewMemberAuthorityQueryResult(result MemberAuthorityQueryResponse, body []byte, http gorequest.Response, err error) *MemberAuthorityQueryResult {
+func newMemberAuthorityQueryResult(result MemberAuthorityQueryResponse, body []byte, http gorequest.Response, err error) *MemberAuthorityQueryResult {
 	return &MemberAuthorityQueryResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -34,5 +34,5 @@ func (c *Client) MemberAuthorityQuery(notMustParams ...Params) *MemberAuthorityQ
 	// 定义
 	var response MemberAuthorityQueryResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewMemberAuthorityQueryResult(response, request.ResponseBody, request, err)
+	return newMemberAuthorityQueryResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.order.detail.get.go

@@ -61,7 +61,7 @@ type OrderDetailGetResult struct {
 	Err    error                  // 错误
 }
 
-func NewOrderDetailGetResult(result OrderDetailGetResponse, body []byte, http gorequest.Response, err error) *OrderDetailGetResult {
+func newOrderDetailGetResult(result OrderDetailGetResponse, body []byte, http gorequest.Response, err error) *OrderDetailGetResult {
 	return &OrderDetailGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -76,5 +76,5 @@ func (c *Client) OrderDetailGet(orderSn string) *OrderDetailGetResult {
 	// 定义
 	var response OrderDetailGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewOrderDetailGetResult(response, request.ResponseBody, request, err)
+	return newOrderDetailGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.order.list.increment.get.go

@@ -65,7 +65,7 @@ type OrderListIncrementGetResult struct {
 	Err    error                         // 错误
 }
 
-func NewOrderListIncrementGetResult(result OrderListIncrementGetResponse, body []byte, http gorequest.Response, err error) *OrderListIncrementGetResult {
+func newOrderListIncrementGetResult(result OrderListIncrementGetResponse, body []byte, http gorequest.Response, err error) *OrderListIncrementGetResult {
 	return &OrderListIncrementGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -79,5 +79,5 @@ func (c *Client) OrderListIncrementGet(notMustParams ...Params) *OrderListIncrem
 	// 定义
 	var response OrderListIncrementGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewOrderListIncrementGetResult(response, request.ResponseBody, request, err)
+	return newOrderListIncrementGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.order.list.range.get.go

@@ -65,7 +65,7 @@ type OrderListRangeGetResult struct {
 	Err    error                     // 错误
 }
 
-func NewOrderListRangeGetResult(result OrderListRangeGetResponse, body []byte, http gorequest.Response, err error) *OrderListRangeGetResult {
+func newOrderListRangeGetResult(result OrderListRangeGetResponse, body []byte, http gorequest.Response, err error) *OrderListRangeGetResult {
 	return &OrderListRangeGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -79,5 +79,5 @@ func (c *Client) OrderListRangeGet(notMustParams ...Params) *OrderListRangeGetRe
 	// 定义
 	var response OrderListRangeGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewOrderListRangeGetResult(response, request.ResponseBody, request, err)
+	return newOrderListRangeGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.ddk.resource.url.gen.go

@@ -45,7 +45,7 @@ type ResourceUrlGenResult struct {
 	Error  ResourceUrlGenError    // 错误结果
 }
 
-func NewResourceUrlGenResult(result ResourceUrlGenResponse, body []byte, http gorequest.Response, err error, error ResourceUrlGenError) *ResourceUrlGenResult {
+func newResourceUrlGenResult(result ResourceUrlGenResponse, body []byte, http gorequest.Response, err error, error ResourceUrlGenError) *ResourceUrlGenResult {
 	return &ResourceUrlGenResult{Result: result, Body: body, Http: http, Err: err, Error: error}
 }
 
@@ -62,5 +62,5 @@ func (c *Client) ResourceUrlGen(notMustParams ...Params) *ResourceUrlGenResult {
 	err = json.Unmarshal(request.ResponseBody, &response)
 	var responseError ResourceUrlGenError
 	err = json.Unmarshal(request.ResponseBody, &responseError)
-	return NewResourceUrlGenResult(response, request.ResponseBody, request, err, responseError)
+	return newResourceUrlGenResult(response, request.ResponseBody, request, err, responseError)
 }

service/pinduoduo/pdd.ddk.rp.prom.url.generate.go

@@ -60,7 +60,7 @@ type RpPromUrlGenerateResult struct {
 	Error  RpPromUrlGenerateError    // 错误结果
 }
 
-func NewRpPromUrlGenerateResult(result RpPromUrlGenerateResponse, body []byte, http gorequest.Response, err error, error RpPromUrlGenerateError) *RpPromUrlGenerateResult {
+func newRpPromUrlGenerateResult(result RpPromUrlGenerateResponse, body []byte, http gorequest.Response, err error, error RpPromUrlGenerateError) *RpPromUrlGenerateResult {
 	return &RpPromUrlGenerateResult{Result: result, Body: body, Http: http, Err: err, Error: error}
 }
 
@@ -77,5 +77,5 @@ func (c *Client) RpPromUrlGenerate(notMustParams ...Params) *RpPromUrlGenerateRe
 	err = json.Unmarshal(request.ResponseBody, &response)
 	var responseError RpPromUrlGenerateError
 	err = json.Unmarshal(request.ResponseBody, &responseError)
-	return NewRpPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError)
+	return newRpPromUrlGenerateResult(response, request.ResponseBody, request, err, responseError)
 }

service/pinduoduo/pdd.ddk.top.goods.list.query.go

@@ -53,7 +53,7 @@ type TopGoodsListQueryResult struct {
 	Err    error                     // 错误
 }
 
-func NewTopGoodsListQueryResult(result TopGoodsListQueryResponse, body []byte, http gorequest.Response, err error) *TopGoodsListQueryResult {
+func newTopGoodsListQueryResult(result TopGoodsListQueryResponse, body []byte, http gorequest.Response, err error) *TopGoodsListQueryResult {
 	return &TopGoodsListQueryResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -68,5 +68,5 @@ func (c *Client) TopGoodsListQuery(notMustParams ...Params) *TopGoodsListQueryRe
 	// 定义
 	var response TopGoodsListQueryResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewTopGoodsListQueryResult(response, request.ResponseBody, request, err)
+	return newTopGoodsListQueryResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.goods.cats.get.go

@@ -23,7 +23,7 @@ type GoodsCatsGetResult struct {
 	Err    error                // 错误
 }
 
-func NewGoodsCatsGetResult(result GoodsCatsGetResponse, body []byte, http gorequest.Response, err error) *GoodsCatsGetResult {
+func newGoodsCatsGetResult(result GoodsCatsGetResponse, body []byte, http gorequest.Response, err error) *GoodsCatsGetResult {
 	return &GoodsCatsGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -39,5 +39,5 @@ func (c *Client) GoodsCatsGet(parentOptId int) *GoodsCatsGetResult {
 	// 定义
 	var response GoodsCatsGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsCatsGetResult(response, request.ResponseBody, request, err)
+	return newGoodsCatsGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/pdd.goods.opt.get.go

@@ -23,7 +23,7 @@ type GoodsOptGetResult struct {
 	Err    error               // 错误
 }
 
-func NewGoodsOptGetResult(result GoodsOptGetResponse, body []byte, http gorequest.Response, err error) *GoodsOptGetResult {
+func newGoodsOptGetResult(result GoodsOptGetResponse, body []byte, http gorequest.Response, err error) *GoodsOptGetResult {
 	return &GoodsOptGetResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -39,5 +39,5 @@ func (c *Client) GoodsOptGet(parentOptId int) *GoodsOptGetResult {
 	// 定义
 	var response GoodsOptGetResponse
 	err = json.Unmarshal(request.ResponseBody, &response)
-	return NewGoodsOptGetResult(response, request.ResponseBody, request, err)
+	return newGoodsOptGetResult(response, request.ResponseBody, request, err)
 }

service/pinduoduo/request.go

@@ -0,0 +1,31 @@
+package pinduoduo
+
+import (
+	"go.dtapp.net/library/utils/gorequest"
+	"go.dtapp.net/library/utils/gostring"
+)
+
+func (c *Client) request(params map[string]interface{}) (gorequest.Response, error) {
+
+	// 签名
+	c.Sign(params)
+
+	// 创建请求
+	client := c.client
+
+	// 设置参数
+	client.SetParams(params)
+
+	// 发起请求
+	request, err := client.Get()
+	if err != nil {
+		return gorequest.Response{}, err
+	}
+
+	// 日志
+	if c.logStatus == true {
+		go c.postgresqlLog(gostring.ToString(params["type"]), request)
+	}
+
+	return request, err
+}