From 6d787cd1a141b05b543308cdbf7c445b9530936c Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 23 Apr 2019 21:37:12 +0800 Subject: [PATCH] =?UTF-8?q?-=20api.init=E4=B8=AD=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=B0=83=E7=94=A8api.Init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.conf | 32 +++++++++++++++++++---- globals/api/api.go | 63 ++++++++++++++++++++++++++++++---------------- main.go | 1 - 3 files changed, 69 insertions(+), 27 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index 09e55aa5a..cb2ffd3fa 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -142,6 +142,33 @@ dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_Jtv dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" +[jxgy] +dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxgy?charset=utf8mb4&loc=Local&parseTime=true" + +jdToken = "b9f98667-9856-45e9-a31c-9a8862b1bfde" +jdAppKey = "5d5577a2506f41b8b4ec520ba83490f5" +jdSecret = "0b01b9eeb15b41dab1c3d05d95c17a26" + +disableEbai = true +disableElm = true +disableMtwm = true +disableWeimob = true + +enableStoreWrite = true + +mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605" +mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE" + +dadaIsProd = true +dadaCallbackURL = "http://callback.jxc4.com/dadadelivery/msg" +dadaSourceID = "6660" + +dingdingAgentID = 239461075 +dingdingAppKey = "ding7iu9cptairtcls0c" +dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_JtvsI" + +dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" + [prod2] httpport = 8082 @@ -211,11 +238,6 @@ jdToken = "df97f334-f7d8-4b36-9664-5784d8ae0baf" jdAppKey = "06692746f7224695ad4788ce340bc854" jdSecret = "d6b42a35a7414a5490d811654d745c84" -# jxgy -# jdToken = "b9f98667-9856-45e9-a31c-9a8862b1bfde" -# jdAppKey = "5d5577a2506f41b8b4ec520ba83490f5" -# jdSecret = "0b01b9eeb15b41dab1c3d05d95c17a26" - elmIsProd = false elmToken = "2d2b583447b04b6bba5a6f3faed3559b" elmAppKey = "RwT214gAsS" diff --git a/globals/api/api.go b/globals/api/api.go index a5a55d9e3..fd0dff206 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -52,21 +52,59 @@ var ( Cacher cache.ICacher ) +func init() { + Init() // 这里必须要调用 +} + +// 这样写的原因是在测试时，可以重新读取配置文件 func Init() { if !beego.AppConfig.DefaultBool("disableJd", false) { JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) JdAPI.SetStoreCookie(beego.AppConfig.DefaultString("jdStorePageCookie", "")) + } else { + JdAPI = nil } if !beego.AppConfig.DefaultBool("disableElm", false) { - initElm() + 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")) + } 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", "") + ebaiStorePageCookieWMSTOKEN := beego.AppConfig.DefaultString("ebaiStorePageCookieWMSTOKEN", "") + if ebaiStorePageCookieWMUSS != "" && ebaiStorePageCookieWMSTOKEN != "" { + EbaiAPI.SetStoreCookie("WMUSS", ebaiStorePageCookieWMUSS) + EbaiAPI.SetStoreCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) + } + } else { + EbaiAPI = nil + } + if !beego.AppConfig.DefaultBool("disableMtps", false) { MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret")) + } else { + MtpsAPI = nil } - MtwmAPI = mtwmapi.New(beego.AppConfig.String("mtwmAppID"), beego.AppConfig.String("mtwmSecret"), beego.AppConfig.String("mtwmCallbackURL")) if !beego.AppConfig.DefaultBool("disableDada", false) { DadaAPI = dadaapi.New(beego.AppConfig.String("dadaAppKey"), beego.AppConfig.String("dadaAppSecret"), beego.AppConfig.String("dadaSourceID"), beego.AppConfig.String("dadaCallbackURL"), beego.AppConfig.DefaultBool("dadaIsProd", false)) + } else { + DadaAPI = nil } + if !beego.AppConfig.DefaultBool("disableWeixin", false) { WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret")) // 这个主要是用于调试阶段使用，生产环境中用的是自动刷新那套 @@ -76,29 +114,17 @@ func Init() { if weixinMsgToken := beego.AppConfig.DefaultString("weixinMsgToken", ""); weixinMsgToken != "" { WeixinAPI.SetMsgTokenAndKey(weixinMsgToken, beego.AppConfig.DefaultString("weixinMsgKey", "")) } + } else { + WeimobAPI = nil } WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret")) WeixinPageAPI = weixinapi.New(beego.AppConfig.String("weixinPageAppID"), beego.AppConfig.String("weixinPageSecret")) AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey")) QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK")) - if !beego.AppConfig.DefaultBool("disableEbai", false) { - EbaiAPI = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) - ebaiStorePageCookieWMUSS := beego.AppConfig.DefaultString("ebaiStorePageCookieWMUSS", "") - ebaiStorePageCookieWMSTOKEN := beego.AppConfig.DefaultString("ebaiStorePageCookieWMSTOKEN", "") - if ebaiStorePageCookieWMUSS != "" && ebaiStorePageCookieWMSTOKEN != "" { - EbaiAPI.SetStoreCookie("WMUSS", ebaiStorePageCookieWMUSS) - EbaiAPI.SetStoreCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) - } - } ShowAPI = showapi.New(beego.AppConfig.DefaultInt("showAppID", 0), beego.AppConfig.DefaultString("showAppSecret", "")) Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "localhost"), beego.AppConfig.DefaultInt("redisPort", 0), beego.AppConfig.DefaultString("redisPassword", "")) - //微盟上传大图片耗时较长 - weimobAPIConfig := platformapi.DefAPIConfig - weimobAPIConfig.ClientTimeout = 120 * time.Second - WeimobAPI = weimobapi.New(nil, beego.AppConfig.DefaultString("weimobAppID", ""), beego.AppConfig.DefaultString("weimobAppSecret", ""), &weimobAPIConfig) - DingDingAPI = dingdingapi.NewWithAgentID(beego.AppConfig.DefaultInt64("dingdingAgentID", 0), beego.AppConfig.DefaultString("dingdingCorpID", ""), beego.AppConfig.DefaultString("dingdingAppKey", ""), beego.AppConfig.DefaultString("dingdingSecret", "")) DingDingQRCodeAPI = dingdingapi.New(beego.AppConfig.DefaultString("dingdingCorpID", ""), beego.AppConfig.DefaultString("dingdingQRCodeAppKey", ""), beego.AppConfig.DefaultString("dingdingQRCodeSecret", "")) @@ -107,8 +133,3 @@ func Init() { YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) ZhongwuAPI = zhongwuapi.New(beego.AppConfig.DefaultInt("zhongwuAppID", 0), beego.AppConfig.DefaultString("zhongwuAppSecret", "")) } - -func initElm() { - token := beego.AppConfig.DefaultString("elmToken", "") - ElmAPI = elmapi.New(token, beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false)) -} diff --git a/main.go b/main.go index c9a3957ef..f29cd7676 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,6 @@ var ( func Init() { beegodb.Init() - api.Init() defsch.Init() buildTime, err := time.ParseInLocation(time.RFC3339, BuildDate, time.UTC) if err == nil {