fix: 更新版本 (#42)

* fix: 更新版本

* chore: update go 1.25

* chore: update lint

* chore: update lint config

* ci(chore): Fix stylings

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: Redmomn

.github/workflows/golint.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.25'
           cache: false
 
       - name: Sort imports
@@ -22,7 +22,7 @@ jobs:
           goimports-reviser -imports-order std,blanked,general,company,project -recursive ./..
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           skip-cache: true

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.25'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4

.golangci.yml

@@ -1,41 +1,20 @@
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - fmt:.*
-      - io/ioutil:^Read.*
-
-  goimports:
-    local-prefixes: github.com/Mrs4s/go-cqhttp
-
-  gocritic:
-    disabled-checks:
-      - exitAfterDefer
-
-  forbidigo:
-    # Forbid the following identifiers
-    forbid:
-      - ^fmt\.Errorf$ # consider errors.Errorf in github.com/pkg/errors
+version: "2"
 
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
-  fast: false
+  # please, do not use `default: all`: inverted configuration with all linters
+  # and disabled linters is not scalable during updates of golangci-lint.
+  default: none
   enable:
     - bodyclose
     - durationcheck
-    - gofmt
-    - goimports
     - errcheck
     - exhaustive
     - bidichk
     - gocritic
-    - gosimple
     - govet
     - ineffassign
     #- nolintlint
     - staticcheck
-    - stylecheck
     - unconvert
     - usestdlibvars
     - unparam
@@ -47,9 +26,46 @@ linters:
     - revive
     - forbidigo
     - makezero
+  settings:
+    errcheck:
+      exclude-functions:
+        - fmt:.*
+        - io/ioutil:^Read.*
+
+    gocritic:
+      disabled-checks:
+        - exitAfterDefer
+
+    forbidigo:
+      # Forbid the following identifiers
+      forbid:
+        - pattern: ^fmt\.Errorf$ # consider errors.Errorf in github.com/pkg/errors
+  exclusions:
+    generated: lax
+    rules:
+      - path: (.+)\.go$
+        text: "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
+    paths:
+      - db
+      - cmd/api-generator
+      - internal/encryption
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/Mrs4s/go-cqhttp
+  exclusions:
+    paths:
+      - db
+      - cmd/api-generator
+      - internal/encryption
 
 run:
-  # default concurrency is a available CPU number.
+  # default concurrency is an available CPU number.
   # concurrency: 4 # explicitly omit this value to fully utilize available resources.
   timeout: 5m
   issues-exit-code: 1
@@ -58,18 +74,12 @@ run:
 # output configuration options
 output:
   formats:
-    - format: colored-line-number
+    text:
       path: stdout
-  print-issued-lines: true
-  print-linter-name: true
+      print-issued-lines: true
+      print-linter-name: true
+      colors: true
 
 issues:
   # Fix found issues (if it's supported by the linter)
   fix: true
-  exclude-use-default: false
-  exclude:
-    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
-  exclude-dirs:
-    - db
-    - cmd/api-generator
-    - internal/encryption

cmd/gocq/main.go

@@ -8,7 +8,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"net/url"
 	"os"
 	"path"
 	"sync"
@@ -212,7 +211,7 @@ func LoginInteract() {
 		time.Sleep(time.Second * 5)
 	}
 	log.Info("开始尝试登录并同步消息...")
-	app := auth.AppList["linux"]["3.2.15-30366"]
+	app := auth.AppList["linux"]["3.2.26-46494"]
 	log.Infof("使用协议: %s", app.CurrentVersion)
 	cli = newClient(app)
 	cli.UseDevice(device)
@@ -431,19 +430,15 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 }
 
 func newClient(app *auth.AppInfo) *client.QQClient {
-	signUrls := make([]string, 0, len(base.SignServers))
-	for _, s := range base.SignServers {
-		u, err := url.Parse(s.URL)
-		if err != nil || u.Hostname() == "" {
-			continue
-		}
-		signUrls = append(signUrls, u.String())
+	var uin uint32
+	if base.Account != nil && base.Account.Uin > 0 {
+		uin = uint32(base.Account.Uin)
 	}
-	c := client.NewClientEmpty()
+	c := client.NewClientMD5(uin, [16]byte{})
 	c.UseVersion(app)
 	signer := newSigner()
 	c.UseSignProvider(signer)
-	c.AddSignServer(signUrls...)
+	signer.AddSignServer(base.SignServers...)
 	signer.init()
 	// TODO 服务器更新通知
 	// c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {

cmd/gocq/sign.go

@@ -21,6 +21,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
 const serverLatencyDown = math.MaxUint32
@@ -39,6 +40,7 @@ type (
 
 	remote struct {
 		server  string
+		token   string
 		latency atomic.Uint32
 	}
 )
@@ -50,27 +52,18 @@ func newSigner() *signer {
 	}
 }
 
-func (c *signer) init() {
-	go func() {
-		c.check()
-		ticker := time.NewTicker(30 * time.Minute)
-		defer ticker.Stop()
-		select {
-		case <-c.doneChan:
-			return
-		case <-ticker.C:
-			c.check()
-		}
-	}()
-}
+func (c *signer) init() {}
 
 // Release 释放资源
 func (c *signer) Release() {
 	close(c.doneChan)
 }
 
 // Sign 对数据包签名
-func (c *signer) Sign(cmd string, seq uint32, data []byte) (*sign.Response, error) {
+func (c *signer) Sign(cmd string, seq uint32, data []byte, uin uint32, guid, qua string) (*sign.Response, error) {
+	if !sign.ContainSignPKG(cmd) {
+		return nil, nil
+	}
 	sortFlag := false
 	defer func() {
 		if sortFlag {
@@ -81,7 +74,7 @@ func (c *signer) Sign(cmd string, seq uint32, data []byte) (*sign.Response, erro
 	c.lock.RLock()
 	defer c.lock.RUnlock()
 	for _, instance := range c.instances {
-		resp, err := instance.sign(cmd, seq, data, c.extraHeaders)
+		resp, err := instance.sign(cmd, seq, data, uin, guid, qua, c.extraHeaders)
 		if err == nil {
 			return resp, nil
 		}
@@ -110,12 +103,16 @@ func (c *signer) AddRequestHeader(header map[string]string) {
 }
 
 // AddSignServer 添加签名服务器
-func (c *signer) AddSignServer(signServers ...string) {
+func (c *signer) AddSignServer(signServers ...config.SignServer) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
-	c.instances = append(c.instances, io.Map(signServers, func(s string) *remote {
-		return &remote{server: s}
-	})...)
+	for _, s := range signServers {
+		u, err := url.Parse(s.URL)
+		if err != nil || u.Hostname() == "" {
+			continue
+		}
+		c.instances = append(c.instances, &remote{server: u.String(), token: s.Token})
+	}
 }
 
 // GetSignServer 获取签名服务器
@@ -136,37 +133,40 @@ func (c *signer) SetAppInfo(app *auth.AppInfo) {
 		app.CurrentVersion, runtime.GOOS, runtime.GOARCH, base.Version))
 }
 
-func (c *signer) check() {
-	log.Infoln("开始签名服务器质量测试")
-	availableQuantity := 0
-	wg := sync.WaitGroup{}
-	c.lock.RLock()
-	for _, instance := range c.instances {
-		wg.Add(1)
-		go func(i *remote) {
-			defer wg.Done()
-			i.test()
-		}(instance)
-	}
-	wg.Wait()
-	for _, instance := range c.instances {
-		if instance.latency.Load() < serverLatencyDown {
-			availableQuantity++
-		}
-	}
-	c.lock.RUnlock()
-	c.sortByLatency()
-	log.Infof("签名服务器质量测试完成，可用服务器数量: %d", availableQuantity)
-}
-
-func (i *remote) sign(cmd string, seq uint32, buf []byte, header http.Header) (signResp *sign.Response, err error) {
-	if !(sign.ContainSignPKG(cmd) || cmd == "wtlogin.trans_emp") {
+// func (c *signer) check() {
+//	log.Infoln("开始签名服务器质量测试")
+//	availableQuantity := 0
+//	wg := sync.WaitGroup{}
+//	c.lock.RLock()
+//	for _, instance := range c.instances {
+//		wg.Add(1)
+//		go func(i *remote) {
+//			defer wg.Done()
+//			i.test()
+//		}(instance)
+//	}
+//	wg.Wait()
+//	for _, instance := range c.instances {
+//		if instance.latency.Load() < serverLatencyDown {
+//			availableQuantity++
+//		}
+//	}
+//	c.lock.RUnlock()
+//	c.sortByLatency()
+//	log.Infof("签名服务器质量测试完成，可用服务器数量: %d", availableQuantity)
+//}
+
+func (i *remote) sign(cmd string, seq uint32, buf []byte, uin uint32, guid, qua string, header http.Header) (signResp *sign.Response, err error) {
+	if !sign.ContainSignPKG(cmd) {
 		return nil, nil
 	}
 	signReq := sign.Request{
-		Cmd: cmd,
-		Seq: int(seq),
-		Src: buf,
+		Command: cmd,
+		Seq:     int(seq),
+		Body:    buf,
+		Uin:     uin,
+		GUID:    guid,
+		Qua:     qua,
 	}
 	u, err := url.Parse(i.server)
 	if err != nil {
@@ -190,6 +190,9 @@ func (i *remote) sign(cmd string, seq uint32, buf []byte, header http.Header) (s
 			req.Header.Add(k, v)
 		}
 	}
+	if i.token != "" {
+		req.Header.Set("Authorization", "Bearer "+i.token)
+	}
 	req.Header.Set("Content-Type", "application/json")
 
 	resp, err := http.DefaultClient.Do(req)
@@ -201,26 +204,29 @@ func (i *remote) sign(cmd string, seq uint32, buf []byte, header http.Header) (s
 	if err != nil {
 		return nil, err
 	}
+	if signResp.Code != 0 {
+		return nil, errors.New(signResp.Message)
+	}
 
 	return signResp, nil
 }
 
-func (i *remote) test() {
-	startTime := time.Now().UnixMilli()
-	resp, err := i.sign("wtlogin.login", 1, []byte{11, 45, 14}, nil)
-	if err != nil || len(resp.Value.Sign) == 0 {
-		log.Warnf("测试签名服务器：%s时出现错误: %v", i.server, err)
-		i.latency.Store(serverLatencyDown)
-		return
-	}
-	// 有长连接的情况，取两次平均值
-	resp, err = i.sign("wtlogin.login", 1, []byte{11, 45, 14}, nil)
-	if err != nil || len(resp.Value.Sign) == 0 {
-		log.Warnf("测试签名服务器：%s时出现错误: %v", i.server, err)
-		i.latency.Store(serverLatencyDown)
-		return
-	}
-	latency := (time.Now().UnixMilli() - startTime) / 2
-	i.latency.Store(uint32(latency))
-	log.Debugf("签名服务器：%s，延迟：%dms", i.server, latency)
-}
+// func (i *remote) test() {
+//	startTime := time.Now().UnixMilli()
+//	resp, err := i.sign("wtlogin.login", 1, []byte{11, 45, 14}, 0, "", "", nil)
+//	if err != nil || len(resp.Value.SecSign) == 0 {
+//		log.Warnf("测试签名服务器：%s时出现错误: %v", i.server, err)
+//		i.latency.Store(serverLatencyDown)
+//		return
+//	}
+//	// 有长连接的情况，取两次平均值
+//	resp, err = i.sign("wtlogin.login", 1, []byte{11, 45, 14}, 0, "", "", nil)
+//	if err != nil || len(resp.Value.SecSign) == 0 {
+//		log.Warnf("测试签名服务器：%s时出现错误: %v", i.server, err)
+//		i.latency.Store(serverLatencyDown)
+//		return
+//	}
+//	latency := (time.Now().UnixMilli() - startTime) / 2
+//	i.latency.Store(uint32(latency))
+//	log.Debugf("签名服务器：%s，延迟：%dms", i.server, latency)
+//}