zishuo/Spark
1
0
Fork 0
mirror of https://github.com/XZB-1248/Spark synced 2025-09-26 20:21:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: config commit

Browse Source
This commit is contained in:
XZB-1248
2024-10-09 15:11:05 +08:00
parent 7511efe944
commit e0c725a78e
8 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -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

22
scripts/build.client.bat
View File

@@ -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

22
scripts/build.client.sh
View File

@@ -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

18
scripts/build.server.bat
View File

@@ -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

18
scripts/build.server.sh
View File

@@ -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

4
server/config/config.go
View File

@@ -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`

16
server/handler/utility/utility.go
View File

@@ -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`)

4
server/main.go
View File

@@ -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