变更uptime变量名

Jrohy · Jun 24, 2022 · fa8531a · fa8531a
1 parent 11520c0
commit fa8531a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/version.go b/cmd/version.go
@@ -13,15 +13,15 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "显示版本号",
 	Run: func(cmd *cobra.Command, args []string) {
-		runTime := trojan.RunTime()
+		upTime := trojan.UpTime()
 		trojanVersion := trojan.Version()
 		fmt.Println()
 		fmt.Printf("Version: %s\n\n", util.Cyan(trojan.MVersion))
 		fmt.Printf("BuildDate: %s\n\n", util.Cyan(trojan.BuildDate))
 		fmt.Printf("GoVersion: %s\n\n", util.Cyan(trojan.GoVersion))
 		fmt.Printf("GitVersion: %s\n\n", util.Cyan(trojan.GitVersion))
 		fmt.Printf("TrojanVersion: %s\n\n", util.Cyan(trojanVersion))
-		fmt.Printf("TrojanRunTime: %s\n\n", util.Cyan(runTime))
+		fmt.Printf("TrojanUpTime: %s\n\n", util.Cyan(upTime))
 	},
 }
 

diff --git a/trojan/trojan.go b/trojan/trojan.go
@@ -73,8 +73,8 @@ func Status(isPrint bool) string {
 	return result
 }
 
-// RunTime Trojan运行时间
-func RunTime() string {
+// UpTime Trojan运行时间
+func UpTime() string {
 	result := strings.TrimSpace(util.ExecCommandWithResult("ps -Ao etime,args|grep -v grep|grep /usr/local/etc/trojan/config.json"))
 	resultSlice := strings.Split(result, " ")
 	if len(resultSlice) > 0 {

diff --git a/web/controller/common.go b/web/controller/common.go
@@ -50,7 +50,7 @@ func Version() *ResponseBody {
 		"goVersion":     trojan.GoVersion,
 		"gitVersion":    trojan.GitVersion,
 		"trojanVersion": trojan.Version(),
-		"trojanRuntime": trojan.RunTime(),
+		"trojanUptime":  trojan.UpTime(),
 		"trojanType":    trojan.Type(),
 	}
 	return &responseBody