From d0ea300330ea0b3cba18da18b7aca16f72b3dc6d Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 15 Mar 2019 15:53:06 +0800
Subject: [PATCH] - cms buildTime and startupTime

---
 business/jxstore/cms/cms.go | 15 +++++++++++----
 main.go                     |  6 +++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 4d7f25690..cf12a8592 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -4,8 +4,10 @@ import (
 	"crypto/md5"
 	"fmt"
 	"strconv"
+	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -23,11 +25,16 @@ var (
 	serviceInfo map[string]interface{}
 )
 
-func InitServiceInfo(version, buildDate, gitCommit string) {
+func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
+	buildTimeStr := ""
+	if !jxutils.IsTimeEmpty(buildTime) {
+		buildTimeStr = utils.Time2Str(buildTime)
+	}
 	serviceInfo = map[string]interface{}{
-		"version":   version,
-		"buildDate": buildDate,
-		"gitCommit": gitCommit,
+		"startupTime": utils.Time2Str(time.Now()),
+		"version":     version,
+		"buildTime":   buildTimeStr,
+		"gitCommit":   gitCommit,
 		"metaData": map[string]interface{}{
 			"skuNamePrefix":          model.SkuNamePrefixNames,
 			"skuNameUnit":            model.UnitNames,
diff --git a/main.go b/main.go
index f3196e715..9b0943287 100644
--- a/main.go
+++ b/main.go
@@ -36,7 +36,11 @@ func Init() {
 	beegodb.Init()
 	defsch.Init()
 	api.Init()
-	cms.InitServiceInfo(Version, BuildDate, GitCommit)
+	buildTime, err := time.ParseInLocation(time.RFC3339, BuildDate, time.UTC)
+	if err == nil {
+		buildTime = buildTime.Local()
+	}
+	cms.InitServiceInfo(Version, buildTime, GitCommit)
 	promotion.Init()
 	misc.StartRefreshEbaiRealMobile()
 	ebai.CurPurchaseHandler.StartRefreshComment()