From e0c725a78edbbf721afd503b91baa2cafbdca1a3 Mon Sep 17 00:00:00 2001 From: XZB-1248 Date: Wed, 9 Oct 2024 15:11:05 +0800 Subject: [PATCH] update: config commit --- .github/workflows/build.yml | 4 ++-- scripts/build.client.bat | 22 +++++++++++----------- scripts/build.client.sh | 22 +++++++++++----------- scripts/build.server.bat | 18 +++++++++--------- scripts/build.server.sh | 18 +++++++++--------- server/config/config.go | 4 ++-- server/handler/utility/utility.go | 16 ++++++++-------- server/main.go | 4 ++-- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9848d4d..8346d31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,9 +32,9 @@ jobs: export GOOS=darwin export GOARCH=arm64 - go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/darwin_arm64 Spark/client + go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/darwin_arm64 Spark/client export GOARCH=amd64 - go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/darwin_amd64 Spark/client + go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/darwin_amd64 Spark/client - name: Upload prebuilt client (darwin_arm64) uses: actions/upload-artifact@v3 diff --git a/scripts/build.client.bat b/scripts/build.client.bat index 9f2a2df..8056149 100644 --- a/scripts/build.client.bat +++ b/scripts/build.client.bat @@ -6,24 +6,24 @@ for /F %%i in ('git rev-parse HEAD') do ( set COMMIT=%%i) set GOOS=linux set GOARCH=arm -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/linux_arm Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/linux_arm Spark/client set GOARCH=386 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/linux_i386 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/linux_i386 Spark/client set GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/linux_arm64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/linux_arm64 Spark/client set GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/linux_amd64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/linux_amd64 Spark/client set GOOS=windows set GOARCH=386 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/windows_i386 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/windows_i386 Spark/client set GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/windows_arm64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/windows_arm64 Spark/client set GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/windows_amd64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/windows_amd64 Spark/client @@ -33,19 +33,19 @@ go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/wi @REM set GOARCH=arm @REM set CC=armv7a-linux-androideabi21-clang @REM set CXX=armv7a-linux-androideabi21-clang++ -@REM go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/android_arm Spark/client +@REM go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/android_arm Spark/client @REM set GOARCH=386 @REM set CC=i686-linux-android21-clang @REM set CXX=i686-linux-android21-clang++ -@REM go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/android_i386 Spark/client +@REM go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/android_i386 Spark/client @REM set GOARCH=arm64 @REM set CC=aarch64-linux-android21-clang @REM set CXX=aarch64-linux-android21-clang++ -@REM go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/android_arm64 Spark/client +@REM go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/android_arm64 Spark/client @REM set GOARCH=amd64 @REM set CC=x86_64-linux-android21-clang @REM set CXX=x86_64-linux-android21-clang++ -@REM go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=%COMMIT%'" -o ./built/android_amd64 Spark/client +@REM go build -ldflags "-s -w -X 'Spark/client/config.Commit=%COMMIT%'" -o ./built/android_amd64 Spark/client diff --git a/scripts/build.client.sh b/scripts/build.client.sh index b7c4acf..247323f 100644 --- a/scripts/build.client.sh +++ b/scripts/build.client.sh @@ -6,24 +6,24 @@ export COMMIT=`git rev-parse HEAD` export GOOS=linux export GOARCH=arm -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/linux_arm Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/linux_arm Spark/client export GOARCH=386 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/linux_i386 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/linux_i386 Spark/client export GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/linux_arm64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/linux_arm64 Spark/client export GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/linux_amd64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/linux_amd64 Spark/client export GOOS=windows export GOARCH=386 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/windows_i386 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/windows_i386 Spark/client export GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/windows_arm64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/windows_arm64 Spark/client export GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/windows_amd64 Spark/client +go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/windows_amd64 Spark/client @@ -33,19 +33,19 @@ go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/win # export GOARCH=arm # export CC=armv7a-linux-androideabi21-clang # export CXX=armv7a-linux-androideabi21-clang++ -# go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/android_arm Spark/client +# go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/android_arm Spark/client # export GOARCH=386 # export CC=i686-linux-android21-clang # export CXX=i686-linux-android21-clang++ -# go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/android_i386 Spark/client +# go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/android_i386 Spark/client # export GOARCH=arm64 # export CC=aarch64-linux-android21-clang # export CXX=aarch64-linux-android21-clang++ -# go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/android_arm64 Spark/client +# go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/android_arm64 Spark/client # export GOARCH=amd64 # export CC=x86_64-linux-android21-clang # export CXX=x86_64-linux-android21-clang++ -# go build -ldflags "-s -w -X 'Spark/client/config.COMMIT=$COMMIT'" -o ./built/android_amd64 Spark/client +# go build -ldflags "-s -w -X 'Spark/client/config.Commit=$COMMIT'" -o ./built/android_amd64 Spark/client diff --git a/scripts/build.server.bat b/scripts/build.server.bat index 9431a89..9b47512 100644 --- a/scripts/build.server.bat +++ b/scripts/build.server.bat @@ -6,30 +6,30 @@ for /F %%i in ('git rev-parse HEAD') do ( set COMMIT=%%i) set GOOS=darwin set GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_darwin_arm64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_darwin_arm64 Spark/server set GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_darwin_amd64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_darwin_amd64 Spark/server set GOOS=linux set GOARCH=arm -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_arm Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_arm Spark/Server set GOARCH=386 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_i386 Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_i386 Spark/Server set GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_arm64 Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_arm64 Spark/Server set GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_amd64 Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_linux_amd64 Spark/Server set GOOS=windows set GOARCH=386 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_i386.exe Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_i386.exe Spark/Server set GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_arm64.exe Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_arm64.exe Spark/Server set GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_amd64.exe Spark/Server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=%COMMIT%'" -tags=jsoniter -o ./releases/server_windows_amd64.exe Spark/Server diff --git a/scripts/build.server.sh b/scripts/build.server.sh index 837b772..b310af1 100644 --- a/scripts/build.server.sh +++ b/scripts/build.server.sh @@ -6,30 +6,30 @@ export COMMIT=`git rev-parse HEAD` export GOOS=darwin export GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_darwin_arm64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_darwin_arm64 Spark/server export GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_darwin_amd64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_darwin_amd64 Spark/server export GOOS=linux export GOARCH=arm -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_arm Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_arm Spark/server export GOARCH=386 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_i386 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_i386 Spark/server export GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_arm64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_arm64 Spark/server export GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_amd64 Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_linux_amd64 Spark/server export GOOS=windows export GOARCH=386 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_i386.exe Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_i386.exe Spark/server export GOARCH=arm64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_arm64.exe Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_arm64.exe Spark/server export GOARCH=amd64 -go build -ldflags "-s -w -X 'Spark/server/config.COMMIT=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_amd64.exe Spark/server +go build -ldflags "-s -w -X 'Spark/server/config.Commit=$COMMIT'" -tags=jsoniter -o ./releases/server_windows_amd64.exe Spark/server diff --git a/server/config/config.go b/server/config/config.go index 407f5f0..cda39a6 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -21,8 +21,8 @@ type log struct { Days uint `json:"days"` } -// COMMIT is hash of this commit, for auto upgrade. -var COMMIT = `` +// Commit is hash of this commit, for auto upgrade. +var Commit = `` var Config config var BuiltPath = `./built/%v_%v` diff --git a/server/handler/utility/utility.go b/server/handler/utility/utility.go index 5bba88f..6466f27 100644 --- a/server/handler/utility/utility.go +++ b/server/handler/utility/utility.go @@ -117,7 +117,7 @@ func CheckUpdate(ctx *gin.Context) { ctx.AbortWithStatusJSON(http.StatusBadRequest, modules.Packet{Code: -1, Msg: `${i18n|COMMON.INVALID_PARAMETER}`}) return } - if form.Commit == config.COMMIT { + if form.Commit == config.Commit { ctx.JSON(http.StatusOK, modules.Packet{Code: 0}) common.Warn(ctx, `CLIENT_UPDATE`, `success`, `latest`, map[string]any{ `client`: map[string]any{ @@ -125,7 +125,7 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) return } @@ -138,7 +138,7 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) return } @@ -153,7 +153,7 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) return } @@ -166,7 +166,7 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) return } @@ -179,7 +179,7 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) return } @@ -190,10 +190,10 @@ func CheckUpdate(ctx *gin.Context) { `arch`: form.Arch, `commit`: form.Commit, }, - `server`: config.COMMIT, + `server`: config.Commit, }) - ctx.Header(`Spark-Commit`, config.COMMIT) + ctx.Header(`Spark-Commit`, config.Commit) ctx.Header(`Accept-Ranges`, `none`) ctx.Header(`Content-Transfer-Encoding`, `binary`) ctx.Header(`Content-Type`, `application/octet-stream`) diff --git a/server/main.go b/server/main.go index 7197d9d..e4f5500 100644 --- a/server/main.go +++ b/server/main.go @@ -400,7 +400,7 @@ func serveGzip(ctx *gin.Context, statikFS http.FileSystem) bool { return false } - etag := fmt.Sprintf(`"%x-%s"`, []byte(filename), config.COMMIT) + etag := fmt.Sprintf(`"%x-%s"`, []byte(filename), config.Commit) if headers.Get(`If-None-Match`) == etag { ctx.Status(http.StatusNotModified) return true @@ -441,7 +441,7 @@ func serveGzip(ctx *gin.Context, statikFS http.FileSystem) bool { func checkCache(ctx *gin.Context, _ http.FileSystem) bool { filename := path.Clean(ctx.Request.RequestURI) - etag := fmt.Sprintf(`"%x-%s"`, []byte(filename), config.COMMIT) + etag := fmt.Sprintf(`"%x-%s"`, []byte(filename), config.Commit) if ctx.Request.Header.Get(`If-None-Match`) == etag { ctx.Status(http.StatusNotModified) return true