diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 8e3db4864..3f361e09b 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "git.rosy.net.cn/baseapi/platformapi/mtunionapi" + "git.rosy.net.cn/baseapi/platformapi/tbunionapi" "reflect" "regexp" "strconv" @@ -101,6 +102,9 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) { model.VendorIDMTWM: map[int]interface{}{ mtunionapi.ActTypeQB: "券包推广", }, + model.VendorIDTB: map[int]interface{}{ + tbunionapi.TbElmActTypeBDH: "本地化", + }, }, }, } diff --git a/business/jxstore/partner/taobao/taobao.go b/business/jxstore/partner/taobao/taobao.go index 2f953b748..90a1a457a 100644 --- a/business/jxstore/partner/taobao/taobao.go +++ b/business/jxstore/partner/taobao/taobao.go @@ -1 +1,27 @@ package taobao + +import ( + "git.rosy.net.cn/baseapi/platformapi/tbunionapi" + "git.rosy.net.cn/jx-callback/business/jxstore/partner" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals/api" +) + +type UnionHandler struct { +} + +var ( + unionHandler *UnionHandler +) + +func init() { + partner.HandlerMap[model.VendorIDTB] = unionHandler +} + +func getAPI() (apiobj *tbunionapi.API) { + if configs, err := dao.QueryConfigs(dao.GetDB(), "tbunionCookie", model.ConfigTypeCookie, ""); err == nil { + api.TbUnionAPI.SetCookieWithStr(configs[0].Value) + } + return api.TbUnionAPI +} diff --git a/business/jxstore/partner/taobao/union.go b/business/jxstore/partner/taobao/union.go new file mode 100644 index 000000000..b5fa29701 --- /dev/null +++ b/business/jxstore/partner/taobao/union.go @@ -0,0 +1,30 @@ +package taobao + +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxstore/partner" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" +) + +func (s *UnionHandler) ShareUnionLink(ctx *jxcontext.Context, linkType, unionActID int, userID string) (link string, err error) { + return link, err +} + +func (s *UnionHandler) GetUnionActList(ctx *jxcontext.Context, actType int) (actList []*partner.ActivityList, err error) { + if result, err2 := getAPI().GatewayUnionpub(); err2 == nil { + for _, v := range result { + act := &partner.ActivityList{ + ActID: utils.Str2Int(v.Eventid), + ActName: v.Pagename, + ActDes: v.Eventenname, + Ratio: "6%", + ActSrc: v.Pageurl, + Img: v.Pagepicturl, + DateBegin: utils.Str2Time(v.Pagestarttime), + DateEnd: utils.Str2Time(v.Pageendtime), + } + actList = append(actList, act) + } + } + return actList, err +} diff --git a/conf/app.conf b/conf/app.conf index ccca12ea5..f39383160 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -263,4 +263,7 @@ txCloudSecretID = "AKIDFNmm1U7vhITlVItry0ng5Q268lGjDZyQUR6" txCloudSecretKey = "25p3aynr97hOMJEfpvr0LoXD0gI62l7wcHA7nsM6" mtUnionAppKey = "b6481f92b47918cd6e42e7ea4fae6084" -mtUnionAppSecret = "84d390777ddf691ff092e744ba26bfdd" \ No newline at end of file +mtUnionAppSecret = "84d390777ddf691ff092e744ba26bfdd" + +tbUnionAppKey = "32724809" +tbUnionAppSecret = "2c2bce02eab860d486f68aa59a0127d9" \ No newline at end of file diff --git a/globals/api/api.go b/globals/api/api.go index 655e81517..e3fd20d2e 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -1,6 +1,7 @@ package api import ( + "git.rosy.net.cn/baseapi/platformapi/tbunionapi" "io/ioutil" "git.rosy.net.cn/baseapi/platformapi/mtunionapi" @@ -26,20 +27,13 @@ import ( "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/feieapi" - "git.rosy.net.cn/baseapi/platformapi/jdapi" - "git.rosy.net.cn/baseapi/platformapi/mtpsapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/showapi" "git.rosy.net.cn/baseapi/platformapi/weimobapi" "git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/baseapi/platformapi/wxpayapi" - "git.rosy.net.cn/baseapi/platformapi/xiaowmapi" - "git.rosy.net.cn/baseapi/platformapi/yilianyunapi" - "git.rosy.net.cn/baseapi/platformapi/zhongwuapi" "git.rosy.net.cn/jx-callback/business/jxutils/cache" "git.rosy.net.cn/jx-callback/business/jxutils/cache/redis" "git.rosy.net.cn/jx-callback/globals" @@ -50,22 +44,14 @@ import ( var ( MtUnionAPI *mtunionapi.API + TbUnionAPI *tbunionapi.API - JdAPI *jdapi.API - JdPageAPI *jdapi.API - - Jd2API *jdapi.API - Jd3API *jdapi.API - FakeJdAPI *jdapi.API JdEclpAPI *jdeclpapi.API JdShopAPI *jdshopapi.API - EbaiAPI *ebaiapi.API - Ebai2API *ebaiapi.API + EbaiAPI *ebaiapi.API MtwmAPI *mtwmapi.API - MtpsAPI *mtpsapi.API - DadaAPI *dadaapi.API WeixinAPI *weixinapi.API // 微信公众号 WeixinMiniAPI *weixinapi.API // 小程序 WeixinApp *weixinapi.API // app微信登录 @@ -90,12 +76,6 @@ var ( AliUpcAPI *aliupcapi.API //阿里商品条码查询api EjyAPI *ejyapi.API //易加油 - FeieAPI *feieapi.API - XiaoWMAPI *xiaowmapi.API - YilianyunAPI *yilianyunapi.API - YilianyunAPI2 *yilianyunapi.API - ZhongwuAPI *zhongwuapi.API - PushAPI *unipushapi.API Cacher cache.ICacher @@ -109,6 +89,8 @@ func init() { // 这样写的原因是在测试时，可以重新读取配置文件 func Init() { MtUnionAPI = mtunionapi.New(beego.AppConfig.DefaultString("mtUnionAppKey", ""), beego.AppConfig.DefaultString("mtUnionAppSecret", "")) + TbUnionAPI = tbunionapi.New(beego.AppConfig.DefaultString("tbUnionAppKey", ""), beego.AppConfig.DefaultString("tbUnionAppSecret", "")) + if !beego.AppConfig.DefaultBool("disableJdEclp", false) { JdEclpAPI = jdeclpapi.New(beego.AppConfig.String("jdEclpAccessToken"), beego.AppConfig.String("jdEclpAppKey"), beego.AppConfig.String("jdEclpAppSecret")) } else { @@ -130,42 +112,6 @@ func Init() { } else { MtwmAPI = 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", "") - // ebaiStorePageCookieExdTOKEN := beego.AppConfig.DefaultString("ebaiStorePageCookieExdTOKEN", "") - // if ebaiStorePageCookieWMUSS != "" && ebaiStorePageCookieWMSTOKEN != "" && ebaiStorePageCookieExdTOKEN != "" { - // EbaiAPI.SetCookie("WMUSS", ebaiStorePageCookieWMUSS) - // EbaiAPI.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) - // EbaiAPI.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) - // } - Ebai2API = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) - // ebaiStorePageCookieWMUSS2 := beego.AppConfig.DefaultString("ebaiStorePageCookieWMUSS2", "") - // ebaiStorePageCookieWMSTOKEN2 := beego.AppConfig.DefaultString("ebaiStorePageCookieWMSTOKEN2", "") - // if ebaiStorePageCookieWMUSS2 != "" && ebaiStorePageCookieWMSTOKEN2 != "" && ebaiStorePageCookieExdTOKEN != "" { - // Ebai2API.SetCookie("WMUSS", ebaiStorePageCookieWMUSS2) - // Ebai2API.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN2) - // Ebai2API.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) - // } - } else { - EbaiAPI = nil - Ebai2API = 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 != "" { - // MtpsAPI.SetCookie("token", mtpsStoreToken) - // } - } else { - MtpsAPI = nil - } - 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("weixinID"), beego.AppConfig.String("weixinSecret")) @@ -206,11 +152,6 @@ func Init() { AliPayAPI = alipayapi.New(alipayAppID, []byte(beego.AppConfig.String("alipayPrivateKey"))) } EjyAPI = ejyapi.New(beego.AppConfig.DefaultString("ejyPlatName", ""), beego.AppConfig.DefaultString("ejyBeforeKey", ""), beego.AppConfig.DefaultString("ejyAfterKey", "")) - FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) - XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) - YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) - YilianyunAPI2 = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID2", ""), beego.AppConfig.DefaultString("yilianyunClientSecret2", "")) - ZhongwuAPI = zhongwuapi.New(beego.AppConfig.DefaultInt("zhongwuAppID", 0), beego.AppConfig.DefaultString("zhongwuAppSecret", "")) 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/")