From ac0b9ee4ee6a1203e33f7dfc6941359cbab96361 Mon Sep 17 00:00:00 2001
From: bjdgyc <bjdgyc@163.com>
Date: Mon, 10 Oct 2022 15:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/admin/api_set.go      | 11 ++++++-----
 web/src/pages/set/System.vue |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/admin/api_set.go b/server/admin/api_set.go
index bbd7231..18a1cb0 100644
--- a/server/admin/api_set.go
+++ b/server/admin/api_set.go
@@ -66,11 +66,12 @@ func SetSystem(w http.ResponseWriter, r *http.Request) {
 	hi, _ := host.Info()
 	l, _ := load.Avg()
 	data["sys"] = map[string]interface{}{
-		"goOs":       runtime.GOOS,
-		"goArch":     runtime.GOARCH,
-		"goVersion":  runtime.Version(),
-		"goroutine":  runtime.NumGoroutine(),
-		"appVersion": "v" + base.APP_VER,
+		"goOs":        runtime.GOOS,
+		"goArch":      runtime.GOARCH,
+		"goVersion":   runtime.Version(),
+		"goroutine":   runtime.NumGoroutine(),
+		"appVersion":  "v" + base.APP_VER,
+		"appCommitId": base.CommitId,
 
 		"hostname": hi.Hostname,
 		"platform": fmt.Sprintf("%v %v %v", hi.Platform, hi.PlatformFamily, hi.PlatformVersion),
diff --git a/web/src/pages/set/System.vue b/web/src/pages/set/System.vue
index 52c63c8..ee39464 100644
--- a/web/src/pages/set/System.vue
+++ b/web/src/pages/set/System.vue
@@ -49,9 +49,10 @@
         <span>运行环境</span>
       </div>
       <Cell left="软件版本" :right="system.sys.appVersion" divider/>
-      <Cell left="GO版本" :right="system.sys.goOs" divider/>
+      <Cell left="软件CommitId" :right="system.sys.appCommitId" divider/>
+      <Cell left="GO系统" :right="system.sys.goOs" divider/>
       <Cell left="GoArch" :right="system.sys.goArch" divider/>
-      <Cell left="GoVersion" :right="system.sys.goVersion" divider/>
+      <Cell left="GO版本" :right="system.sys.goVersion" divider/>
       <Cell left="Goroutine" :right="system.sys.goroutine"/>
     </el-card>