Merge remote-tracking branch 'origin/jdshop' into jxact

globals/api/api.go

@@ -3,6 +3,8 @@ package api
 import (
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/unipushapi"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
 	"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
@@ -46,6 +48,7 @@ var (
 	JdPageAPI *jdapi.API
 
 	Jd2API    *jdapi.API
+	Jd3API    *jdapi.API
 	FakeJdAPI *jdapi.API
 	JdEclpAPI *jdeclpapi.API
 	JdShopAPI *jdshopapi.API
@@ -87,6 +90,8 @@ var (
 	YilianyunAPI2 *yilianyunapi.API
 	ZhongwuAPI    *zhongwuapi.API
 
+	PushAPI *unipushapi.API
+
 	Cacher    cache.ICacher
 	SMSClient *aliyunsmsclient.SmsClient
 )
@@ -111,6 +116,10 @@ func Init() {
 			// 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"))
@@ -243,6 +252,7 @@ func Init() {
 	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", ""))
 
 	SMSClient = aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
 }

globals/api/apimanager/apimanager.go

@@ -39,6 +39,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 			pfAPI = api.FakeJdAPI
 		} else if appOrgCode != "" && appOrgCode == globals.Jd2OrgCode {
 			pfAPI = api.Jd2API
+		} else if appOrgCode != "" && appOrgCode == globals.Jd3OrgCode {
+			pfAPI = api.Jd3API
 		}
 	case model.VendorIDMTWM:
 		pfAPI = api.MtwmAPI
@@ -52,7 +54,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
 	switch vendorID {
 	case model.VendorIDJD:
-		appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode)
+		appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode, globals.Jd3OrgCode)
 	case model.VendorIDMTWM:
 		appOrgCodeList = []string{api.MtwmAPI.GetAppID()}
 	case model.VendorIDEBAI:

globals/beegodb/beegodb.go

@@ -38,6 +38,8 @@ func Init() {
 	orm.RegisterModel(&model.SkuCategory{})
 	orm.RegisterModel(&model.ThingMap{})
 	orm.RegisterModel(&model.SkuExinfoMap{})
+	orm.RegisterModel(&model.StorePushClient{})
+	orm.RegisterModel(&model.StoreAudit{})
 
 	orm.RegisterModel(&model.AuthBind{}, &model.User{})
 

globals/globals.go

@@ -38,6 +38,7 @@ var (
 	GetWeixin2TokenURL string
 	GetWeixinTokenKey  string
 	GetYLYTokenURL     string
+	GetPushTokenURL    string
 	GetWeimobTokenURL  string
 
 	StoreName     string
@@ -58,6 +59,7 @@ var (
 
 	JdOrgCode   string
 	Jd2OrgCode  string
+	Jd3OrgCode  string
 	JdLoginName string
 
 	IsStoreSkuAct bool
@@ -111,6 +113,7 @@ func Init() {
 	GetYLYTokenURL = beego.AppConfig.DefaultString("getYLYTokenURL", "")
 	GetWeimobTokenURL = beego.AppConfig.DefaultString("getWeimobTokenURL", "")
 	GetWeixinTokenKey = beego.AppConfig.DefaultString("getWeixinTokenKey", "")
+	GetPushTokenURL = beego.AppConfig.DefaultString("getPushTokenURL", "")
 
 	StoreName = beego.AppConfig.String("storeName")
 	StoreNameMtwm = beego.AppConfig.String("storeNameMtwm")
@@ -129,6 +132,7 @@ func Init() {
 	TLPayNotifyURL = beego.AppConfig.DefaultString("tonglianPayNotifyURL", "")
 	JdOrgCode = beego.AppConfig.DefaultString("jdOrgCode", "")
 	Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
+	Jd3OrgCode = beego.AppConfig.DefaultString("jd3OrgCode", "")
 	JdLoginName = beego.AppConfig.DefaultString("jdLoginName", "")
 	IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
 	IsStoreSkuAct = !IsProductEnv()