diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 92d7b0ee2..41d1a0013 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -6,45 +6,27 @@ import ( "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 ( CurVendorSync VendorSync - serverInfo *ServerInfo + serviceInfo map[string]interface{} ) -func InitServerInfo(version, buildDate, gitCommit string) { - serverInfo = &ServerInfo{ - Version: version, - BuildDate: buildDate, - GitCommit: gitCommit, - MetaData: MetaData{ - Units: model.UnitNames, - SpecUnits: model.SpecUnitNames, - - DeliveryRangeType: model.DeliveryTypeName, - DeliveryType: model.DeliveryTypeName, - StoreStatus: model.SkuStatusName, - CategoryType: model.CategoryTypeName, - SkuStatus: model.SkuStatusName, - VendorName: model.VendorChineseNames, +func InitServiceInfo(version, buildDate, gitCommit string) { + serviceInfo = map[string]interface{}{ + "version": version, + "buildDate": buildDate, + "gitCommit": gitCommit, + "metaData": map[string]interface{}{ + "unit": model.UnitNames, + "specUnit": model.SpecUnitNames, + "deliveryRangeType": model.DeliveryRangeTypeName, + "deliveryType": model.DeliveryTypeName, + "storeStatus": model.StoreStatusName, + "categoryType": model.CategoryTypeName, + "skuStatus": model.SkuStatusName, + "vendorName": model.VendorChineseNames, + "orderStatus": model.OrderStatusName, + "waybillStatus": model.WaybillStatusName, }, } } @@ -53,6 +35,6 @@ func GetPurchaseHandler(vendorID int) partner.IPurchasePlatformHandler { return basesch.FixedBaseScheduler.GetPurchasePlatformFromVendorID(vendorID) } -func GetServerInfo() *ServerInfo { - return serverInfo +func GetServiceInfo() interface{} { + return serviceInfo } diff --git a/controllers/cms.go b/controllers/cms.go index 0595f424b..4044f7e5e 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -14,10 +14,10 @@ type CmsController struct { // @Param token header string true "认证token" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /GetServerInfo [get] -func (c *CmsController) GetServerInfo() { - c.callGetServerInfo(func(params *tCmsGetServerInfoParams) (retVal interface{}, errCode string, err error) { - retVal = cms.GetServerInfo() +// @router /GetServiceInfo [get] +func (c *CmsController) GetServiceInfo() { + c.callGetServiceInfo(func(params *tCmsGetServiceInfoParams) (retVal interface{}, errCode string, err error) { + retVal = cms.GetServiceInfo() return retVal, "", err }) } diff --git a/main.go b/main.go index 93de498a6..9d2d1466b 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ var ( func Init() { // globals.Init() - cms.InitServerInfo(Version, BuildDate, GitCommit) + cms.InitServiceInfo(Version, BuildDate, GitCommit) beegodb.Init() api.Init() }