From 938b28e5a83f5522e0014f843f8233491a8a59e6 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 10 Sep 2019 14:22:49 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=86=85=E5=B5=8CAPICookie=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/ebaiapi/ebaiapi.go | 13 ++++--------- platformapi/ebaiapi/shop_sku_test.go | 4 ++-- platformapi/jdapi/jdapi.go | 4 ---- platformapi/jdapi/jdapi_test.go | 2 +- platformapi/jdapi/store_page_test.go | 10 +++++----- platformapi/mtwmapi/mtwmapi.go | 6 ------ platformapi/platformapi_cookie.go | 18 +++++++++--------- 7 files changed, 21 insertions(+), 36 deletions(-) diff --git a/platformapi/ebaiapi/ebaiapi.go b/platformapi/ebaiapi/ebaiapi.go index b3b5f50b..78bdfe8a 100644 --- a/platformapi/ebaiapi/ebaiapi.go +++ b/platformapi/ebaiapi/ebaiapi.go @@ -7,7 +7,6 @@ import ( "net/url" "sort" "strings" - "sync" "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/platformapi" @@ -43,9 +42,6 @@ type API struct { config *platformapi.APIConfig speedLimiter *platformapi.Limiter supplierID int64 - - locker sync.RWMutex - storeCookies map[string]string } func New(source, secret string, config ...*platformapi.APIConfig) *API { @@ -60,7 +56,6 @@ func New(source, secret string, config ...*platformapi.APIConfig) *API { client: &http.Client{Timeout: curConfig.ClientTimeout}, config: &curConfig, speedLimiter: platformapi.New(apiLimitConfigs, nil), //defaultAPILimitConfig), - storeCookies: make(map[string]string), supplierID: -1, } @@ -155,12 +150,12 @@ func (a *API) AccessAPI(cmd string, body map[string]interface{}) (retVal *Respon } func (a *API) GetSupplierID() (supplierID int64) { - a.locker.RLock() + a.RLock() supplierID = a.supplierID - a.locker.RUnlock() + a.RUnlock() if supplierID < 0 { - a.locker.Lock() - defer a.locker.Unlock() + a.Lock() + defer a.Unlock() a.supplierID = 0 if shopList, err := a.ShopList(SysStatusAll); err == nil { diff --git a/platformapi/ebaiapi/shop_sku_test.go b/platformapi/ebaiapi/shop_sku_test.go index d55f5e58..c9649afa 100644 --- a/platformapi/ebaiapi/shop_sku_test.go +++ b/platformapi/ebaiapi/shop_sku_test.go @@ -16,7 +16,7 @@ func TestShopCategoryCreate(t *testing.T) { } func TestShopCategoryGet(t *testing.T) { - result, err := api.ShopCategoryGet("102493") + result, err := api.ShopCategoryGet("300034") if err != nil { t.Fatal(err) } else { @@ -69,7 +69,7 @@ func TestSkuUploadRTF(t *testing.T) { } func TestSkuCreate(t *testing.T) { - result, err := api.SkuCreate(testShopID, 17, map[string]interface{}{ + result, err := api.SkuCreate("", testShopID, 17, map[string]interface{}{ "name": "测试商品", "status": SkuStatusOnline, "left_num": MaxLeftNum, diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index c6cbe5e4..a2afb720 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -7,7 +7,6 @@ import ( "net/http" "sort" "strings" - "sync" "git.rosy.net.cn/baseapi" @@ -66,9 +65,6 @@ type API struct { appSecret string client *http.Client config *platformapi.APIConfig - - locker sync.RWMutex - storeCookie string } var ( diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 40b459f9..957260c2 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -27,7 +27,7 @@ func init() { // 天天果园 // api = New("84541069-fbe2-424b-b625-9b2ba1d4c9e6", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") - const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHDYZP7PPVMRGO4VWG2JRBMKFTOGIWZ5L2XHXC3SXQ4OLX7EL4RKUPZQT6GOH63KE3EVK37L5LG7TGSDGXFQP4377YK72UB5YZG6IJH6PY25YLLCJYPMDSHKPGYBUFJ4MMMKGN6MWB37CP7XVDBBZJ3U462ENTEXH744AWCQCIG2AAE2PKYVHC" + const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHCT3RM3CQG7IJIPUQ3THS5UIUYWMKINM7ETUOQB7OBPOPZVCT3ZJY55243TDVXLO25PP4UYSPTTPMNQ7HPMWOJKJ3BJWGVHD243MXH7NZWW264TKN5UOCJBSSSOKD2QQII" api.SetCookie(accessStorePageCookieName, cookieValue) api.SetCookie(accessStorePageCookieName2, cookieValue) } diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index c137ee02..cc2f4045 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -8,9 +8,9 @@ import ( ) func TestGetRealMobileNumber4Order(t *testing.T) { - orderId := "910170516000941" - desiredMobile := "13398196274" - mobile, err := api.GetRealMobile4Order(orderId, "") + orderId := "921823424000122" + desiredMobile := "13722455105" + mobile, err := api.GetRealMobile4Order(orderId, "11893205") if err != nil { t.Fatal(err) } @@ -21,8 +21,8 @@ func TestGetRealMobileNumber4Order(t *testing.T) { } func TestGetStoreOrderInfo(t *testing.T) { - orderId := "910170516000941" - orderInfo, err := api.GetStoreOrderInfo(orderId, "") + orderId := "921823424000122" + orderInfo, err := api.GetStoreOrderInfo(orderId, "11893205") if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/mtwmapi.go b/platformapi/mtwmapi/mtwmapi.go index 0a1adc1a..972f3261 100644 --- a/platformapi/mtwmapi/mtwmapi.go +++ b/platformapi/mtwmapi/mtwmapi.go @@ -9,7 +9,6 @@ import ( "net/url" "sort" "strings" - "sync" "time" "git.rosy.net.cn/baseapi" @@ -60,9 +59,6 @@ type API struct { callbackURL string client *http.Client config *platformapi.APIConfig - - locker sync.RWMutex - userCookies map[string]string } var ( @@ -85,8 +81,6 @@ func New(appID, secret, callbackURL string, config ...*platformapi.APIConfig) *A callbackURL: callbackURL, client: &http.Client{Timeout: curConfig.ClientTimeout}, config: &curConfig, - - userCookies: make(map[string]string), } } diff --git a/platformapi/platformapi_cookie.go b/platformapi/platformapi_cookie.go index 90a7bd9b..e6dd8998 100644 --- a/platformapi/platformapi_cookie.go +++ b/platformapi/platformapi_cookie.go @@ -11,7 +11,7 @@ import ( ) type APICookie struct { - locker sync.RWMutex + sync.RWMutex storeCookies map[string]string } @@ -44,28 +44,28 @@ func (a *APICookie) SetCookieWithStr(cookieStr string) { } func (a *APICookie) SetCookie(key, value string) { - a.locker.Lock() - defer a.locker.Unlock() + a.Lock() + defer a.Unlock() a.createMapIfNeeded() a.storeCookies[key] = value } func (a *APICookie) GetCookie(key string) string { - a.locker.RLock() - defer a.locker.RUnlock() + a.RLock() + defer a.RUnlock() a.createMapIfNeeded() return a.storeCookies[key] } func (a *APICookie) GetCookieCount() int { - a.locker.RLock() - defer a.locker.RUnlock() + a.RLock() + defer a.RUnlock() return len(a.storeCookies) } func (a *APICookie) FillRequestCookies(r *http.Request) *http.Request { - a.locker.RLock() - defer a.locker.RUnlock() + a.RLock() + defer a.RUnlock() for k, v := range a.storeCookies { r.AddCookie(&http.Cookie{ Name: k,