feat: 添加分离部署gocq的账号时，支持指定access token (#137)

sealdice · Jul 24, 2023 · 4a1d41a · 4a1d41a
1 parent 4364573
commit 4a1d41a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/api/conn.go b/api/conn.go
@@ -551,9 +551,10 @@ func ImConnectionsAddGocqSeparate(c echo.Context) error {
 	}
 
 	v := struct {
-		Account    string `yaml:"account" json:"account"`
-		ConnectUrl string `yaml:"connectUrl" json:"connectUrl"` // 连接地址
-		RelWorkDir string `yaml:"relWorkDir" json:"relWorkDir"` //
+		Account     string `yaml:"account" json:"account"`
+		ConnectUrl  string `yaml:"connectUrl" json:"connectUrl"`   // 连接地址
+		AccessToken string `yaml:"accessToken" json:"accessToken"` // 访问令牌
+		RelWorkDir  string `yaml:"relWorkDir" json:"relWorkDir"`   //
 	}{}
 
 	err := c.Bind(&v)
@@ -578,6 +579,8 @@ func ImConnectionsAddGocqSeparate(c echo.Context) error {
 		// 三项设置
 		conn.RelWorkDir = v.RelWorkDir
 		pa.ConnectUrl = v.ConnectUrl
+		pa.AccessToken = v.AccessToken
+
 		pa.UseInPackGoCqhttp = false
 
 		myDice.ImSession.EndPoints = append(myDice.ImSession.EndPoints, conn)

diff --git a/dice/platform_adapter_qq.go b/dice/platform_adapter_qq.go
@@ -41,8 +41,9 @@ type PlatformAdapterGocq struct {
 	EndPoint *EndPointInfo `yaml:"-" json:"-"`
 	Session  *IMSession    `yaml:"-" json:"-"`
 
-	Socket     *gowebsocket.Socket `yaml:"-" json:"-"`
-	ConnectUrl string              `yaml:"connectUrl" json:"connectUrl"` // 连接地址
+	Socket      *gowebsocket.Socket `yaml:"-" json:"-"`
+	ConnectUrl  string              `yaml:"connectUrl" json:"connectUrl"`   // 连接地址
+	AccessToken string              `yaml:"accessToken" json:"accessToken"` // 访问令牌
 
 	UseInPackGoCqhttp bool `yaml:"useInPackGoCqhttp" json:"useInPackGoCqhttp"` // 是否使用内置的gocqhttp
 	GoCqHttpState     int  `yaml:"-" json:"loginState"`                        // 当前状态
@@ -209,6 +210,9 @@ func (pa *PlatformAdapterGocq) Serve() int {
 	session := s
 
 	socket := gowebsocket.New(pa.ConnectUrl)
+	if pa.AccessToken != "" {
+		socket.RequestHeader.Add("Authorization", "Bearer "+pa.AccessToken)
+	}
 	pa.Socket = &socket
 
 	socket.OnConnected = func(socket gowebsocket.Socket) {