From 75138c505b1d2e4cf1ab226fa1a13bfacdcd66f9 Mon Sep 17 00:00:00 2001 From: csznet Date: Sun, 7 Apr 2024 15:51:22 +0800 Subject: [PATCH] version print --- .github/workflows/go-build.yml | 6 +++--- conf/conf.go | 10 ++++++++++ main.go | 6 ------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml index b86c609..66a9c03 100644 --- a/.github/workflows/go-build.yml +++ b/.github/workflows/go-build.yml @@ -19,7 +19,7 @@ jobs: - name: Build Linux arm64 run: | - CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X csz.net/goForward/conf.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go - name: Zip Linux arm64 run: | @@ -32,7 +32,7 @@ jobs: - name: Build Linux amd64 run: | - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X csz.net/goForward/conf.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go - name: Zip Linux amd64 run: | @@ -40,7 +40,7 @@ jobs: - name: Build Windows amd64 run: | - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward.exe main.go + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X csz.net/goForward/conf.version=${GITHUB_REF/refs\/tags\//}" -o goForward.exe main.go - name: Zip Windows amd64 run: | diff --git a/conf/conf.go b/conf/conf.go index e8f0922..e897466 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -1,6 +1,7 @@ package conf import ( + "fmt" "sync" ) @@ -39,3 +40,12 @@ var WebPass string // TCP超时 var TcpTimeout int + +// 版本号 +var version string + +func init() { + if version != "" { + fmt.Println("goForward Version " + version) + } +} diff --git a/main.go b/main.go index 6fa931e..2567d9f 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - "fmt" "sync" "csz.net/goForward/conf" @@ -11,12 +10,7 @@ import ( "csz.net/goForward/web" ) -var version string - func main() { - if version != "" { - fmt.Println("goForward Version " + version) - } go web.Run() if conf.TcpTimeout < 5 { conf.TcpTimeout = 5