This commit is contained in:
苏尹岚
2021-03-04 11:34:12 +08:00
parent c4650f5181
commit 54937a1e7b
2 changed files with 23 additions and 17 deletions

View File

@@ -112,29 +112,34 @@ func init() {
// 这样写的原因是在测试时,可以重新读取配置文件 // 这样写的原因是在测试时,可以重新读取配置文件
func Init() { func Init() {
if !beego.AppConfig.DefaultBool("disableJd", false) { if !beego.AppConfig.DefaultBool("disableJd", false) {
JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) //初始化京东api
// cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "") // JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
// JdAPI.SetJdCookie(cookieValue) JdAPI = jdapi.New("", "", "")
cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "")
JdAPI.SetJdCookie(cookieValue)
conf := platformapi.NewDefAPIConfig() conf := platformapi.NewDefAPIConfig()
conf.MaxSleepSecondWhenExceedLimit = 60 * 30 // 最大重试间隙30分钟 conf.MaxSleepSecondWhenExceedLimit = 60 * 30 // 最大重试间隙30分钟
JdPageAPI = jdapi.NewPageOnly("", conf) JdPageAPI = jdapi.NewPageOnly("", conf)
if globals.Jd2OrgCode != "" { if globals.Jd2OrgCode != "" {
Jd2API = jdapi.New(beego.AppConfig.String("jd2Token"), beego.AppConfig.String("jd2AppKey"), beego.AppConfig.String("jd2Secret")) // Jd2API = jdapi.New(beego.AppConfig.String("jd2Token"), beego.AppConfig.String("jd2AppKey"), beego.AppConfig.String("jd2Secret"))
// Jd2API.SetJdCookie(beego.AppConfig.DefaultString("jd2StorePageCookie", "")) Jd2API = jdapi.New("", "", "")
} }
if globals.Jd3OrgCode != "" { if globals.Jd3OrgCode != "" {
Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret")) // Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret"))
Jd3API = jdapi.New("", "", "")
} }
if globals.JdcsOrgCode != "" { if globals.JdcsOrgCode != "" {
JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret")) // JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret"))
JdAPI = jdapi.New("", "", "")
} }
if globals.JdydOrgCode != "" { if globals.JdydOrgCode != "" {
JdydAPI = jdapi.New(beego.AppConfig.String("jdydToken"), beego.AppConfig.String("jdydAppKey"), beego.AppConfig.String("jdydSecret")) // JdydAPI = jdapi.New(beego.AppConfig.String("jdydToken"), beego.AppConfig.String("jdydAppKey"), beego.AppConfig.String("jdydSecret"))
JdAPI = jdapi.New("", "", "")
} }
fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "") fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "")

View File

@@ -1,9 +1,11 @@
package apimanager package apimanager
import ( import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/jx-callback/business/jxutils" "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/jxcontext"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
@@ -32,19 +34,18 @@ func init() {
} }
func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) { func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) {
var (
db = dao.GetDB()
)
switch vendorID { switch vendorID {
case model.VendorIDJD: case model.VendorIDJD:
pfAPI = api.JdAPI
if appOrgCode == FakeJdOrgCode { if appOrgCode == FakeJdOrgCode {
pfAPI = api.FakeJdAPI pfAPI = api.FakeJdAPI
} else if appOrgCode != "" && appOrgCode == globals.Jd2OrgCode { } else {
pfAPI = api.Jd2API codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform")
} else if appOrgCode != "" && appOrgCode == globals.Jd3OrgCode { code := codes[0]
pfAPI = api.Jd3API api.JdAPI = jdapi.New(code.Token, code.AppKey, code.AppSecret)
} else if appOrgCode != "" && appOrgCode == globals.JdcsOrgCode { pfAPI = api.JdAPI
pfAPI = api.JdcsAPI
} else if appOrgCode != "" && appOrgCode == globals.JdydOrgCode {
pfAPI = api.JdydAPI
} }
case model.VendorIDMTWM: case model.VendorIDMTWM:
pfAPI = api.MtwmAPI pfAPI = api.MtwmAPI