diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47f1310..5336642 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,10 +39,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.18 - - name: Check snapshot - if: "!startsWith(github.ref, 'refs/tags/')" - id: snapshot - run: echo '::set-output name=ARG::--snapshot' - name: Build binary file env: @@ -54,7 +50,7 @@ jobs: if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi if $IS_PR ; then echo $PR_PROMPT; fi export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX" - export LD_FLAGS="-w -s -X main.VERSION=${{steps.snapshot.outputs.ARG}}" + export LD_FLAGS="-w -s -X main.VERSION=unknown" go mod tidy go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" ./ - name: Upload artifact diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7ef2b3..7e6da7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.17.2' + go-version: '1.18' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/model/user.go b/model/user.go index 7e73a31..e18a3f9 100644 --- a/model/user.go +++ b/model/user.go @@ -3,12 +3,10 @@ package model import ( - "math/rand" "net/http" "sync" "time" - "github.com/imroc/req/v3" "github.com/playwright-community/playwright-go" log "github.com/sirupsen/logrus" @@ -209,8 +207,6 @@ func AddUser(user *User) error { * @return error */ func UpdateUser(user *User) error { - lock.Lock() - defer lock.Unlock() ping() _, err := db.Exec("update user set token=?,login_time=?,push_id=?,status=1 where uid = ?", user.Token, user.LoginTime, user.PushId, user.UID) if err != nil { @@ -311,7 +307,7 @@ func check() { for { users, _ := Query() for _, user := range users { - response, _ := req.R().SetCookies(user.ToCookies()...).Get("https://pc-api.xuexi.cn/open/api/auth/check") + response, _ := utils.GetClient().R().SetCookies(user.ToCookies()...).Get("https://pc-api.xuexi.cn/open/api/auth/check") token := "" for _, cookie := range response.Cookies() { if cookie.Name == "token" { @@ -321,8 +317,9 @@ func check() { if token != "" { user.Token = token _ = UpdateUser(user) + log.Infoln("用户" + user.Nick + "的ck已成功保活cookie") } } - time.Sleep(time.Hour * time.Duration(rand.Intn(2)+1)) + time.Sleep(time.Hour * time.Duration(2)) } } diff --git a/utils/update/update.go b/utils/update/update.go index 5b45c5d..c702aa7 100644 --- a/utils/update/update.go +++ b/utils/update/update.go @@ -87,6 +87,13 @@ func versionCompare(nowVersion, lastVersion string) bool { if nowMainIntVersion < lastMainIntVersion { return true } + if strings.Contains(nowVersion, "SNAPSHOT") { + if nowMainIntVersion == lastMainIntVersion { + return false + } else { + return true + } + } // 如果最新版本是beta if LastBeta { // 如果当前版本也是beta