Skip to content

G
go-cqhttp
Commit 21b9e2f3 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Mrs4s/go-cqhttp

parents 5381a7ed 7f103a7f
Pipeline #668 passed with stages
      in 4 minutes and 39 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 178 additions and 83 deletions
      Dockerfile
      View file @ 21b9e2f3
      FROM golang:1.14.2-alpine AS builder
      FROM golang:1.14.7-alpine AS builder
      ARG GO_CQHTTP_VERSION
      ENV GO_CQHTTP_VERSION ${GO_CQHTTP_VERSION:-v0.9.20-mycard}
      ......
      coolq/api.go
      View file @ 21b9e2f3
      ......@@ -25,7 +25,7 @@ func (bot *CQBot) CQGetLoginInfo() MSG {
      // https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
      func (bot *CQBot) CQGetFriendList() MSG {
      var fs []MSG
      fs := make([]MSG, 0)
      for _, f := range bot.Client.FriendList {
      fs = append(fs, MSG{
      "nickname": f.Nickname,
      ......@@ -38,7 +38,7 @@ func (bot *CQBot) CQGetFriendList() MSG {
      // https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
      func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
      var gs []MSG
      gs := make([]MSG, 0)
      if noCache {
      _ = bot.Client.ReloadGroupList()
      }
      ......@@ -73,7 +73,7 @@ func (bot *CQBot) CQGetGroupMemberList(groupId int64) MSG {
      if group == nil {
      return Failed(100)
      }
      var members []MSG
      members := make([]MSG, 0)
      for _, m := range group.Members {
      members = append(members, convertGroupMemberInfo(groupId, m))
      }
      ......@@ -525,7 +525,7 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
      if m == nil {
      return Failed(100)
      }
      var r []MSG
      r := make([]MSG, 0)
      for _, n := range m.Nodes {
      bot.checkMedia(n.Message)
      r = append(r, MSG{
      ......
      coolq/bot.go
      View file @ 21b9e2f3
      ......@@ -5,17 +5,19 @@ import (
      "encoding/gob"
      "encoding/json"
      "fmt"
      "hash/crc32"
      "path"
      "sync"
      "time"
      "github.com/Mrs4s/MiraiGo/binary"
      "github.com/Mrs4s/MiraiGo/client"
      "github.com/Mrs4s/MiraiGo/message"
      "github.com/Mrs4s/go-cqhttp/global"
      log "github.com/sirupsen/logrus"
      "github.com/tidwall/gjson"
      "github.com/xujiajun/nutsdb"
      "hash/crc32"
      "path"
      "sync"
      "time"
      )
      type CQBot struct {
      ......@@ -27,6 +29,7 @@ type CQBot struct {
      invitedReqCache sync.Map
      joinReqCache sync.Map
      tempMsgCache sync.Map
      oneWayMsgCache sync.Map
      }
      type MSG map[string]interface{}
      ......@@ -67,15 +70,20 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
      bot.Client.OnGroupInvited(bot.groupInvitedEvent)
      bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
      go func() {
      i := conf.HeartbeatInterval
      if i < 1 {
      log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
      return
      }
      for {
      time.Sleep(time.Second * 5)
      time.Sleep(time.Second * i)
      bot.dispatchEventMessage(MSG{
      "time": time.Now().Unix(),
      "self_id": bot.Client.Uin,
      "post_type": "meta_event",
      "meta_event_type": "heartbeat",
      "status": nil,
      "interval": 5000,
      "interval": 1000 * i,
      })
      }
      }()
      ......@@ -159,12 +167,15 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
      if msg != nil {
      id = msg.Id
      }
      } else {
      if code, ok := bot.tempMsgCache.Load(target); ok {
      msg := bot.Client.SendTempMessage(code.(int64), target, m)
      if msg != nil {
      id = msg.Id
      }
      } else if code, ok := bot.tempMsgCache.Load(target); ok {
      msg := bot.Client.SendTempMessage(code.(int64), target, m)
      if msg != nil {
      id = msg.Id
      }
      } else if _, ok := bot.oneWayMsgCache.Load(target); ok {
      msg := bot.Client.SendPrivateMessage(target, m)
      if msg != nil {
      id = msg.Id
      }
      }
      if id == -1 {
      ......
      coolq/cqcode.go
      View file @ 21b9e2f3
      ......@@ -367,12 +367,18 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
      if group {
      rsp, err := bot.Client.QueryGroupImage(1, hash, size)
      if err != nil {
      if url != "" {
      return bot.ToElement(t, map[string]string{"file": url}, group)
      }
      return nil, err
      }
      return rsp, nil
      }
      rsp, err := bot.Client.QueryFriendImage(1, hash, size)
      if err != nil {
      if url != "" {
      return bot.ToElement(t, map[string]string{"file": url}, group)
      }
      return nil, err
      }
      return rsp, nil
      ......@@ -452,7 +458,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
      if len(aid) < 2 {
      return nil, errors.New("song error")
      }
      xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="https://i.y.qq.com/v8/playsong.html?_wv=1&songid=%s&souce=qqshare&source=qqshare&ADTAG=qqshare" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="http://imgcache.qq.com/music/photo/album_500/%s/500_albumpic_%s_0.jpg" src="%s" /><title>%s</title><summary>%s</summary></item><source name="QQ音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
      xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="https://i.y.qq.com/v8/playsong.html?_wv=1&amp;songid=%s&amp;souce=qqshare&amp;source=qqshare&amp;ADTAG=qqshare" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="http://imgcache.qq.com/music/photo/album_500/%s/500_albumpic_%s_0.jpg" src="%s" /><title>%s</title><summary>%s</summary></item><source name="QQ音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
      name, d["id"], aid[:len(aid)-2], aid, name, "", info.Get("track_info.singer.name").Str)
      return &message.ServiceElement{
      Id: 60,
      ......
      coolq/event.go
      View file @ 21b9e2f3
      ......@@ -32,6 +32,9 @@ func ToFormattedMessage(e []message.IMessageElement, code int64, raw ...bool) (r
      func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
      bot.checkMedia(m.Elements)
      cqm := ToStringMessage(m.Elements, 0, true)
      if !m.Sender.IsFriend {
      bot.oneWayMsgCache.Store(m.Sender.Uin, "")
      }
      log.Infof("收到好友 %v(%v) 的消息: %v", m.Sender.DisplayName(), m.Sender.Uin, cqm)
      fm := MSG{
      "post_type": "message",
      ......
      docs/config.md
      View file @ 21b9e2f3
      ......@@ -22,11 +22,15 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
      "password_encrypted": "",
      "enable_db": true,
      "access_token": "",
      "relogin": false,
      "relogin_delay": 0,
      "relogin": {
      "enabled": true,
      "relogin_delay": 3,
      "max_relogin_times": 0
      },
      "post_message_format": "string",
      "ignore_invalid_cqcode": false,
      "force_fragmented": true,
      "heartbeat_interval": 5,
      "http_config": {
      "enabled": true,
      "host": "0.0.0.0",
      ......@@ -55,17 +59,19 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
      | ------------------ | -------- | ------------------------------------------------------------------- |
      | uin | int64 | 登录用QQ号 |
      | password | string | 登录用密码 |
      | encrypt_password | bool | 是否对密码进行加密. |
      | encrypt_password | bool | 是否对密码进行加密. |
      | password_encrypted | string | 加密后的密码(请勿修改) |
      | enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 |
      | access_token | string | 同CQHTTP的 `access_token` 用于身份验证 |
      | relogin | bool | 是否自动重新登录 |
      | relogin_delay | int | 重登录延时（秒） |
      | post_message_format | string | 上报信息类型 |
      | ignore_invalid_cqcode| bool | 是否忽略错误的CQ码 |
      | enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 |
      | access_token | string | 同CQHTTP的 `access_token` 用于身份验证 |
      | relogin | bool | 是否自动重新登录 |
      | relogin_delay | int | 重登录延时（秒） |
      | max_relogin_times | uint | 最大重登录次数，若0则不设置上限 |
      | post_message_format | string | 上报信息类型 |
      | ignore_invalid_cqcode| bool | 是否忽略错误的CQ码 |
      | force_fragmented | bool | 是否强制分片发送群长消息 |
      | http_config | object | HTTP API配置 |
      | ws_config | object | Websocket API 配置 |
      | heartbeat_interval | int64 | 心跳间隔时间，单位秒，若0则关闭心跳 |
      | http_config | object | HTTP API配置 |
      | ws_config | object | Websocket API 配置 |
      | ws_reverse_servers | object[] | 反向 Websocket API 配置 |
      | log_level | string | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error|
      ......@@ -73,4 +79,6 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
      > 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
      > 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
      > 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
      \ No newline at end of file
      > 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
      > 注3：关闭心跳服务可能引起断线，请谨慎关闭
      global/config.go
      View file @ 21b9e2f3
      ......@@ -2,20 +2,28 @@ package global
      import (
      "encoding/json"
      "os"
      "strconv"
      "time"
      log "github.com/sirupsen/logrus"
      )
      type JsonConfig struct {
      Uin int64 `json:"uin"`
      Password string `json:"password"`
      EncryptPassword bool `json:"encrypt_password"`
      PasswordEncrypted string `json:"password_encrypted"`
      EnableDB bool `json:"enable_db"`
      AccessToken string `json:"access_token"`
      ReLogin bool `json:"relogin"`
      ReLoginDelay int `json:"relogin_delay"`
      Uin int64 `json:"uin"`
      Password string `json:"password"`
      EncryptPassword bool `json:"encrypt_password"`
      PasswordEncrypted string `json:"password_encrypted"`
      EnableDB bool `json:"enable_db"`
      AccessToken string `json:"access_token"`
      ReLogin struct {
      Enabled bool `json:"enabled"`
      ReLoginDelay int `json:"relogin_delay"`
      MaxReloginTimes uint `json:"max_relogin_times"`
      } `json:"relogin"`
      IgnoreInvalidCQCode bool `json:"ignore_invalid_cqcode"`
      ForceFragmented bool `json:"force_fragmented"`
      HeartbeatInterval time.Duration `json:"heartbeat_interval"`
      HttpConfig *GoCQHttpConfig `json:"http_config"`
      WSConfig *GoCQWebsocketConfig `json:"ws_config"`
      ReverseServers []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
      ......@@ -67,9 +75,16 @@ type GoCQReverseWebsocketConfig struct {
      func DefaultConfig() *JsonConfig {
      return &JsonConfig{
      EnableDB: true,
      ReLogin: true,
      ReLoginDelay: 3,
      EnableDB: true,
      ReLogin: struct {
      Enabled bool `json:"enabled"`
      ReLoginDelay int `json:"relogin_delay"`
      MaxReloginTimes uint `json:"max_relogin_times"`
      }{
      Enabled: true,
      ReLoginDelay: 3,
      MaxReloginTimes: 0,
      },
      PostMessageFormat: "string",
      ForceFragmented: true,
      HttpConfig: &GoCQHttpConfig{
      ......@@ -104,6 +119,8 @@ func Load(p string) *JsonConfig {
      err := json.Unmarshal([]byte(ReadAllText(p)), &c)
      if err != nil {
      log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
      log.Infoln("原文件已备份")
      os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
      return nil
      }
      return &c
      ......
      go.mod
      View file @ 21b9e2f3
      ......@@ -3,22 +3,24 @@ module github.com/Mrs4s/go-cqhttp
      go 1.14
      require (
      github.com/Mrs4s/MiraiGo v0.0.0-20200825052841-d3b0f5f9e839
      github.com/Mrs4s/MiraiGo v0.0.0-20200827182935-51e155ef20da
      github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
      github.com/gin-gonic/gin v1.6.3
      github.com/gorilla/websocket v1.4.2
      github.com/guonaihong/gout v0.1.1
      github.com/guonaihong/gout v0.1.2
      github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
      github.com/jonboulle/clockwork v0.2.0 // indirect
      github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
      github.com/lestrrat-go/strftime v1.0.1 // indirect
      github.com/lestrrat-go/strftime v1.0.3 // indirect
      github.com/pkg/errors v0.9.1 // indirect
      github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
      github.com/sirupsen/logrus v1.6.0
      github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
      github.com/tebeka/strftime v0.1.5 // indirect
      github.com/tidwall/gjson v1.6.0
      github.com/tidwall/gjson v1.6.1
      github.com/xujiajun/nutsdb v0.5.0
      github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
      golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
      golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
      golang.org/x/sys v0.0.0-20200828194041-157a740278f4 // indirect
      gopkg.in/yaml.v2 v2.3.0 // indirect
      )
      go.sum
      View file @ 21b9e2f3
      cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
      github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
      github.com/Mrs4s/MiraiGo v0.0.0-20200825052841-d3b0f5f9e839 h1:TDhaPfWcubIMKDz1HU+N07SwIUjj7oVUQ7EXZBbDUxs=
      github.com/Mrs4s/MiraiGo v0.0.0-20200825052841-d3b0f5f9e839/go.mod h1:0je03wji/tSw4bUH4QCF2Z4/EjyNWjSJTyy5tliX6EM=
      github.com/Mrs4s/MiraiGo v0.0.0-20200827182935-51e155ef20da h1:T2Qz4w6sMrBxw+oiwbUa/c996jWYulCAtM+x1L0l3R8=
      github.com/Mrs4s/MiraiGo v0.0.0-20200827182935-51e155ef20da/go.mod h1:0je03wji/tSw4bUH4QCF2Z4/EjyNWjSJTyy5tliX6EM=
      github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
      github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
      github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
      github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
      github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
      github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
      github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
      github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
      github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
      github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
      github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
      github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
      github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
      github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
      github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
      github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
      github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
      github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
      github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
      github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
      ......@@ -45,21 +42,18 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
      github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
      github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
      github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
      github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
      github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
      github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
      github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
      github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
      github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
      github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
      github.com/guonaihong/gout v0.1.1 h1:2i3eqQ1KUhTlj7AFeIHqVUFku5QwUhwE2wNgYTVpbxQ=
      github.com/guonaihong/gout v0.1.1/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
      github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
      github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
      github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
      github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
      github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs=
      github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
      github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
      github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
      github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
      github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
      github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
      ......@@ -67,25 +61,23 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
      github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
      github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
      github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
      github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
      github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
      github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
      github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
      github.com/lestrrat-go/strftime v1.0.1 h1:o7qz5pmLzPDLyGW4lG6JvTKPUfTFXwe+vOamIYWtnVU=
      github.com/lestrrat-go/strftime v1.0.1/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
      github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
      github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
      github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
      github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
      github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
      github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
      github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
      github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
      github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
      github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
      github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
      github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
      github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
      github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
      github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
      github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
      github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
      github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
      ......@@ -97,18 +89,20 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
      github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
      github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
      github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
      github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
      github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
      github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
      github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
      github.com/tebeka/strftime v0.1.5 h1:1NQKN1NiQgkqd/2moD6ySP/5CoZQsKa1d3ZhJ44Jpmg=
      github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
      github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
      github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
      github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
      github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
      github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
      github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
      github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
      github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
      github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
      github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
      github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
      github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
      github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
      ......@@ -123,6 +117,7 @@ github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJl
      github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
      github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
      golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
      golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
      golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
      golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
      golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
      ......@@ -131,8 +126,11 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
      golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
      golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
      golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
      golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
      golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
      golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
      golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
      golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
      golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
      golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
      golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
      ......@@ -140,11 +138,15 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
      golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
      golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
      golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
      golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
      golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/sys v0.0.0-20200828194041-157a740278f4 h1:kCCpuwSAoYJPkNc6x0xT9yTtV4oKtARo4RGBQWOfg9E=
      golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
      golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
      golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
      ......@@ -152,7 +154,6 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
      golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
      golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
      golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
      golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
      golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
      google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
      google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
      ......@@ -172,12 +173,13 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
      google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
      google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
      google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
      gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
      gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
      gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
      gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
      gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
      gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
      gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
      gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
      gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
      honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
      honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
      main.go
      View file @ 21b9e2f3
      ......@@ -22,6 +22,7 @@ import (
      "github.com/Mrs4s/go-cqhttp/coolq"
      "github.com/Mrs4s/go-cqhttp/global"
      "github.com/Mrs4s/go-cqhttp/server"
      rotatelogs "github.com/lestrrat-go/file-rotatelogs"
      "github.com/rifflock/lfshook"
      log "github.com/sirupsen/logrus"
      ......@@ -311,24 +312,39 @@ func main() {
      log.Info("资源初始化完成, 开始处理信息.")
      log.Info("アトリは、高性能ですから!")
      cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
      if conf.ReLogin {
      log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连.", e.Message, conf.ReLoginDelay)
      time.Sleep(time.Second * time.Duration(conf.ReLoginDelay))
      rsp, err := cli.Login()
      if err != nil {
      log.Fatalf("重连失败: %v", err)
      }
      if !rsp.Success {
      switch rsp.Error {
      case client.NeedCaptcha:
      log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)")
      case client.UnsafeDeviceError:
      log.Fatalf("重连失败: 设备锁")
      default:
      log.Fatalf("重连失败: %v", rsp.ErrorMessage)
      if conf.ReLogin.Enabled {
      var times uint = 1
      for {
      if conf.ReLogin.MaxReloginTimes == 0 {
      } else if times > conf.ReLogin.MaxReloginTimes {
      break
      }
      log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
      e.Message, conf.ReLogin.ReLoginDelay, times)
      times++
      time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
      rsp, err := cli.Login()
      if err != nil {
      log.Errorf("重连失败: %v", err)
      continue
      }
      if !rsp.Success {
      switch rsp.Error {
      case client.NeedCaptcha:
      log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)")
      case client.UnsafeDeviceError:
      log.Fatalf("重连失败: 设备锁")
      default:
      log.Errorf("重连失败: %v", rsp.ErrorMessage)
      continue
      }
      }
      log.Info("重连成功")
      return
      }
      return
      log.Fatal("重连失败: 重连次数达到设置的上限值")
      }
      b.Release()
      log.Fatalf("Bot已离线：%v", e.Message)
      ......
      server/websocket.go
      View file @ 21b9e2f3
      ......@@ -206,10 +206,20 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
      func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
      if s.token != "" {
      if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
      if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      } else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
      if auth[1] != s.token {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      } else {
      log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      }
      c, err := upgrader.Upgrade(w, r, nil)
      ......@@ -235,10 +245,20 @@ func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
      func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
      if s.token != "" {
      if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
      if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      } else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
      if auth[1] != s.token {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      } else {
      log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      }
      c, err := upgrader.Upgrade(w, r, nil)
      ......@@ -253,10 +273,20 @@ func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
      func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
      if s.token != "" {
      if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
      if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      } else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
      if auth[1] != s.token {
      log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      } else {
      log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
      w.WriteHeader(401)
      return
      }
      }
      c, err := upgrader.Upgrade(w, r, nil)
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment