liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- cms/GetServiceInfo.

Browse Source
This commit is contained in:
gazebo
2018-09-11 22:35:18 +08:00
parent 3f4bdbfdca
commit b1c258bc7a
3 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
business/jxstore/cms/cms.go
View File

@@ -6,45 +6,27 @@ import (
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
) )
type MetaData struct {
Units []string `json:"units"`
SpecUnits []string `json:"specUnits"`
DeliveryRangeType map[int]string `json:"deliveryRangeType"`
DeliveryType map[int]string `json:"deliveryType"`
StoreStatus map[int]string `json:"storeStatus"`
CategoryType map[int]string `json:"categoryType"`
SkuStatus map[int]string `json:"skuStatus"`
VendorName map[int]string `json:"vendorName"`
}
type ServerInfo struct {
Version string `json:"version"`
BuildDate string `json:"buildDate"`
GitCommit string `json:"gitCommit"`
MetaData MetaData `json:"metaData"`
}
var ( var (
CurVendorSync VendorSync CurVendorSync VendorSync
serverInfo *ServerInfo serviceInfo map[string]interface{}
) )
func InitServerInfo(version, buildDate, gitCommit string) { func InitServiceInfo(version, buildDate, gitCommit string) {
serverInfo = &ServerInfo{ serviceInfo = map[string]interface{}{
Version: version, "version": version,
BuildDate: buildDate, "buildDate": buildDate,
GitCommit: gitCommit, "gitCommit": gitCommit,
MetaData: MetaData{ "metaData": map[string]interface{}{
Units: model.UnitNames, "unit": model.UnitNames,
SpecUnits: model.SpecUnitNames, "specUnit": model.SpecUnitNames,
"deliveryRangeType": model.DeliveryRangeTypeName,
DeliveryRangeType: model.DeliveryTypeName, "deliveryType": model.DeliveryTypeName,
DeliveryType: model.DeliveryTypeName, "storeStatus": model.StoreStatusName,
StoreStatus: model.SkuStatusName, "categoryType": model.CategoryTypeName,
CategoryType: model.CategoryTypeName, "skuStatus": model.SkuStatusName,
SkuStatus: model.SkuStatusName, "vendorName": model.VendorChineseNames,
VendorName: model.VendorChineseNames, "orderStatus": model.OrderStatusName,
"waybillStatus": model.WaybillStatusName,
}, },
} }
} }
@@ -53,6 +35,6 @@ func GetPurchaseHandler(vendorID int) partner.IPurchasePlatformHandler {
return basesch.FixedBaseScheduler.GetPurchasePlatformFromVendorID(vendorID) return basesch.FixedBaseScheduler.GetPurchasePlatformFromVendorID(vendorID)
} }
func GetServerInfo() *ServerInfo { func GetServiceInfo() interface{} {
return serverInfo return serviceInfo
} }

8
controllers/cms.go
View File

@@ -14,10 +14,10 @@ type CmsController struct {
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /GetServerInfo [get] // @router /GetServiceInfo [get]
func (c *CmsController) GetServerInfo() { func (c *CmsController) GetServiceInfo() {
c.callGetServerInfo(func(params *tCmsGetServerInfoParams) (retVal interface{}, errCode string, err error) { c.callGetServiceInfo(func(params *tCmsGetServiceInfoParams) (retVal interface{}, errCode string, err error) {
retVal = cms.GetServerInfo() retVal = cms.GetServiceInfo()
return retVal, "", err return retVal, "", err
}) })
} }

2
main.go
View File

@@ -26,7 +26,7 @@ var (
func Init() { func Init() {
// globals.Init() // globals.Init()
cms.InitServerInfo(Version, BuildDate, GitCommit) cms.InitServiceInfo(Version, BuildDate, GitCommit)
beegodb.Init() beegodb.Init()
api.Init() api.Init()
} }