底部增加网站编译信息

polaris1119 · polaris1119 · commit 7ae4d7636fc7 · 2014-11-01T17:26:11.000+08:00
diff --git a/websites/code/studygolang/install b/websites/code/studygolang/install
@@ -20,7 +20,7 @@ DATE=`date +%FT%T%z`
 
 gofmt -w src
 
-go install -ldflags "-X util.version "$VERSION" -X util.date "$DATE ./...
+go install -ldflags "-X util.Version "$VERSION" -X util.Date "$DATE ./...
 
 export GOPATH="$OLDGOPATH"
 export PATH="$OLDPATH"
diff --git a/websites/code/studygolang/install.bat b/websites/code/studygolang/install.bat
@@ -23,7 +23,7 @@ set VERSION=%VERNAME%-%VERCODE%
 gofmt -w src
 
 :: -tags "debug" 表示测试
-go install -tags "debug" -ldflags "-X util.version "%VERSION%" -X util.date "%date:~3,10%T%time%"" ./...
+go install -tags "debug" -ldflags "-X util.Version "%VERSION%" -X util.Date "%date:~3,10%T%time%"" ./...
 
 set GOPATH=%OLDGOPATH%
 
diff --git a/websites/code/studygolang/src/filter/view.go b/websites/code/studygolang/src/filter/view.go
@@ -212,6 +212,11 @@ func (this *ViewFilter) PostFilter(rw http.ResponseWriter, req *http.Request) bo
 
 		// websocket主机
 		data["wshost"] = config.Config["wshost"]
+		data["build"] = map[string]string{
+			"version": util.Version,
+			"date":    util.Date,
+		}
+
 		err = tpl.Execute(rw, data)
 		if err != nil {
 			logger.Errorf("执行模板出错（Execute）：[%q] %s\n", req.RequestURI, err)
diff --git a/websites/code/studygolang/src/util/version.go b/websites/code/studygolang/src/util/version.go
@@ -5,15 +5,15 @@
 // Author：polaris	studygolang@gmail.com
 
 /*
-Package version sets version information for the binary where it is imported.
+sets version information for the binary where it is imported.
 The version can be retrieved either from the -version command line argument,
 or from the /version/ http endpoint.
 
 To include in a project simply import the package and call version.Init().
 
 The version and compile date is stored in version and date variables and
 are supposed to be set during compile time. Typically this is done by the
-install(bash/bat).
+install(bash/bat). Or date is binary modify time.
 
 To set these manually use -ldflags together with -X, like in this example:
 
@@ -32,32 +32,41 @@ import (
 	"os"
 )
 
-var showVersion = flag.Bool("version", false, "Print version of this binary (only valid if compiled with install(bash/bat))")
+var showVersion = flag.Bool("version", false, "Print version of this binary")
 
 var (
-	version string
-	date    string
+	Version string
+	Date    string
 )
 
 func printVersion(w io.Writer, version string, date string) {
 	fmt.Fprintf(w, "Version: %s\n", version)
 	fmt.Fprintf(w, "Binary: %s\n", os.Args[0])
 	fmt.Fprintf(w, "Compile date: %s\n", date)
-	fmt.Fprintf(w, "(version and date only valid if compiled with install(bash/bat))\n")
 }
 
-// initializes the version flag and /debug/version/ http endpoint.
+// initializes the version flag and /version/ http endpoint.
 // Note that this method will call flag.Parse if the flags are not already parsed.
 func init() {
 	if !flag.Parsed() {
 		flag.Parse()
 	}
+
+	if Date == "" {
+		fileInfo, err := os.Stat(os.Args[0])
+		if err != nil {
+			panic(err)
+		}
+
+		Date = fileInfo.ModTime().String()
+	}
+
 	if showVersion != nil && *showVersion {
-		printVersion(os.Stdout, version, date)
+		printVersion(os.Stdout, Version, Date)
 		os.Exit(0)
 	}
 
 	http.Handle("/version", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		printVersion(w, html.EscapeString(version), html.EscapeString(date))
+		printVersion(w, html.EscapeString(Version), html.EscapeString(Date))
 	}))
 }
diff --git a/websites/code/studygolang/template/common/layout.html b/websites/code/studygolang/template/common/layout.html
@@ -110,6 +110,8 @@
 				</p>
 				<p class="copyright">&copy;2013-2015 studygolang.com 采用 <a href="http://golang.org" target="_blank">Go语言</a> + <a href="http://www.mysql.com/" target="_blank">MYSQL 构建</a>
 				&nbsp;&nbsp;当前在线：<span id="onlineusers">30</span>人&nbsp;&nbsp;历史最高：<span id="maxonline">300</span>人
+				<br/>
+				<b>网站编译信息</b>&nbsp;{{if .build.version}}版本：{{.build.version}}，{{end}}时间：<attr class="timeago">{{.build.date}}</attr>
 				<br/>中国 Golang 社区，Go语言学习园地，致力于构建完善的 Golang 中文社区，Go语言爱好者的学习家园。
 	京ICP备14030343号-1
 				</p>
