- build version, git info added.

VERSION

@@ -0,0 +1 @@
+0.0.1

business/controller/controller.go

@@ -81,9 +81,11 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica
 func LoadPendingOrders() {
 	orders := OrderManager.LoadPendingOrders()
 	globals.SugarLogger.Infof("LoadPendingOrders orders count:%d", len(orders))
+
+	ordersCount := len(orders)
+	if ordersCount > 0 {
 		bills := WaybillManager.LoadPendingWaybills()
 		globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills))
-
 		var sortOrders StatusTimerSlice
 		for _, order := range orders {
 			if order.Status > model.OrderStatusNew {
@@ -104,8 +106,7 @@ func LoadPendingOrders() {
 			sortOrders = append(sortOrders, bill)
 		}
 		sort.Sort(sortOrders)
-
-	sleepGap := maxTimeHandlePendingOrder / time.Duration(len(sortOrders))
+		sleepGap := maxTimeHandlePendingOrder / time.Duration(ordersCount)
 		if sleepGap > maxSleepGapHandlePendingOrder {
 			sleepGap = maxSleepGapHandlePendingOrder
 		}
@@ -133,3 +134,4 @@ func LoadPendingOrders() {
 			lastTime = curTime
 		}
 	}
+}

main.go

@@ -1,6 +1,10 @@
 package main
 
 import (
+	"flag"
+	"fmt"
+	"os"
+
 	bzcon "git.rosy.net.cn/jx-callback/business/controller"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -11,13 +15,64 @@ import (
 	"github.com/astaxie/beego"
 )
 
+var (
+	GitCommit  string
+	GitBranch  string
+	GitState   string
+	GitSummary string
+	BuildDate  string
+	Version    string
+)
+
 func init() {
 	// globals.Init()
 	db.Init()
 	api.Init()
 }
 
+// 返回true表示非运行服务
+func checkCmdFlags() bool {
+	var flagGitCommit bool
+	var flagGitBranch bool
+	var flagGitState bool
+	var flagGitSummary bool
+	var flagBuildDate bool
+	var flagVersion bool
+	var flagFullInfo bool
+
+	flag.BoolVar(&flagGitCommit, "gitcommit", false, "get gitcommit info")
+	flag.BoolVar(&flagGitBranch, "gitbranch", false, "get gitbranch info")
+	flag.BoolVar(&flagGitState, "gitstate", false, "get gitstate info")
+	flag.BoolVar(&flagGitSummary, "gitsummary", false, "get gitsummary info")
+	flag.BoolVar(&flagBuildDate, "builddate", false, "get builddate info")
+	flag.BoolVar(&flagVersion, "version", false, "get version info")
+	flag.BoolVar(&flagFullInfo, "fullinfo", false, "get fullinfo info")
+	flag.Parse()
+
+	if flagGitCommit || flagFullInfo {
+		fmt.Println(GitCommit)
+	}
+	if flagGitBranch || flagFullInfo {
+		fmt.Println(GitBranch)
+	}
+	if flagGitState || flagFullInfo {
+		fmt.Println(GitState)
+	}
+	if flagGitSummary || flagFullInfo {
+		fmt.Println(GitSummary)
+	}
+	if flagBuildDate || flagFullInfo {
+		fmt.Println(BuildDate)
+	}
+	if flagVersion || flagFullInfo {
+		fmt.Println(Version)
+	}
+
+	return len(os.Args) > 1
+}
+
 func main() {
+	if !checkCmdFlags() {
 		if beego.BConfig.RunMode == "prod" {
 			if err := tasks.RefreshWeixinToken(); err != nil {
 				globals.SugarLogger.Errorf("RefreshWeixinToken failed with error:%s", err)
@@ -39,3 +94,4 @@ func main() {
 		}
 		beego.Run()
 	}
+}