From ed410ebb7fa30b5c57f1f08a87d14a17a795d4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 14 Apr 2021 16:30:08 +0800 Subject: [PATCH] aa --- business/jxstore/partner/mt/mt.go | 8 +++-- globals/api/api.go | 57 ++----------------------------- 2 files changed, 9 insertions(+), 56 deletions(-) diff --git a/business/jxstore/partner/mt/mt.go b/business/jxstore/partner/mt/mt.go index bd10a0160..3a7bc3e7e 100644 --- a/business/jxstore/partner/mt/mt.go +++ b/business/jxstore/partner/mt/mt.go @@ -1,6 +1,10 @@ package mt -func getAPI() (err error) { +import ( + "git.rosy.net.cn/baseapi/platformapi/mtunionapi" +) - return err +func getAPI() (apiobj *mtunionapi.API, err error) { + + return apiobj, err } diff --git a/globals/api/api.go b/globals/api/api.go index 18addeeb9..655e81517 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -2,7 +2,6 @@ package api import ( "io/ioutil" - "time" "git.rosy.net.cn/baseapi/platformapi/mtunionapi" @@ -19,20 +18,17 @@ import ( "git.rosy.net.cn/baseapi/platformapi/aliupcapi" "git.rosy.net.cn/baseapi/platformapi/jdeclpapi" - "git.rosy.net.cn/baseapi/platformapi/yinbaoapi" "git.rosy.net.cn/baseapi/platformapi/tonglianpayapi" aliyunsmsclient "github.com/KenmyZhang/aliyun-communicate" - "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/platformapi/alipayapi" "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/baidunavi" "git.rosy.net.cn/baseapi/platformapi/dadaapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi" - "git.rosy.net.cn/baseapi/platformapi/elmapi" "git.rosy.net.cn/baseapi/platformapi/feieapi" "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" @@ -53,6 +49,8 @@ import ( ) var ( + MtUnionAPI *mtunionapi.API + JdAPI *jdapi.API JdPageAPI *jdapi.API @@ -62,7 +60,6 @@ var ( JdEclpAPI *jdeclpapi.API JdShopAPI *jdshopapi.API - ElmAPI *elmapi.API EbaiAPI *ebaiapi.API Ebai2API *ebaiapi.API @@ -78,8 +75,6 @@ var ( TLpayAPI *tonglianpayapi.API //通联收银宝api MtMemberAPI *mtmemberapi.API - YinBaoAPI *yinbaoapi.API //银豹平台api - WeixinPageAPI *weixinapi.API // 用户微信扫码登录 AliPayAPI *alipayapi.API @@ -105,8 +100,6 @@ var ( Cacher cache.ICacher SMSClient *aliyunsmsclient.SmsClient - - MtUnionAPI *mtunionapi.API ) func init() { @@ -115,31 +108,7 @@ func init() { // 这样写的原因是在测试时，可以重新读取配置文件 func Init() { - if !beego.AppConfig.DefaultBool("disableJd", false) { - JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) - // cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "") - // JdAPI.SetJdCookie(cookieValue) - - conf := platformapi.NewDefAPIConfig() - conf.MaxSleepSecondWhenExceedLimit = 60 * 30 // 最大重试间隙30分钟 - JdPageAPI = jdapi.NewPageOnly("", conf) - - if globals.Jd2OrgCode != "" { - Jd2API = jdapi.New(beego.AppConfig.String("jd2Token"), beego.AppConfig.String("jd2AppKey"), beego.AppConfig.String("jd2Secret")) - // Jd2API.SetJdCookie(beego.AppConfig.DefaultString("jd2StorePageCookie", "")) - } - - if globals.Jd3OrgCode != "" { - Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret")) - } - - fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "") - if fakeJdToken != "" { - FakeJdAPI = jdapi.NewFakeJD(fakeJdToken, beego.AppConfig.String("fakeJdBaseURL")) - } - } else { - JdAPI = nil - } + MtUnionAPI = mtunionapi.New(beego.AppConfig.DefaultString("mtUnionAppKey", ""), beego.AppConfig.DefaultString("mtUnionAppSecret", "")) if !beego.AppConfig.DefaultBool("disableJdEclp", false) { JdEclpAPI = jdeclpapi.New(beego.AppConfig.String("jdEclpAccessToken"), beego.AppConfig.String("jdEclpAppKey"), beego.AppConfig.String("jdEclpAppSecret")) } else { @@ -153,11 +122,6 @@ func Init() { } else { JdShopAPI = nil } - if !beego.AppConfig.DefaultBool("disableElm", false) { - ElmAPI = elmapi.New(beego.AppConfig.DefaultString("elmToken", ""), beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false)) - } else { - ElmAPI = nil - } if !beego.AppConfig.DefaultBool("disableMtwm", false) { MtwmAPI = mtwmapi.New(beego.AppConfig.String("mtwmAppID"), beego.AppConfig.String("mtwmSecret"), beego.AppConfig.String("mtwmCallbackURL"), "") // if mtwmCookieStr := beego.AppConfig.DefaultString("mtwmCookieStr", ""); mtwmCookieStr != "" { @@ -166,14 +130,6 @@ func Init() { } else { MtwmAPI = nil } - if !beego.AppConfig.DefaultBool("disableWeimob", false) { - //微盟上传大图片耗时较长 - weimobAPIConfig := platformapi.DefAPIConfig - weimobAPIConfig.ClientTimeout = 120 * time.Second - WeimobAPI = weimobapi.New(nil, beego.AppConfig.DefaultString("weimobAppID", ""), beego.AppConfig.DefaultString("weimobAppSecret", ""), &weimobAPIConfig) - } else { - WeimobAPI = nil - } if !beego.AppConfig.DefaultBool("disableEbai", false) { EbaiAPI = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) // ebaiStorePageCookieWMUSS := beego.AppConfig.DefaultString("ebaiStorePageCookieWMUSS", "") @@ -197,12 +153,6 @@ func Init() { Ebai2API = nil } - if !beego.AppConfig.DefaultBool("disableYb", false) { - YinBaoAPI = yinbaoapi.New(beego.AppConfig.String("yinbaoAppKey"), beego.AppConfig.String("yinbaoAppID")) - } else { - YinBaoAPI = nil - } - if !beego.AppConfig.DefaultBool("disableMtps", false) { MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret")) // if mtpsStoreToken := beego.AppConfig.DefaultString("mtpsStoreToken", ""); mtpsStoreToken != "" { @@ -264,5 +214,4 @@ func Init() { PushAPI = unipushapi.New(beego.AppConfig.DefaultString("pushAppID", ""), beego.AppConfig.DefaultString("pushAppKey", ""), beego.AppConfig.DefaultString("pushAppSecret", ""), beego.AppConfig.DefaultString("pushMasterSecret", "")) MtMemberAPI = mtmemberapi.New() SMSClient = aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/") - MtUnionAPI = mtunionapi.New(beego.AppConfig.DefaultString("mtUnionAppKey", ""), beego.AppConfig.DefaultString("mtUnionAppSecret", "")) }