银豹切换cookie移到cms中

This commit is contained in:
苏尹岚
2020-03-30 15:45:24 +08:00
parent 338c414169
commit bca6ca821a
2 changed files with 37 additions and 18 deletions

View File

@@ -2920,7 +2920,7 @@ func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err er
yinbaoCookie = configs[0].Value
}
api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
result, err := api.YinBaoAPI.LoadSubStoresByUserIdDDLJson()
result, err := loadSubStoresByUserIdDDLJson()
if err != nil {
return err
}
@@ -2949,3 +2949,33 @@ func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err er
}
return err
}
func loadSubStoresByUserIdDDLJson() (result []*yinbaoapi.LoadSubStoresByUserIdDDLJsonResult, err error) {
for {
result, err = api.YinBaoAPI.LoadSubStoresByUserIdDDLJson()
if err == nil {
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = ChangeYbCookie()
if err != nil {
break
}
result, err = loadSubStoresByUserIdDDLJson()
} else {
break
}
}
}
return result, err
}
func ChangeYbCookie() (err error) {
cookie, err := api.YinBaoAPI.TryGetCookie()
if err != nil {
return err
}
api.YinBaoAPI.SetCookie(".POSPALAUTH30220", cookie)
UpdateConfig(jxcontext.AdminCtx, "yinbaoCookie", model.ConfigTypeCookie, cookie)
return err
}

View File

@@ -3,10 +3,9 @@ package yb
import (
"regexp"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -173,7 +172,7 @@ func loadCategorysWithOption(vendorStoreID string) (remoteCats []*yinbaoapi.Load
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = changeYbCookie()
err = cms.ChangeYbCookie()
if err != nil {
break
}
@@ -208,7 +207,7 @@ func addNewCategory(vendorStoreID, catName, parentCatName string) (vendorCatID s
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = changeYbCookie()
err = cms.ChangeYbCookie()
if err != nil {
break
}
@@ -239,7 +238,7 @@ func updateCategory(vendorStoreID, vendorCatID, catName, parentCatName string) (
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = changeYbCookie()
err = cms.ChangeYbCookie()
if err != nil {
break
}
@@ -266,7 +265,7 @@ func deleteCategory(vendorStoreID string, vendorCatIDs []string) (err error) {
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = changeYbCookie()
err = cms.ChangeYbCookie()
if err != nil {
break
}
@@ -420,7 +419,7 @@ func updateYbSkuPluCode(vendorStoreID, ybBarCode string) (err error) {
break
} else {
if yinbaoapi.IsErrCookie(err) {
err = changeYbCookie()
err = cms.ChangeYbCookie()
if err != nil {
break
}
@@ -432,13 +431,3 @@ func updateYbSkuPluCode(vendorStoreID, ybBarCode string) (err error) {
}
return err
}
func changeYbCookie() (err error) {
cookie, err := api.YinBaoAPI.TryGetCookie()
if err != nil {
return err
}
api.YinBaoAPI.SetCookie(".POSPALAUTH30220", cookie)
cms.UpdateConfig(jxcontext.AdminCtx, "yinbaoCookie", model.ConfigTypeCookie, cookie)
return err
}