update .goreleaser.yml

(cherry picked from commit eb8a65c682) add maintainer (cherry picked from commit a5947ece10)
use goreleaser
2025-06-30 20:03:24 +00:00 · 2021-04-30 19:26:06 +08:00 · 2021-04-30 19:25:20 +08:00 · 2021-04-30 17:00:29 +08:00 · 2021-04-30 16:53:47 +08:00 · 2021-04-30 16:53:47 +08:00
36 changed files with 1023 additions and 943 deletions
--- a/.github/ISSUE_TEMPLATE/bug--.md
+++ b/.github/ISSUE_TEMPLATE/bug--.md
@ -1,16 +1,13 @@
 ---
 name: Bug汇报
-about: 遇到了bug? 你可以在这里开始汇报（仅限软件本体问题）
+about: 遇到了bug? 你可以在这里开始汇报
 title: ''
-labels: bug?
+labels: ''
 assignees: ''
 ---
 <!--
 ！请不要删除此处内容！
 在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
 1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
@ -31,7 +28,7 @@ assignees: ''
 -->
 **环境信息**
-<!-- 请根据实际使用环境修改以下信息。请勿删除或留空。 -->
+<!-- 请根据实际使用环境修改以下信息。请勿留空。 -->
 go-cqhttp版本: 
 运行环境: 
 连接方式: 
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 不知道怎么做?
+  - name: 提出新建议/功能
-    url: https://github.com/Mrs4s/go-cqhttp/issues/633
+    url: https://github.com/Mrs4s/go-cqhttp/discussions/new
-    about: 建议你先查看此教程
+    about: 请在这里提出你的建议或功能
  - name: 讨论区
    url: https://github.com/Mrs4s/go-cqhttp/discussions/
    about: 使用中若遇到问题或有新点子新需求，请先在这里求助和征求意见。
--- a/.github/ISSUE_TEMPLATE/feat--.md
+++ b/.github/ISSUE_TEMPLATE/feat--.md
@ -1,15 +0,0 @@
 ---
 name: 新功能提议
 about: 提出新功能
 title: ''
 labels: feature request
 assignees: ''
 ---
 **环境信息**
 <!-- 请尽量填写 -->
 go-cqhttp版本: 
 **需要添加的功能内容**
 <!-- 请在这里详细描述新功能的实现方法 -->
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -48,3 +48,13 @@ jobs:
        with:
          name: ${{ matrix.goos }}_${{ matrix.goarch }}
          path: output/
  golangci:
    name: lint
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: golangci-lint
        uses: golangci/golangci-lint-action@v2
        with:
          version: v1.29
--- a/.github/workflows/golint.yml
+++ b/.github/workflows/golint.yml
@ -1,24 +0,0 @@
 name: Lint
 on: [push]
 jobs:
  golangci:
    name: lint
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: golangci-lint
        uses: golangci/golangci-lint-action@v2
        with:
          version: latest
      - name: Commit back
        continue-on-error: true
        run: |
          git config --local user.name 'Github Actions'
          git config --local user.email 'github-actions@users.noreply.github.com'
          git add --all
          git commit -m "ci(chore): Fix stylings"
          git push
--- a/.github/workflows/issuebot.yml
+++ b/.github/workflows/issuebot.yml
@ -2,7 +2,7 @@ name: Issuebot
 on:
  issues:
-    types: [opened, edited]
+    types: [opened]
 jobs:
  new_issue:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,4 +1,4 @@
-name: build
+name: release
 on:
  push:
@ -9,14 +9,12 @@ jobs:
  goreleaser:
    runs-on: ubuntu-latest
    steps:
-      -
+      - name: Checkout
        name: Checkout
        uses: actions/checkout@v2.3.4
        with:
          fetch-depth: 0
-      -
+      - name: Set up Go
        name: Set up Go
        uses: actions/setup-go@v2
        with:
          go-version: '1.16.2'
--- a/.github/workflows/suggester.yml
+++ b/.github/workflows/suggester.yml
@ -1,20 +0,0 @@
 name: Lint
 on: [pull_request]
 jobs:
  golangci:
    name: lint
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: golangci-lint
        uses: golangci/golangci-lint-action@v2
        with:
          version: latest
      - name: Suggester
        uses: reviewdog/action-suggester@v1
        with:
          tool_name: golangci-lint
--- a/.golangci.yml
+++ b/.golangci.yml
@ -1,92 +0,0 @@
 linters-settings:
  errcheck:
    ignore: fmt:.*,io/ioutil:^Read.*
    ignoretests: true
  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
 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
  enable:
    - bodyclose
    - deadcode
    - depguard
    - dogsled
    - dupl
    - errcheck
    - exportloopref
    - exhaustive
    #- funlen
    #- goconst
    - gocritic
    #- gocyclo
    - gofmt
    - goimports
    - goprintffuncname
    #- gosec
    - gosimple
    - govet
    - ineffassign
    - misspell
    - nolintlint
    - rowserrcheck
    - staticcheck
    - structcheck
    - stylecheck
    - typecheck
    - unconvert
    - unparam
    - unused
    - varcheck
    - whitespace
    - prealloc
    - predeclared
    - asciicheck
    - revive
    - forbidigo
    - makezero
    #- interfacer
  # don't enable:
  # - scopelint
  # - gochecknoglobals
  # - gocognit
  # - godot
  # - godox
  # - goerr113
  # - interfacer
  # - maligned
  # - nestif
  # - testpackage
  # - wsl
 run:
  # default concurrency is a available CPU number.
  # concurrency: 4 # explicitly omit this value to fully utilize available resources.
  deadline: 5m
  issues-exit-code: 1
  tests: false
 # output configuration options
 output:
  format: 'colored-line-number'
  print-issued-lines: true
  print-linter-name: true
  uniq-by-line: true
 issues:
  # Fix found issues (if it's supported by the linter)
  fix: true
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@ -4,13 +4,13 @@ before:
  hooks:
    - go mod tidy
 builds:
-  - env:
+  - id: nowin
    env:
      - CGO_ENABLED=0
      - GO111MODULE=on
    goos:
      - linux
      - darwin
      - windows
    goarch:
      - 386
      - amd64
@ -21,22 +21,37 @@ builds:
        goarch: arm
      - goos: darwin
        goarch: 386
-      - goos: windows
+    mod_timestamp: "{{ .CommitTimestamp }}"
-        goarch: arm64
+    flags:
-    mod_timestamp: '{{ .CommitTimestamp }}'
+      - -trimpath
    ldflags:
      - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
  - id: win
    env:
      - CGO_ENABLED=0
      - GO111MODULE=on
    goos:
      - windows
    goarch:
      - 386
      - amd64
      - arm
    goarm:
      - 7
    mod_timestamp: "{{ .CommitTimestamp }}"
    flags:
      - -trimpath
    ldflags:
      - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
 checksum:
-  name_template: '{{ .ProjectName }}_checksums.txt'
+  name_template: "{{ .ProjectName }}_checksums.txt"
 changelog:
  sort: asc
  filters:
    exclude:
-      - '^docs:'
+      - "^docs:"
-      - '^test:'
+      - "^test:"
      - fix typo
      - Merge pull request
      - Merge branch
@ -44,7 +59,27 @@ changelog:
      - go mod tidy
 archives:
-  - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+  - id: binary
    builds:
      - win
    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
    format_overrides:
      - goos: windows
        format: binary
  - id: nowin
    builds:
      - nowin
      - win
    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
    format_overrides:
      - goos: windows
        format: zip
 nfpms:
  - license: AGPL 3.0
    homepage: https://go-cqhttp.org
    file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
    formats:
      - deb
      - rpm
    maintainer: Mrs4s
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,74 +0,0 @@
 # Contributing to go-cqhttp
 想要成为 go-cqhttp 的 Contributor? Awesome!
 这个页面提供了一些 Tips ，可能对您的开发提供一些帮助.
 ## 开发环境准备
 go-cqhttp 使用了 `golangci-lint` 检查可能的问题，规范代码风格，为了减少不必要的麻烦，
 我们推荐在开发环境中安装 `golangci-lint` 工具.
 ```shell
 go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 ```
 在提交代码前运行 `golangci-lint` 检查你的代码:
 ```shell
 golangci-lint run
 ```
 **注意**: `golangci-lint` 需要 `diff` 工具，在 windows 环境中，你可能需要使用 `Git Bash` 运行。
 ## Pull requests
 首先，为了方便项目管理，请将您的 PR 推送至**dev**分支。
 ### 检查 issue 列表
 不管你是已经明确了要提交什么代码，还是正在寻找一个想法，你都应该先到 issue 列表看一下。
 如果在 issue 中找到了感兴趣的，请在 issue 表明正在对这个 issue 进行开发。
 ### 项目结构
 下面是 go-cqhttp 项目结构的简单介绍.
 <table class="tg">
  <tr>
    <td>coolq</td>
    <td>
      包含与 MiraiGo 交互部分， CQ码解析等部分
    </td>
  </tr>
  <tr>
    <td>server</td>
    <td>
      包含 http，ws 通信的实现部分
    </td>
  </tr>
  <tr>
    <td>global</td>
    <td>
      一个<del>实用的</del>工具包
    </td>
  </tr>
  <tr>
    <td>docs</td>
    <td>
      使用教程与文档
    </td>
  </tr>
 </table>
 ## 社区准则
 为了让社区保持强大，不断发展，我们向整个社区提出了一些通用准则：
 **友善**：对社区成员要礼貌，尊重和礼貌。 请不要在社区中发布任何有关种族歧视、性别歧视、
 地域歧视、人格侮辱等言论。
 **鼓励参与**：在社区中讲礼貌的每个人都受到欢迎，无论他们的贡献程度如何，
 我们鼓励一切人参与(不一定需要提交代码) `go-cqhttp` 的开发。
 **紧贴主题**：请避免主题外的讨论。当您更新或回复时， 可能会给大量人员发送邮件，
 请牢记，没有人喜欢垃圾邮件。
--- a/README.md
+++ b/README.md
@ -18,7 +18,6 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
  <a href="https://github.com/Mrs4s/go-cqhttp/releases">
    <img src="https://img.shields.io/github/v/release/Mrs4s/go-cqhttp?color=blueviolet&include_prereleases" alt="release">
  </a>
 <a href="https://app.fossa.com/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp.svg?type=shield"/></a>
  <a href="https://github.com/howmanybots/onebot/blob/master/README.md">
    <img src="https://img.shields.io/badge/OneBot-v11-blue?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAAIVBMVEUAAAAAAAADAwMHBwceHh4UFBQNDQ0ZGRkoKCgvLy8iIiLWSdWYAAAAAXRSTlMAQObYZgAAAQVJREFUSMftlM0RgjAQhV+0ATYK6i1Xb+iMd0qgBEqgBEuwBOxU2QDKsjvojQPvkJ/ZL5sXkgWrFirK4MibYUdE3OR2nEpuKz1/q8CdNxNQgthZCXYVLjyoDQftaKuniHHWRnPh2GCUetR2/9HsMAXyUT4/3UHwtQT2AggSCGKeSAsFnxBIOuAggdh3AKTL7pDuCyABcMb0aQP7aM4AnAbc/wHwA5D2wDHTTe56gIIOUA/4YYV2e1sg713PXdZJAuncdZMAGkAukU9OAn40O849+0ornPwT93rphWF0mgAbauUrEOthlX8Zu7P5A6kZyKCJy75hhw1Mgr9RAUvX7A3csGqZegEdniCx30c3agAAAABJRU5ErkJggg==" alt="cqhttp">
  </a>
@ -36,11 +35,8 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
  <a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
  ·
  <a href="https://docs.go-cqhttp.org/guide/quick_start.html">开始使用</a>
  ·
  <a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a>
 </p>
 ## 兼容性
 go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs)绝大多数内容，并在其基础上做了一些扩展，详情请看go-cqhttp的文档
@ -283,4 +279,4 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
 ## 性能
-在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.
+在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.
--- a/coolq/api.go
+++ b/coolq/api.go
@ -14,20 +14,25 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
+	"unicode/utf8"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/Mrs4s/go-cqhttp/global"
 )
 // Version go-cqhttp的版本信息，在编译时使用ldflags进行覆盖
 var Version = "unknown"
 func init() {
 	if Version != "unknown" {
 		return
 	}
 	info, ok := debug.ReadBuildInfo()
 	if ok {
 		Version = info.Main.Version
@ -45,7 +50,7 @@ func (bot *CQBot) CQGetLoginInfo() MSG {
 //
 // https://git.io/Jtz1L
 func (bot *CQBot) CQGetFriendList() MSG {
-	fs := make([]MSG, 0, len(bot.Client.FriendList))
+	fs := make([]MSG, 0)
 	for _, f := range bot.Client.FriendList {
 		fs = append(fs, MSG{
 			"nickname": f.Nickname,
@ -60,7 +65,7 @@ func (bot *CQBot) CQGetFriendList() MSG {
 //
 // https://git.io/Jtz1t
 func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
-	gs := make([]MSG, 0, len(bot.Client.GroupList))
+	gs := make([]MSG, 0)
 	if noCache {
 		_ = bot.Client.ReloadGroupList()
 	}
@ -129,7 +134,7 @@ func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) MSG {
 		}
 		group.Members = t
 	}
-	members := make([]MSG, 0, len(group.Members))
+	members := make([]MSG, 0)
 	for _, m := range group.Members {
 		members = append(members, convertGroupMemberInfo(groupID, m))
 	}
@ -447,12 +452,12 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 // CQSendPrivateMessage 发送私聊消息
 //
 // https://git.io/Jtz1l
-func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, i interface{}, autoEscape bool) MSG {
+func (bot *CQBot) CQSendPrivateMessage(userID int64, groupId int64, i interface{}, autoEscape bool) MSG {
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
 			elem := bot.ConvertObjectMessage(m, false)
-			mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
+			mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
@ -477,7 +482,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, i interface{
 	} else {
 		elem = bot.ConvertStringMessage(str, false)
 	}
-	mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
+	mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
@ -976,7 +981,7 @@ func (bot *CQBot) CQGetForwardMessage(resID string) MSG {
 	if m == nil {
 		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
 	}
-	r := make([]MSG, 0, len(m.Nodes))
+	r := make([]MSG, 0)
 	for _, n := range m.Nodes {
 		bot.checkMedia(n.Message)
 		r = append(r, MSG{
@ -1062,7 +1067,7 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) MSG {
 		log.Warnf("获取群历史消息失败: %v", err)
 		return Failed(100, "MESSAGES_API_ERROR", err.Error())
 	}
-	var ms = make([]MSG, 0, len(msg))
+	var ms []MSG
 	for _, m := range msg {
 		id := m.Id
 		bot.checkMedia(m.Elements)
@ -1088,7 +1093,7 @@ func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
 			return Failed(100, "REFRESH_STATUS_ERROR", err.Error())
 		}
 	}
-	var d = make([]MSG, 0, len(bot.Client.OnlineClients))
+	var d []MSG
 	for _, oc := range bot.Client.OnlineClients {
 		d = append(d, MSG{
 			"app_id":      oc.AppId,
@ -1246,7 +1251,7 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG {
 	if err != nil {
 		return Failed(100, "GET_ESSENCE_LIST_FOUND", err.Error())
 	}
-	list := make([]MSG, 0, len(msgList))
+	list := make([]MSG, 0)
 	for _, m := range msgList {
 		var msg = MSG{
 			"sender_nick":   m.SenderNick,
@ -1351,8 +1356,6 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
 				return "owner"
 			case client.Administrator:
 				return "admin"
 			case client.Member:
 				return "member"
 			default:
 				return "member"
 			}
@ -1365,10 +1368,15 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
 }
 func limitedString(str string) string {
-	if strings.Count(str, "") <= 10 {
+	if utf8.RuneCountInString(str) <= 10 {
 		return str
 	}
-	limited := []rune(str)
+	b := utils.S2B(str)
-	limited = limited[:10]
+	limited := make([]rune, 0, 10)
 	for i := 0; i < 10; i++ {
 		decodeRune, size := utf8.DecodeRune(b)
 		b = b[size:]
 		limited = append(limited, decodeRune)
 	}
 	return string(limited) + " ..."
 }
--- a/coolq/bot.go
+++ b/coolq/bot.go
@ -13,8 +13,6 @@ import (
 	"sync"
 	"time"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
@ -22,6 +20,8 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/Mrs4s/go-cqhttp/global"
 )
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@ -30,7 +30,7 @@ var json = jsoniter.ConfigCompatibleWithStandardLibrary
 type CQBot struct {
 	Client *client.QQClient
-	events         []func(*bytes.Buffer)
+	events         []func(MSG)
 	db             *leveldb.DB
 	friendReqCache sync.Map
 	tempMsgCache   sync.Map
@ -63,7 +63,6 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
 	if conf.EnableSelfMessage {
 		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
@ -110,7 +109,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 }
 // OnEventPush 注册事件上报函数
-func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
+func (bot *CQBot) OnEventPush(f func(m MSG)) {
 	bot.events = append(bot.events, f)
 }
@ -120,8 +119,7 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 		m := MSG{}
 		data, err := bot.db.Get(binary.ToBytes(mid), nil)
 		if err == nil {
-			buff := global.NewBuffer()
+			buff := new(bytes.Buffer)
 			defer global.PutBuffer(buff)
 			buff.Write(binary.GZipUncompress(data))
 			err = gob.NewDecoder(buff).Decode(&m)
 			if err == nil {
@ -150,7 +148,7 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
 		}
 		defer video.Close()
 		hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
-		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
+		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
 		_, _ = video.Seek(0, io.SeekStart)
 		_, _ = v.thumb.Seek(0, io.SeekStart)
 		return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
@ -174,7 +172,7 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
-	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
+	var newElem []message.IMessageElement
 	group := bot.Client.FindGroup(groupID)
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
@ -246,7 +244,7 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 // SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
-	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
+	var newElem []message.IMessageElement
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
 			fm, err := bot.UploadLocalImageAsPrivate(target, i)
@ -262,7 +260,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 			return 0
 		}
 		if i, ok := elem.(*message.VoiceElement); ok {
-			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
+			fv, err := bot.Client.UploadPrivatePtt(target, bytes.NewReader(i.Data))
 			if err != nil {
 				log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
 				continue
@ -299,7 +297,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		}
 	} else if code, ok := bot.tempMsgCache.Load(target); ok || groupID != 0 { // 临时会话
 		switch {
-		case bot.Client.FindGroup(groupID) == nil:
+		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
 			id = -1
 		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
@ -309,10 +307,10 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
 			id = -1
 		default:
-			if code != nil {
+			if code != nil && groupID == 0 {
 				groupID = code.(int64)
 			}
-			msg := bot.Client.SendTempMessage(groupID, target, m)
+			msg := bot.Client.SendGroupTempMessage(groupID, target, m)
 			if msg != nil {
 				id = bot.InsertTempMessage(target, msg)
 			}
@ -348,8 +346,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	}
 	id := toGlobalID(m.GroupCode, m.Id)
 	if bot.db != nil {
-		buf := global.NewBuffer()
+		buf := new(bytes.Buffer)
 		defer global.PutBuffer(buf)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
@ -374,8 +371,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	}
 	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
-		buf := global.NewBuffer()
+		buf := new(bytes.Buffer)
 		defer global.PutBuffer(buf)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
@ -402,8 +398,7 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 	}
 	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
-		buf := global.NewBuffer()
+		buf := new(bytes.Buffer)
 		defer global.PutBuffer(buf)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
@ -433,28 +428,21 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
 		log.Debug("Event filtered!")
 		return
 	}
 	buf := global.NewBuffer()
 	wg := sync.WaitGroup{}
 	wg.Add(len(bot.events))
 	_ = json.NewEncoder(buf).Encode(m)
 	for _, f := range bot.events {
-		go func(fn func(*bytes.Buffer)) {
+		go func(fn func(MSG)) {
 			defer func() {
 				wg.Done()
 				if pan := recover(); pan != nil {
 					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
 				}
 			}()
 			start := time.Now()
-			fn(buf)
+			fn(m)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
 			}
 		}(f)
 	}
 	wg.Wait()
 	global.PutBuffer(buf)
 }
 func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
@ -516,8 +504,6 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 				return "owner"
 			case client.Administrator:
 				return "admin"
 			case client.Member:
 				return "member"
 			default:
 				return "member"
 			}
--- a/coolq/cqcode.go
+++ b/coolq/cqcode.go
@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/base64"
 	goBinary "encoding/binary"
 	"encoding/hex"
 	xml2 "encoding/xml"
 	"errors"
@ -29,6 +28,7 @@ import (
 	"github.com/tidwall/gjson"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/global/codec"
 )
 /*
@ -47,15 +47,8 @@ var SplitURL = false
 var magicCQ = uint32(0)
 func init() {
-	const sizeInt = int(unsafe.Sizeof(0))
+	var CQHeader = "[CQ:"
-	x := 0x1234
+	magicCQ = *(*uint32)(unsafe.Pointer((*reflect.StringHeader)(unsafe.Pointer(&CQHeader)).Data))
 	p := unsafe.Pointer(&x)
 	p2 := (*[sizeInt]byte)(p)
 	if p2[0] == 0 {
 		magicCQ = goBinary.BigEndian.Uint32([]byte("[CQ:"))
 	} else {
 		magicCQ = goBinary.LittleEndian.Uint32([]byte("[CQ:"))
 	}
 }
 // add 指针运算
@ -128,7 +121,7 @@ func (e *PokeElement) Type() message.ElementType {
 // ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
 func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []MSG) {
-	r = make([]MSG, 0, len(e))
+	r = []MSG{}
 	ur := false
 	if len(isRaw) != 0 {
 		ur = isRaw[0]
@ -233,7 +226,7 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
 			} else {
 				m = MSG{
 					"type": "image",
-					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
 				}
 			}
 		case *message.FriendImageElement:
@ -245,7 +238,7 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
 			} else {
 				m = MSG{
 					"type": "image",
-					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
 				}
 			}
 		case *message.GroupFlashImgElement:
@ -331,13 +324,13 @@ func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r st
 			if ur {
 				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
 			} else {
-				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
 			}
 		case *message.FriendImageElement:
 			if ur {
 				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
 			} else {
-				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
 			}
 		case *message.GroupFlashImgElement:
 			return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
@ -398,10 +391,7 @@ func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMes
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
-				messageSeq, err := strconv.ParseInt(d["seq"], 10, 64)
+				messageSeq, _ := strconv.ParseInt(d["seq"], 10, 64)
 				if err != nil {
 					messageSeq = 0
 				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
 						ReplySeq: int32(messageSeq),
@ -415,9 +405,15 @@ func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMes
 		}
 		if t == "forward" { // 单独处理转发
 			if id, ok := d["id"]; ok {
-				r = []message.IMessageElement{bot.Client.DownloadForwardMessage(id)}
+				if fwdMsg := bot.Client.DownloadForwardMessage(id); fwdMsg == nil {
-				return
+					log.Warnf("警告: Forward 信息不存在或已过期")
 				} else {
 					r = []message.IMessageElement{fwdMsg}
 				}
 			} else {
 				log.Warnf("警告: Forward 元素中必须包含 id")
 			}
 			return
 		}
 		elem, err := bot.ToElement(t, d, isGroup)
 		if err != nil {
@ -443,7 +439,13 @@ S1: // Plain Text
 		if *(*byte)(add(ptr, uintptr(i))) == '[' && i+4 < l &&
 			*(*uint32)(add(ptr, uintptr(i))) == magicCQ { // Magic :uint32([]byte("[CQ:"))
 			if i > j {
-				r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+				if SplitURL {
 					for _, str := range global.SplitURL(CQCodeUnescapeText(s[j:i])) {
 						r = append(r, message.NewText(str))
 					}
 				} else {
 					r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
 				}
 			}
 			CQBegin = i
 			i += 4
@ -501,7 +503,13 @@ S4: // CQCode param value
 	goto End
 End:
 	if i > j {
-		r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+		if SplitURL {
 			for _, str := range global.SplitURL(CQCodeUnescapeText(s[j:i])) {
 				r = append(r, message.NewText(str))
 			}
 		} else {
 			r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
 		}
 	}
 	return
 }
@ -542,10 +550,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
-				messageSeq, err := strconv.ParseInt(e.Get("data").Get("seq").String(), 10, 64)
+				messageSeq, _ := strconv.ParseInt(e.Get("data").Get("seq").String(), 10, 64)
 				if err != nil {
 					messageSeq = 0
 				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
 						ReplySeq: int32(messageSeq),
@ -558,7 +563,16 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 			}
 		}
 		if t == "forward" {
-			r = []message.IMessageElement{bot.Client.DownloadForwardMessage(e.Get("data.id").String())}
+			id := e.Get("data.id").String()
 			if id == "" {
 				log.Warnf("警告: Forward 元素中必须包含 id")
 			} else {
 				if fwdMsg := bot.Client.DownloadForwardMessage(id); fwdMsg == nil {
 					log.Warnf("警告: Forward 信息不存在或已过期")
 				} else {
 					r = []message.IMessageElement{fwdMsg}
 				}
 			}
 			return
 		}
 		d := make(map[string]string)
@ -670,7 +684,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
-		return &message.VoiceElement{Data: data}, nil
+		return &message.VoiceElement{Data: codec.RecodeTo24K(data)}, nil
 	case "record":
 		f := d["file"]
 		data, err := global.FindFile(f, d["cache"], global.VoicePath)
@ -868,7 +882,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if !bytes.Equal(header, []byte{0x66, 0x74, 0x79, 0x70}) { // check file header ftyp
 			_, _ = video.Seek(0, io.SeekStart)
 			hash, _ := utils.ComputeMd5AndLength(video)
-			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".mp4")
+			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".mp4")
 			if global.PathExists(cacheFile) && cache == "1" {
 				goto ok
 			}
--- a/coolq/event.go
+++ b/coolq/event.go
@ -8,12 +8,12 @@ import (
 	"strings"
 	"time"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	log "github.com/sirupsen/logrus"
 	"github.com/Mrs4s/go-cqhttp/global"
 )
 var format = "string"
@ -50,7 +50,6 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		"sub_type":     "friend",
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"target_id":    m.Target,
 		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
@ -103,7 +102,8 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	bot.dispatchEventMessage(gm)
 }
-func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
+func (bot *CQBot) tempMessageEvent(c *client.QQClient, m1 *client.TempMessageEvent) {
 	m := m1.Message
 	bot.checkMedia(m.Elements)
 	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
 	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
@ -240,10 +240,6 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 					return "performer"
 				case client.Emotion:
 					return "emotion"
 				case client.Legend:
 					return "legend"
 				case client.StrongNewbie:
 					return "strong_newbie"
 				default:
 					return "ERROR"
 				}
@ -254,7 +250,8 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	friend := c.FindFriend(e.From())
-	if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
+	switch notify := e.(type) {
 	case *client.FriendPokeNotifyEvent:
 		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
 		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
--- a/docs/cqhttp.md
+++ b/docs/cqhttp.md
@ -29,6 +29,7 @@
 - [发送合并转发(群)](#发送合并转发群)
 - [获取中文分词](#获取中文分词)
 - [图片OCR](#图片ocr)
 - [获取中文分词](#获取中文分词)
 - [获取群系统消息](#获取群文件系统信息)
 - [获取群文件系统信息](#获取群文件系统信息)
 - [获取群根目录文件列表](#获取群根目录文件列表)
--- a/global/buffer.go
+++ b/global/buffer.go
@ -1,27 +0,0 @@
 package global
 import (
 	"bytes"
 	"sync"
 )
 var bufferPool = sync.Pool{
 	New: func() interface{} {
 		return new(bytes.Buffer)
 	},
 }
 // NewBuffer 从池钟获取新 bytes.Buffer
 func NewBuffer() *bytes.Buffer {
 	return bufferPool.Get().(*bytes.Buffer)
 }
 // PutBuffer 将 Buffer放入池中
 func PutBuffer(buf *bytes.Buffer) {
 	// See https://golang.org/issue/23199
 	const maxSize = 1 << 16
 	if buf.Cap() < maxSize { // 对于大Buffer直接丢弃
 		buf.Reset()
 		bufferPool.Put(buf)
 	}
 }
--- a/global/codec.go
+++ b/global/codec.go
@ -8,7 +8,6 @@ import (
 	"path"
 	"github.com/Mrs4s/go-cqhttp/global/codec"
 	"github.com/pkg/errors"
 )
--- a/global/codec/codec.go
+++ b/global/codec/codec.go
@ -18,7 +18,7 @@ const (
 	silkCachePath = "data/cache"
 )
-// EncodeToSilk 将音频编码为Silk
+//EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
 	// 1. 写入缓存文件
 	rawPath := path.Join(silkCachePath, tempName+".wav")
@ -51,3 +51,16 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte
 	}
 	return
 }
 // RecodeTo24K 将silk重新编码为 24000 bit rate
 func RecodeTo24K(data []byte) []byte {
 	pcm, err := silk.DecodeSilkBuffToPcm(data, 24000)
 	if err != nil {
 		panic(err)
 	}
 	data, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
 	if err != nil {
 		panic(err)
 	}
 	return data
 }
--- a/global/codec/codec_unsupportedarch.go
+++ b/global/codec/codec_unsupportedarch.go
@ -8,3 +8,8 @@ import "errors"
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
 	return nil, errors.New("not supported now")
 }
 // RecodeTo24K 将silk重新编码为 24000 bit rate
 func RecodeTo24K(data []byte) []byte {
 	return data
 }
--- a/global/codec/codec_unsupportedos.go
+++ b/global/codec/codec_unsupportedos.go
@ -8,3 +8,8 @@ import "errors"
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
 	return nil, errors.New("not supported now")
 }
 // RecodeTo24K 将silk重新编码为 24000 bit rate
 func RecodeTo24K(data []byte) []byte {
 	return data
 }
--- a/global/codec/codec_windows_arm.go
+++ b/global/codec/codec_windows_arm.go
@ -6,3 +6,8 @@ import "errors"
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
 	return nil, errors.New("not supported now")
 }
 // RecodeTo24K 将silk重新编码为 24000 bit rate
 func RecodeTo24K(data []byte) []byte {
 	return data
 }
--- a/global/config.go
+++ b/global/config.go
@ -2,7 +2,6 @@ package global
 import (
 	"os"
 	"path"
 	"strconv"
 	"time"
@ -13,9 +12,6 @@ import (
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 var currentPath = getCurrentPath()
 var DefaultConfFile = path.Join(currentPath, "config.hjson")
 // DefaultConfigWithComments 为go-cqhttp的默认配置文件
 var DefaultConfigWithComments = `
 /*
@ -173,7 +169,7 @@ type JSONConfig struct {
 	UseSSOAddress       bool                          `json:"use_sso_address"`
 	Debug               bool                          `json:"debug"`
 	LogLevel            string                        `json:"log_level"`
-	//WebUI               *GoCQWebUI                    `json:"web_ui"`
+	WebUI               *GoCQWebUI                    `json:"web_ui"`
 }
 // CQHTTPAPIConfig HTTPAPI对应的Config结构体
@ -221,7 +217,6 @@ type GoCQReverseWebSocketConfig struct {
 	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
 }
 /*
 // GoCQWebUI WebUI对应Config结构体
 type GoCQWebUI struct {
 	Enabled   bool   `json:"enabled"`
@ -229,7 +224,6 @@ type GoCQWebUI struct {
 	WebUIPort uint64 `json:"web_ui_port"`
 	WebInput  bool   `json:"web_input"`
 }
 */
 // DefaultConfig 返回一份默认配置对应结构体
 func DefaultConfig() *JSONConfig {
@ -275,6 +269,12 @@ func DefaultConfig() *JSONConfig {
 				ReverseReconnectInterval: 3000,
 			},
 		},
 		WebUI: &GoCQWebUI{
 			Enabled:   true,
 			Host:      "127.0.0.1",
 			WebInput:  false,
 			WebUIPort: 9999,
 		},
 	}
 }
@ -312,35 +312,3 @@ func (c *JSONConfig) Save(path string) error {
 	}
 	return WriteAllText(path, string(data))
 }
 // getCurrentPath 获取当前文件的路径，直接返回string
 func getCurrentPath() string {
 	cwd, e := os.Getwd()
 	if e != nil {
 		panic(e)
 	}
 	return cwd
 }
 /*
 // GetCurrentPath 预留,获取当前目录地址
 func GetCurrentPath() (string, error) {
 	file, err := exec.LookPath(os.Args[0])
 	if err != nil {
 		return "", err
 	}
 	fpath, err := filepath.Abs(file)
 	if err != nil {
 		return "", err
 	}
 	if runtime.GOOS == "windows" {
 		// fpath = strings.Replace(fpath, "\\", "/", -1)
 		fpath = strings.ReplaceAll(fpath, "\\", "/")
 	}
 	i := strings.LastIndex(fpath, "/")
 	if i < 0 {
 		return "", errors.New("system/path_error,Can't find '/' or '\\'")
 	}
 	return fpath[0 : i+1], nil
 }
 */
--- a/global/filter.go
+++ b/global/filter.go
@ -83,22 +83,21 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 	}
 	op := new(AndOperator)
 	argument.ForEach(func(key, value gjson.Result) bool {
-		switch {
+		if key.Str[0] == '.' {
 		case key.Str[0] == '.':
 			// is an operator
 			//   ".foo": {
 			//       "bar": "baz"
 			//   }
 			opKey := key.Str[1:]
 			op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
-		case value.IsObject():
+		} else if value.IsObject() {
 			// is an normal key with an object as the value
 			//   "foo": {
 			//       ".bar": "baz"
 			//   }
 			opKey := key.String()
 			op.operands = append(op.operands, operationNode{opKey, Generate("and", value)})
-		default:
+		} else {
 			// is an normal key with a non-object as the value
 			//   "foo": "bar"
 			opKey := key.String()
@ -113,6 +112,7 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 func (op *AndOperator) Eval(payload MSG) bool {
 	res := true
 	for _, operand := range op.operands {
 		if len(operand.key) == 0 {
 			// is an operator
 			res = res && operand.filter.Eval(payload)
--- a/global/fs.go
+++ b/global/fs.go
@ -29,11 +29,11 @@ import (
 const (
 	// ImagePath go-cqhttp使用的图片缓存目录
 	ImagePath = "data/images"
-	// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
+	// ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
 	ImagePathOld = "data/image"
 	// VoicePath go-cqhttp使用的语音缓存目录
 	VoicePath = "data/voices"
-	// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
+	// VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
 	VoicePathOld = "data/record"
 	// VideoPath go-cqhttp使用的视频缓存目录
 	VideoPath = "data/videos"
@ -83,12 +83,11 @@ func IsAMRorSILK(b []byte) bool {
 	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
 }
-// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
+// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
 // 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
-func FindFile(file, cache, p string) (data []byte, err error) {
+func FindFile(file, cache, PATH string) (data []byte, err error) {
 	data, err = nil, ErrSyntax
-	switch {
+	if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") {
 	case strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https"):
 		if cache == "" {
 			cache = "1"
 		}
@ -102,12 +101,12 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	case strings.HasPrefix(file, "base64"):
+	} else if strings.HasPrefix(file, "base64") {
 		data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(file, "base64://", ""))
 		if err != nil {
 			return nil, err
 		}
-	case strings.HasPrefix(file, "file"):
+	} else if strings.HasPrefix(file, "file") {
 		var fu *url.URL
 		fu, err = url.Parse(file)
 		if err != nil {
@ -120,8 +119,8 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	case PathExists(path.Join(p, file)):
+	} else if PathExists(path.Join(PATH, file)) {
-		data, err = ioutil.ReadFile(path.Join(p, file))
+		data, err = ioutil.ReadFile(path.Join(PATH, file))
 		if err != nil {
 			return nil, err
 		}
--- a/global/net.go
+++ b/global/net.go
@ -140,6 +140,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		for k, v := range headers {
 			req.Header.Set(k, v)
 		}
 		if _, ok := headers["User-Agent"]; !ok {
 			req.Header["User-Agent"] = []string{UserAgent}
@ -149,7 +150,6 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		if err != nil {
 			return err
 		}
 		defer resp.Body.Close()
 		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
 		}
@ -169,6 +169,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 					return (contentLength / int64(threadCount)) - 10
 				}
 				return contentLength
 			}()
 			if blockSize == contentLength {
 				return copyStream(resp.Body)
--- a/go.mod
+++ b/go.mod
@ -3,29 +3,27 @@ module github.com/Mrs4s/go-cqhttp
 go 1.16
 require (
-	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
+	github.com/Mrs4s/MiraiGo v0.0.0-20210429065541-8f474db6a37e
 	github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.5
+	github.com/guonaihong/gout v0.1.4
 	github.com/hjson/hjson-go v3.1.0+incompatible
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/json-iterator/go v1.1.10
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.7.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.6.8
 	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	github.com/willf/bitset v1.1.11 // indirect
+	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
-	golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
+	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
 )
--- a/go.sum
+++ b/go.sum
@ -1,9 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083 h1:ELaNvv80OTwHTYhKwoQpgV4dneKPM1qE5Geu3A1kM/8=
+github.com/Mrs4s/MiraiGo v0.0.0-20210429065541-8f474db6a37e h1:MEBnCfoVolYSsO/KZ5IbU1l/WV+yMuucgbOxwSwEaRM=
-github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
+github.com/Mrs4s/MiraiGo v0.0.0-20210429065541-8f474db6a37e/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
 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=
@ -14,9 +12,12 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
 github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
 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.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 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=
@ -49,13 +50,12 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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.5 h1:1FeFFJWWdWYApBW9d6vzMDB4eR4Zr8T/gaVrjDVcl5U=
+github.com/guonaihong/gout v0.1.4 h1:uBBoyztMX9okC27OQxqhn6bZ0ROkGyvnEIHwtp3TM4g=
-github.com/guonaihong/gout v0.1.5/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
+github.com/guonaihong/gout v0.1.4/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
 github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
 github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@ -76,10 +76,6 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkL
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
 github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
 github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
 github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 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=
@ -87,6 +83,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@ -101,10 +99,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 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=
@ -122,19 +118,17 @@ github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
 github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
 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=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
-github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
+github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
-github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
+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-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
-golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+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=
@ -144,9 +138,10 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/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/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 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=
@ -154,22 +149,22 @@ 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-20180909124046-d0be0721c37e/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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 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/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
--- a/login.go
+++ b/login.go
@ -1,164 +0,0 @@
 package main
 import (
 	"bufio"
 	"bytes"
 	"io/ioutil"
 	"os"
 	"strings"
 	"time"
 	qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/tuotoo/qrcode"
 	"github.com/Mrs4s/go-cqhttp/global"
 )
 var console = bufio.NewReader(os.Stdin)
 var readLine = func() (str string) {
 	str, _ = console.ReadString('\n')
 	str = strings.TrimSpace(str)
 	return
 }
 var cli *client.QQClient
 // ErrSMSRequestError SMS请求出错
 var ErrSMSRequestError = errors.New("sms request error")
 func commonLogin() error {
 	res, err := cli.Login()
 	if err != nil {
 		return err
 	}
 	return loginResponseProcessor(res)
 }
 func qrcodeLogin() error {
 	rsp, err := cli.FetchQRCode()
 	if err != nil {
 		return err
 	}
 	fi, err := qrcode.Decode(bytes.NewReader(rsp.ImageData))
 	if err != nil {
 		return err
 	}
 	_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0644)
 	log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	time.Sleep(time.Second)
 	qrcodeTerminal.New().Get(fi.Content).Print()
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
 	if err != nil {
 		return err
 	}
 	prevState := s.State
 	for {
 		time.Sleep(time.Second)
 		s, _ = cli.QueryQRCodeStatus(rsp.Sig)
 		if s == nil {
 			continue
 		}
 		if prevState == s.State {
 			continue
 		}
 		prevState = s.State
 		if s.State == client.QRCodeCanceled {
 			log.Fatalf("扫码被用户取消.")
 		}
 		if s.State == client.QRCodeTimeout {
 			log.Fatalf("二维码过期")
 		}
 		if s.State == client.QRCodeWaitingForConfirm {
 			log.Infof("扫码成功, 请在手机端确认登录.")
 		}
 		if s.State == client.QRCodeConfirmed {
 			res, err := cli.QRCodeLogin(s.LoginInfo)
 			if err != nil {
 				return nil
 			}
 			return loginResponseProcessor(res)
 		}
 	}
 }
 func loginResponseProcessor(res *client.LoginResponse) error {
 	var err error
 	for {
 		if err != nil {
 			return err
 		}
 		if res.Success {
 			return nil
 		}
 		var text string
 		switch res.Error {
 		case client.SliderNeededError:
 			log.Warnf("登录需要滑条验证码. ")
 			log.Warnf("请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <- 抓包获取 Ticket")
 			println()
 			log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
 			println()
 			log.Warn("请输入Ticket： (Enter 提交)")
 			text = readLine()
 			res, err = cli.SubmitTicket(text)
 			continue
 		case client.NeedCaptcha:
 			log.Warnf("登录需要滑条验证码.")
 			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
 			log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
 			text = readLine()
 			global.DelFile("captcha.jpg")
 			res, err = cli.SubmitCaptcha(text, res.CaptchaSign)
 			continue
 		case client.SMSNeededError:
 			log.Warnf("账号已开启设备锁, 按 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
 			readLine()
 			if !cli.RequestSMS() {
 				log.Warnf("发送验证码失败，可能是请求过于频繁.")
 				return errors.WithStack(ErrSMSRequestError)
 			}
 			log.Warn("请输入短信验证码： (Enter 提交)")
 			text = readLine()
 			res, err = cli.SubmitSMS(text)
 			continue
 		case client.SMSOrVerifyNeededError:
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
 			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
 			log.Warn("请输入(1 - 2)：")
 			text = readLine()
 			if strings.Contains(text, "1") {
 				if !cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
 					return errors.WithStack(ErrSMSRequestError)
 				}
 				log.Warn("请输入短信验证码： (Enter 提交)")
 				text = readLine()
 				res, err = cli.SubmitSMS(text)
 				continue
 			}
 			fallthrough
 		case client.UnsafeDeviceError:
 			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
 			log.Infof("按 Enter 继续....")
 			readLine()
 			os.Exit(0)
 		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
 			msg := res.ErrorMessage
 			if strings.Contains(msg, "版本") {
 				msg = "密码错误或账号被冻结"
 			}
 			if strings.Contains(msg, "冻结") {
 				log.Fatalf("账号被冻结")
 			}
 			log.Warnf("登录失败: %v", msg)
 			log.Infof("按 Enter 继续....")
 			readLine()
 			os.Exit(0)
 		}
 	}
 }
--- a/main.go
+++ b/main.go
@ -7,26 +7,21 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/hex"
 	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
 	"os/signal"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/global/terminal"
 	"github.com/Mrs4s/go-cqhttp/server"
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/guonaihong/gout"
@ -37,25 +32,18 @@ import (
 	"github.com/tidwall/gjson"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/term"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/global/terminal"
 	"github.com/Mrs4s/go-cqhttp/server"
 )
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 var conf *global.JSONConfig
 var isFastStart = false
 var c string
 var d bool
 var h bool
 func init() {
 	var debug bool
 	flag.StringVar(&c, "c", global.DefaultConfFile, "configuration filename default is config.hjson")
 	flag.BoolVar(&d, "d", false, "running as a daemon")
 	flag.BoolVar(&debug, "D", false, "debug mode")
 	flag.BoolVar(&h, "h", false, "this help")
 	flag.Parse()
 	// 通过-c 参数替换 配置文件路径
 	global.DefaultConfFile = c
 	logFormatter := &easy.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05",
 		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
@ -71,9 +59,6 @@ func init() {
 		os.Exit(1)
 	}
 	if debug {
 		conf.Debug = true
 	}
 	// 在debug模式下,将在标准输出中打印当前执行行数
 	if conf.Debug {
 		log.SetReportCaller(true)
@ -105,8 +90,8 @@ func init() {
 			goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
 			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
 		}
-		if err := goConf.Save(global.DefaultConfFile); err != nil {
+		if err := goConf.Save("config.hjson"); err != nil {
-			log.Fatalf("保存 %s 时出现错误: %v", global.DefaultConfFile, err)
+			log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		}
 		_ = os.Remove("cqhttp.json")
 	}
@ -134,12 +119,6 @@ func init() {
 }
 func main() {
 	if h {
 		help()
 	}
 	if d {
 		server.Daemon()
 	}
 	var byteKey []byte
 	arg := os.Args
 	if len(arg) > 1 {
@ -167,11 +146,11 @@ func main() {
 		time.Sleep(time.Second * 10)
 	}
 	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
-		log.Warn("账号密码未配置, 将使用二维码登录.")
+		log.Warnf("请修改 config.hjson 以添加账号密码.")
 		if !isFastStart {
 			log.Warn("将在 5秒 后继续.")
 			time.Sleep(time.Second * 5)
 		}
 		return
 	}
 	log.Info("当前版本:", coolq.Version)
@ -180,11 +159,9 @@ func main() {
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
 		server.Debug = true
-		/*
+		if conf.WebUI == nil || !conf.WebUI.Enabled {
-			if conf.WebUI == nil || !conf.WebUI.Enabled {
+			log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
-				log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
+		}
 			}
 		*/
 	}
 	log.Info("用户交流群: 721829413")
 	if !global.PathExists("device.json") {
@ -204,12 +181,13 @@ func main() {
 		global.PasswordHash = md5.Sum([]byte(conf.Password))
 		conf.Password = ""
 		conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
-		_ = conf.Save(global.DefaultConfFile)
+		_ = conf.Save("config.hjson")
 	}
 	if conf.PasswordEncrypted != "" {
 		if len(byteKey) == 0 {
 			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
 			cancel := make(chan struct{}, 1)
 			state, _ := term.GetState(int(os.Stdin.Fd()))
 			go func() {
 				select {
 				case <-cancel:
@ -217,6 +195,7 @@ func main() {
 				case <-time.After(time.Second * 45):
 					log.Infof("解密key输入超时")
 					time.Sleep(3 * time.Second)
 					_ = term.Restore(int(os.Stdin.Fd()), state)
 					os.Exit(0)
 				}
 			}()
@ -233,7 +212,7 @@ func main() {
 			passwordHash := md5.Sum([]byte(password))
 			newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
 			conf.PasswordEncrypted = "AES:" + newPasswordHash
-			_ = conf.Save(global.DefaultConfFile)
+			_ = conf.Save("config.hjson")
 			log.Debug("密码加密方案升级完成")
 		}
@ -242,7 +221,7 @@ func main() {
 			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
 		}
 		copy(global.PasswordHash[:], ph)
-	} else if conf.Password != "" {
+	} else {
 		global.PasswordHash = md5.Sum([]byte(conf.Password))
 	}
 	if !isFastStart {
@ -263,11 +242,7 @@ func main() {
 		}
 		return "未知"
 	}())
-	cli = client.NewClientEmpty()
+	cli := client.NewClientMd5(conf.Uin, global.PasswordHash)
 	if conf.Uin != 0 && global.PasswordHash != [16]byte{} {
 		cli.Uin = conf.Uin
 		cli.PasswordMd5 = global.PasswordHash
 	}
 	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
 		switch e.Type {
 		case "INFO":
@ -294,102 +269,34 @@ func main() {
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
 		return true
 	})
-	/*
+	if conf.WebUI == nil {
-		if conf.WebUI == nil {
+		conf.WebUI = &global.GoCQWebUI{
-			conf.WebUI = &global.GoCQWebUI{
+			Enabled:   true,
-				Enabled:   true,
+			WebInput:  false,
-				WebInput:  false,
+			Host:      "0.0.0.0",
-				Host:      "0.0.0.0",
+			WebUIPort: 9999,
 				WebUIPort: 9999,
 			}
 		}
-		if conf.WebUI.WebUIPort <= 0 {
+	}
-			conf.WebUI.WebUIPort = 9999
+	if conf.WebUI.WebUIPort <= 0 {
-		}
+		conf.WebUI.WebUIPort = 9999
-		if conf.WebUI.Host == "" {
+	}
-			conf.WebUI.Host = "127.0.0.1"
+	if conf.WebUI.Host == "" {
-		}
+		conf.WebUI.Host = "127.0.0.1"
-	*/
+	}
 	global.Proxy = conf.ProxyRewrite
-	// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
+	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
-	// c := server.Console
+	c := server.Console
-	isQRCodeLogin := (conf.Uin == 0 || len(conf.Password) == 0) && len(conf.PasswordEncrypted) == 0
+	r := server.Restart
 	if !isQRCodeLogin {
 		if err := commonLogin(); err != nil {
 			log.Fatalf("登录时发生致命错误: %v", err)
 		}
 	} else {
 		if err := qrcodeLogin(); err != nil {
 			log.Fatalf("登录时发生致命错误: %v", err)
 		}
 	}
 	var times uint = 1 // 重试次数
 	var reLoginLock sync.Mutex
 	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
 		log.Warnf("Bot已离线: %v", e.Message)
 		if !conf.ReLogin.Enabled {
 			os.Exit(1)
 		}
 		if isQRCodeLogin {
 			log.Fatalf("二维码登录暂不支持重连.")
 		}
 		if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
 			log.Fatalf("Bot重连次数超过限制, 停止")
 		}
 		if conf.ReLogin.ReLoginDelay > 0 {
 			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.ReLogin.ReLoginDelay, times, conf.ReLogin.MaxReloginTimes)
 		}
 		log.Warnf("尝试重连...")
 		if cli.Online {
 			return
 		}
 		if err := commonLogin(); err != nil {
 			log.Fatalf("登录时发生致命错误: %v", err)
 		}
 	})
 	cli.AllowSlider = true
 	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
 	log.Info("开始加载好友列表...")
 	global.Check(cli.ReloadFriendList())
 	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
 	log.Infof("开始加载群列表...")
 	global.Check(cli.ReloadGroupList())
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
 	bot := coolq.NewQQBot(cli, conf)
 	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
 		log.Warnf("post_message_format 配置错误, 将自动使用 string")
 		coolq.SetMessageFormat("string")
 	} else {
 		coolq.SetMessageFormat(conf.PostMessageFormat)
 	}
 	if conf.RateLimit.Enabled {
 		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
 	}
 	log.Info("正在加载事件过滤器.")
 	global.BootFilter()
 	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
 	coolq.SplitURL = conf.FixURL
 	coolq.ForceFragmented = conf.ForceFragmented
 	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
 		go server.CQHTTPApiServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, bot)
 		for k, v := range conf.HTTPConfig.PostUrls {
 			server.NewHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, bot)
 		}
 	}
 	if conf.WSConfig != nil && conf.WSConfig.Enabled {
 		go server.WebSocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, bot)
 	}
 	for _, rc := range conf.ReverseServers {
 		go server.NewWebSocketClient(rc, conf.AccessToken, bot).Run()
 	}
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 	c := make(chan os.Signal, 1)
 	go checkUpdate()
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	<-c
+	select {
 	case <-c:
 		b.Release()
 	case <-r:
 		log.Info("正在重启中...")
 		defer b.Release()
 		restart(arg)
 	}
 }
 // PasswordHashEncrypt 使用key加密给定passwordHash
@ -444,7 +351,7 @@ func OldPasswordDecrypt(encryptedPassword string, key []byte) string {
 func checkUpdate() {
 	log.Infof("正在检查更新.")
-	if coolq.Version == "unknown" {
+	if coolq.Version == "(devel)" {
 		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
 		return
 	}
@ -505,14 +412,14 @@ func selfUpdate(imageURL string) {
 				runtime.GOARCH,
 			)
 			if runtime.GOOS == "windows" {
-				url += ".exe"
+				url = url + ".exe"
 			}
 			resp, err := http.Get(url)
 			if err != nil {
-				log.Error("更新失败: ", err)
+				fmt.Println(err)
 				log.Error("更新失败!")
 				return
 			}
 			defer func() { _ = resp.Body.Close() }()
 			wc := global.WriteCounter{}
 			err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
 			fmt.Println()
@ -536,11 +443,10 @@ func selfUpdate(imageURL string) {
 	os.Exit(0)
 }
-/*
+func restart(Args []string) {
 func restart(args []string) {
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
-		file, err := exec.LookPath(args[0])
+		file, err := exec.LookPath(Args[0])
 		if err != nil {
 			log.Errorf("重启失败:%s", err.Error())
 			return
@ -549,34 +455,32 @@ func restart(args []string) {
 		if err != nil {
 			log.Errorf("重启失败:%s", err.Error())
 		}
-		args = append([]string{"/c", "start ", path, "faststart"}, args[1:]...)
+		Args = append([]string{"/c", "start ", path, "faststart"}, Args[1:]...)
 		cmd = &exec.Cmd{
 			Path:   "cmd.exe",
-			Args:   args,
+			Args:   Args,
 			Stderr: os.Stderr,
 			Stdout: os.Stdout,
 		}
 	} else {
-		args = append(args, "faststart")
+		Args = append(Args, "faststart")
 		cmd = &exec.Cmd{
-			Path:   args[0],
+			Path:   Args[0],
-			Args:   args,
+			Args:   Args,
 			Stderr: os.Stderr,
 			Stdout: os.Stdout,
 		}
 	}
 	_ = cmd.Start()
 }
 */
 func getConfig() *global.JSONConfig {
 	var conf *global.JSONConfig
-	switch {
+	if global.PathExists("config.json") {
 	case global.PathExists("config.json"):
 		conf = global.LoadConfig("config.json")
 		_ = conf.Save("config.hjson")
 		_ = os.Remove("config.json")
-	case os.Getenv("UIN") != "":
+	} else if os.Getenv("UIN") != "" {
 		log.Infof("将从环境变量加载配置.")
 		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
 		pwd := os.Getenv("PASS")
@ -601,16 +505,16 @@ func getConfig() *global.JSONConfig {
 		if post != "" {
 			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
 		}
-	default:
+	} else {
-		conf = global.LoadConfig(global.DefaultConfFile)
+		conf = global.LoadConfig("config.hjson")
 	}
 	if conf == nil {
-		err := global.WriteAllText(global.DefaultConfFile, global.DefaultConfigWithComments)
+		err := global.WriteAllText("config.hjson", global.DefaultConfigWithComments)
 		if err != nil {
 			log.Fatalf("创建默认配置文件时出现错误: %v", err)
 			return nil
 		}
-		log.Infof("默认配置文件已生成, 请编辑 %s 后重启程序.", global.DefaultConfFile)
+		log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
 		if !isFastStart {
 			time.Sleep(time.Second * 5)
 		}
@ -618,19 +522,3 @@ func getConfig() *global.JSONConfig {
 	}
 	return conf
 }
 // help cli命令行-h的帮助提示
 func help() {
 	fmt.Printf(`go-cqhttp service
 version: %s
 Usage:
 server [OPTIONS]
 Options:
 `, coolq.Version)
 	flag.PrintDefaults()
 	os.Exit(0)
 }
--- a/server/api.go
+++ b/server/api.go
@ -2,10 +2,10 @@ package server
 import (
 	"strings"
 	"time"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/tidwall/gjson"
 )
@ -191,19 +191,18 @@ func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
 }
-func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.MSG {
+func setRestart(_ *coolq.CQBot, p resultGetter) coolq.MSG {
-	/*
+	var delay int64
-		var delay int64
+	delay = p.Get("delay").Int()
-		delay = p.Get("delay").Int()
+	if delay < 0 {
-		if delay < 0 {
+		delay = 0
-			delay = 0
+	}
-		}
+	defer func(delay int64) {
-		defer func(delay int64) {
+		time.Sleep(time.Duration(delay) * time.Millisecond)
-			time.Sleep(time.Duration(delay) * time.Millisecond)
+		Restart <- struct{}{}
-			Restart <- struct{}{}
+	}(delay)
-		}(delay)
+	return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
-	*/
+
 	return coolq.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
 }
 func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
@ -294,7 +293,7 @@ func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
 }
-func checkURLSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+func checkUrlSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
 	return bot.CQCheckURLSafely(p.Get("url").String())
 }
@ -369,7 +368,7 @@ var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 	"set_essence_msg":            setEssenceMSG,
 	"delete_essence_msg":         deleteEssenceMSG,
 	"get_essence_msg_list":       getEssenceMsgList,
-	"check_url_safely":           checkURLSafely,
+	"check_url_safely":           checkUrlSafely,
 	"set_group_anonymous_ban":    setGroupAnonymousBan,
 	".handle_quick_operation":    handleQuickOperation,
 }
@ -377,6 +376,7 @@ var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
 func (api *apiCaller) callAPI(action string, p resultGetter) coolq.MSG {
 	if f, ok := API[action]; ok {
 		return f(api.bot, p)
 	} else {
 		return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
 	}
 	return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
 }
--- a/server/apiAdmin.go
+++ b/server/apiAdmin.go
@ -0,0 +1,662 @@
 package server
 import (
 	"bufio"
 	"bytes"
 	"encoding/base64"
 	"fmt"
 	"image"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"os/signal"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gin-contrib/pprof"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/gin-gonic/gin"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	asciiart "github.com/yinghau76/go-ascii-art"
 )
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 // WebInput 网页输入channel
 var WebInput = make(chan string, 1) //长度1，用于阻塞
 // Console 控制台channel
 var Console = make(chan os.Signal, 1)
 // Restart 重启信号监听channel
 var Restart = make(chan struct{}, 1)
 // JSONConfig go-cqhttp配置
 var JSONConfig *global.JSONConfig
 type webServer struct {
 	engine  *gin.Engine
 	bot     *coolq.CQBot
 	Cli     *client.QQClient
 	Conf    *global.JSONConfig //old config
 	Console *bufio.Reader
 }
 // WebServer Admin子站的Server
 var WebServer = &webServer{}
 // APIAdminRoutingTable Admin子站的路由映射
 var APIAdminRoutingTable = map[string]func(s *webServer, c *gin.Context){
 	"do_restart":         AdminDoRestart,         //热重启
 	"do_process_restart": AdminProcessRestart,    //进程重启
 	"get_web_write":      AdminWebWrite,          //获取是否验证码输入
 	"do_web_write":       AdminDoWebWrite,        //web上进行输入操作
 	"do_restart_docker":  AdminDoRestartDocker,   //直接停止（依赖supervisord/docker）重新拉起
 	"do_config_base":     AdminDoConfigBase,      //修改config.json中的基础部分
 	"do_config_http":     AdminDoConfigHTTP,      //修改config.json的http部分
 	"do_config_ws":       AdminDoConfigWS,        //修改config.json的正向ws部分
 	"do_config_reverse":  AdminDoConfigReverseWS, //修改config.json 中的反向ws部分
 	"do_config_json":     AdminDoConfigJSON,      //直接修改 config.json配置
 	"get_config_json":    AdminGetConfigJSON,     //拉取 当前的config.json配置
 }
 // Failed 构建失败返回MSG
 func Failed(code int, msg string) coolq.MSG {
 	return coolq.MSG{"data": nil, "retcode": code, "status": "failed", "msg": msg}
 }
 func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 	s.Cli = cli
 	s.Conf = GetConf()
 	JSONConfig = s.Conf
 	gin.SetMode(gin.ReleaseMode)
 	s.engine = gin.New()
 	s.engine.Use(AuthMiddleWare())
 	// 通用路由
 	s.engine.Any("/admin/:action", s.admin)
 	go func() {
 		// 开启端口监听
 		if s.Conf.WebUI != nil && s.Conf.WebUI.Enabled {
 			if Debug {
 				pprof.Register(s.engine)
 				log.Debugf("pprof 性能分析服务已启动在 http://%v/debug/pprof, 如果有任何性能问题请下载报告并提交给开发者", addr)
 				time.Sleep(time.Second * 3)
 			}
 			log.Infof("Admin API 服务器已启动: %v", addr)
 			err := s.engine.Run(addr)
 			if err != nil {
 				log.Error(err)
 				log.Infof("请检查端口是否被占用.")
 				c := make(chan os.Signal, 1)
 				signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 				<-c
 				os.Exit(1)
 			}
 		} else {
 			// 关闭端口监听
 			c := make(chan os.Signal, 1)
 			signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 			<-c
 			os.Exit(1)
 		}
 	}()
 	s.Dologin()
 	s.UpServer()
 	b := s.bot // 外部引入 bot对象，用于操作bot
 	return b
 }
 // logincore 登录核心实现
 func (s *webServer) logincore(relogin bool) {
 	s.Console = bufio.NewReader(os.Stdin)
 	readLine := func() (str string) {
 		str, _ = s.Console.ReadString('\n')
 		str = strings.TrimSpace(str)
 		return
 	}
 	if s.Cli.Online {
 		log.Warn("Bot已登录")
 		return
 	}
 	var times uint = 1 // 重试次数
 	for res, err := s.Cli.Login(); ; res, err = s.Cli.Login() {
 		var text string
 		count := 0
 		if res == nil {
 			goto Relogin
 		}
 	Again: // 不执行 s.Cli.Login() 的循环，适用输入验证码等更新 res 的操作
 		if err == nil && res.Success { // 登录成功
 			break
 		} else if err == client.ErrAlreadyOnline {
 			break
 		}
 		switch res.Error {
 		case client.SliderNeededError:
 			log.Warnf("登录需要滑条验证码, 请选择解决方案: ")
 			log.Warnf("1. 自行抓包. (推荐)")
 			log.Warnf("2. 使用Cef自动处理.")
 			log.Warnf("3. 不提交滑块并继续.(可能会导致上网环境异常错误)")
 			log.Warnf("详细信息请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <-")
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Warnf("请输入(1 - 3)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 				text = <-WebInput
 			} else {
 				log.Warn("请输入(1 - 3)：")
 				text = readLine()
 			}
 			if strings.Contains(text, "1") {
 				log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
 				if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 					log.Warnf("请输入Ticket： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 					text = <-WebInput
 				} else {
 					log.Warn("请输入Ticket： (Enter 提交)")
 					text = readLine()
 				}
 				res, err = s.Cli.SubmitTicket(strings.TrimSpace(text))
 				goto Again
 			}
 			if strings.Contains(text, "3") {
 				s.Cli.AllowSlider = false
 				s.Cli.Disconnect()
 				continue
 			}
 			id := utils.RandomStringRange(6, "0123456789")
 			log.Warnf("滑块ID为 %v 请在30S内处理.", id)
 			ticket, err := global.GetSliderTicket(res.VerifyUrl, id)
 			if err != nil {
 				log.Warnf("错误: " + err.Error())
 				os.Exit(0)
 			}
 			res, err = s.Cli.SubmitTicket(ticket)
 			if err != nil {
 				log.Warnf("错误: " + err.Error())
 				continue // 尝试重新登录
 			}
 			goto Again
 		case client.NeedCaptcha:
 			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
 			img, _, _ := image.Decode(bytes.NewReader(res.CaptchaImage))
 			fmt.Println(asciiart.New("image", img).Art)
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 				text = <-WebInput
 			} else {
 				log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
 				text = readLine()
 			}
 			global.DelFile("captcha.jpg")
 			res, err = s.Cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), res.CaptchaSign)
 			goto Again
 		case client.SMSNeededError:
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Warnf("账号已开启设备锁, 已向手机 %v 发送短信验证码.", res.SMSPhone)
 			} else {
 				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
 				readLine()
 			}
 			if !s.Cli.RequestSMS() {
 				log.Warnf("发送验证码失败，可能是请求过于频繁.")
 				time.Sleep(time.Second * 5)
 				continue
 			}
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Warnf("请输入短信验证码： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 				text = <-WebInput
 			} else {
 				log.Warn("请输入短信验证码： (Enter 提交)")
 				text = readLine()
 			}
 			res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
 			goto Again
 		case client.SMSOrVerifyNeededError:
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
 			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Warnf("请输入(1 - 2)： (http://%s:%d/admin/do_web_write 输入)", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 				text = <-WebInput
 			} else {
 				log.Warn("请输入(1 - 2)：")
 				text = readLine()
 			}
 			if strings.Contains(text, "1") {
 				if !s.Cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
 					time.Sleep(time.Second * 5)
 					os.Exit(0)
 				}
 				if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 					log.Warnf("请输入短信验证码：  (http://%s:%d/admin/do_web_write 输入)....", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 					text = <-WebInput
 				} else {
 					log.Warn("请输入短信验证码： (Enter 提交)")
 					text = readLine()
 				}
 				res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
 				goto Again
 			}
 			log.Warnf("请前往 -> %v <- 验证.", res.VerifyUrl)
 			log.Infof("按 Enter 继续....")
 			readLine()
 			continue
 		case client.UnsafeDeviceError:
 			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证.", res.VerifyUrl)
 			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
 				log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", s.Conf.WebUI.Host, s.Conf.WebUI.WebUIPort)
 				text = <-WebInput
 			} else {
 				log.Infof("按 Enter 继续....")
 				readLine()
 			}
 			log.Info(text)
 			continue
 		case client.OtherLoginError, client.UnknownLoginError:
 			msg := res.ErrorMessage
 			if strings.Contains(msg, "版本") {
 				msg = "密码错误或账号被冻结"
 			}
 			if strings.Contains(msg, "上网环境") && count < 5 {
 				s.Cli.Disconnect()
 				log.Warnf("错误: 当前上网环境异常. 将更换服务器并重试.")
 				count++
 				time.Sleep(time.Second)
 				continue
 			}
 			if strings.Contains(msg, "冻结") {
 				log.Fatalf("账号被冻结, 放弃重连")
 			}
 			log.Warnf("登录失败: %v", msg)
 			log.Infof("按 Enter 继续....")
 			readLine()
 			os.Exit(0)
 		}
 	Relogin:
 		if relogin {
 			if times > s.Conf.ReLogin.MaxReloginTimes && s.Conf.ReLogin.MaxReloginTimes != 0 {
 				log.Fatal("重连失败: 重连次数达到设置的上限值")
 				s.bot.Release()
 				return
 			}
 			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v", s.Conf.ReLogin.ReLoginDelay, times)
 			times++
 			time.Sleep(time.Second * time.Duration(s.Conf.ReLogin.ReLoginDelay))
 			s.Cli.Disconnect()
 			continue
 		}
 	}
 	if relogin {
 		log.Info("重连成功")
 	}
 }
 // Dologin 主程序登录
 func (s *webServer) Dologin() {
 	s.Cli.AllowSlider = true
 	s.logincore(false)
 	log.Infof("登录成功 欢迎使用: %v", s.Cli.Nickname)
 	log.Info("开始加载好友列表...")
 	global.Check(s.Cli.ReloadFriendList())
 	log.Infof("共加载 %v 个好友.", len(s.Cli.FriendList))
 	log.Infof("开始加载群列表...")
 	global.Check(s.Cli.ReloadGroupList())
 	log.Infof("共加载 %v 个群.", len(s.Cli.GroupList))
 	s.bot = coolq.NewQQBot(s.Cli, s.Conf)
 	if s.Conf.PostMessageFormat != "string" && s.Conf.PostMessageFormat != "array" {
 		log.Warnf("post_message_format 配置错误, 将自动使用 string")
 		coolq.SetMessageFormat("string")
 	} else {
 		coolq.SetMessageFormat(s.Conf.PostMessageFormat)
 	}
 	if s.Conf.RateLimit.Enabled {
 		global.InitLimiter(s.Conf.RateLimit.Frequency, s.Conf.RateLimit.BucketSize)
 	}
 	log.Info("正在加载事件过滤器.")
 	global.BootFilter()
 	coolq.IgnoreInvalidCQCode = s.Conf.IgnoreInvalidCQCode
 	coolq.SplitURL = s.Conf.FixURL
 	coolq.ForceFragmented = s.Conf.ForceFragmented
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 	s.Cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		if !s.Conf.ReLogin.Enabled {
 			return
 		}
 		log.Warnf("Bot已离线 (%v)，尝试重连", e.Message)
 		s.logincore(true)
 	})
 }
 func (s *webServer) admin(c *gin.Context) {
 	action := c.Param("action")
 	log.Debugf("WebServer接收到cgi调用: %v", action)
 	if f, ok := APIAdminRoutingTable[action]; ok {
 		f(s, c)
 	} else {
 		c.JSON(200, coolq.Failed(404))
 	}
 }
 // GetConf 获取当前配置文件信息
 func GetConf() *global.JSONConfig {
 	if JSONConfig != nil {
 		return JSONConfig
 	}
 	conf := global.LoadConfig("config.hjson")
 	return conf
 }
 // AuthMiddleWare Admin控制器登录验证
 func AuthMiddleWare() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		conf := GetConf()
 		// 处理跨域问题
 		c.Header("Access-Control-Allow-Origin", "*")
 		c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
 		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE")
 		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
 		c.Header("Access-Control-Allow-Credentials", "true")
 		// 放行所有OPTIONS方法，因为有的模板是要请求两次的
 		if c.Request.Method == "OPTIONS" {
 			c.AbortWithStatus(http.StatusNoContent)
 		}
 		if strings.Contains(c.Request.URL.Path, "debug") {
 			c.Next()
 			return
 		}
 		// 处理请求
 		if c.Request.Method != "GET" && c.Request.Method != "POST" {
 			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
 			c.Status(404)
 			c.Abort()
 		}
 		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
 			d, err := c.GetRawData()
 			if err != nil {
 				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
 				c.Status(400)
 				c.Abort()
 			}
 			if !gjson.ValidBytes(d) {
 				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
 				c.Status(400)
 				c.Abort()
 			}
 			c.Set("json_body", gjson.ParseBytes(d))
 		}
 		authToken := conf.AccessToken
 		if auth := c.Request.Header.Get("Authorization"); auth != "" {
 			if strings.SplitN(auth, " ", 2)[1] != authToken {
 				c.AbortWithStatus(401)
 				return
 			}
 		} else if c.Query("access_token") != authToken {
 			c.AbortWithStatus(401)
 			return
 		} else {
 			c.Next()
 		}
 	}
 }
 func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 	JSONConfig = nil
 	conf := GetConf()
 	OldConf := s.Conf
 	cli := client.NewClient(conf.Uin, conf.Password)
 	log.Info("开始尝试登录并同步消息...")
 	log.Infof("使用协议: %v", func() string {
 		switch client.SystemDeviceInfo.Protocol {
 		case client.IPad:
 			return "iPad"
 		case client.AndroidPhone:
 			return "Android Phone"
 		case client.AndroidWatch:
 			return "Android Watch"
 		case client.MacOS:
 			return "MacOS"
 		}
 		return "未知"
 	}())
 	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
 		switch e.Type {
 		case "INFO":
 			log.Info("Protocol -> " + e.Message)
 		case "ERROR":
 			log.Error("Protocol -> " + e.Message)
 		case "DEBUG":
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
 	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
 		if !conf.UseSSOAddress {
 			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
 			return false
 		}
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
 		return true
 	})
 	s.Cli = cli
 	s.Dologin()
 	// 关闭之前的 server
 	if OldConf.HTTPConfig != nil && OldConf.HTTPConfig.Enabled {
 		cqHTTPServer.ShutDown()
 	}
 	// if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
 	// 	server.WsShutdown()
 	// }
 	// s.UpServer()
 	s.ReloadServer()
 	s.Conf = conf
 }
 func (s *webServer) UpServer() {
 	conf := GetConf()
 	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
 		go cqHTTPServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
 		for k, v := range conf.HTTPConfig.PostUrls {
 			newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
 		}
 	}
 	if conf.WSConfig != nil && conf.WSConfig.Enabled {
 		go WebSocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, s.bot)
 	}
 	for _, rc := range conf.ReverseServers {
 		go NewWebSocketClient(rc, conf.AccessToken, s.bot).Run()
 	}
 }
 // 暂不支持ws服务的重启
 func (s *webServer) ReloadServer() {
 	conf := GetConf()
 	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
 		go cqHTTPServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
 		for k, v := range conf.HTTPConfig.PostUrls {
 			newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
 		}
 	}
 	for _, rc := range conf.ReverseServers {
 		go NewWebSocketClient(rc, conf.AccessToken, s.bot).Run()
 	}
 }
 // AdminDoRestart 热重启
 func AdminDoRestart(s *webServer, c *gin.Context) {
 	s.bot.Release()
 	s.bot = nil
 	s.Cli = nil
 	s.DoReLogin()
 	c.JSON(200, coolq.OK(coolq.MSG{}))
 }
 // AdminProcessRestart 进程重启
 func AdminProcessRestart(s *webServer, c *gin.Context) {
 	Restart <- struct{}{}
 	c.JSON(200, coolq.OK(coolq.MSG{}))
 }
 // AdminDoRestartDocker 冷重启
 func AdminDoRestartDocker(s *webServer, c *gin.Context) {
 	Console <- os.Kill
 	c.JSON(200, coolq.OK(coolq.MSG{}))
 }
 // AdminWebWrite web输入html页面
 func AdminWebWrite(s *webServer, c *gin.Context) {
 	pic := global.ReadAllText("captcha.jpg")
 	var picbase64 string
 	var ispic = false
 	if pic != "" {
 		input := []byte(pic)
 		// base64编码
 		picbase64 = base64.StdEncoding.EncodeToString(input)
 		ispic = true
 	}
 	c.JSON(200, coolq.OK(coolq.MSG{
 		"ispic":     ispic,     //为空则为 设备锁 或者没有需要输入
 		"picbase64": picbase64, //web上显示图片
 	}))
 }
 // AdminDoWebWrite web输入处理
 func AdminDoWebWrite(s *webServer, c *gin.Context) {
 	input := c.PostForm("input")
 	WebInput <- input
 	c.JSON(200, coolq.OK(coolq.MSG{}))
 }
 // AdminDoConfigBase 普通配置修改
 func AdminDoConfigBase(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	conf.Uin, _ = strconv.ParseInt(c.PostForm("uin"), 10, 64)
 	conf.Password = c.PostForm("password")
 	if c.PostForm("enable_db") == "true" {
 		conf.EnableDB = true
 	} else {
 		conf.EnableDB = false
 	}
 	conf.AccessToken = c.PostForm("access_token")
 	if err := conf.Save("config.hjson"); err != nil {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
 		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
 // AdminDoConfigHTTP HTTP配置修改
 func AdminDoConfigHTTP(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
 	conf.HTTPConfig.Port = uint16(p)
 	conf.HTTPConfig.Host = c.PostForm("host")
 	if c.PostForm("enable") == "true" {
 		conf.HTTPConfig.Enabled = true
 	} else {
 		conf.HTTPConfig.Enabled = false
 	}
 	t, _ := strconv.ParseInt(c.PostForm("timeout"), 10, 32)
 	conf.HTTPConfig.Timeout = int32(t)
 	if c.PostForm("post_url") != "" {
 		conf.HTTPConfig.PostUrls[c.PostForm("post_url")] = c.PostForm("post_secret")
 	}
 	if err := conf.Save("config.hjson"); err != nil {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
 		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
 // AdminDoConfigWS ws配置修改
 func AdminDoConfigWS(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
 	conf.WSConfig.Port = uint16(p)
 	conf.WSConfig.Host = c.PostForm("host")
 	if c.PostForm("enable") == "true" {
 		conf.WSConfig.Enabled = true
 	} else {
 		conf.WSConfig.Enabled = false
 	}
 	if err := conf.Save("config.hjson"); err != nil {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
 		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
 // AdminDoConfigReverseWS 反向ws配置修改
 func AdminDoConfigReverseWS(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	conf.ReverseServers[0].ReverseAPIURL = c.PostForm("reverse_api_url")
 	conf.ReverseServers[0].ReverseURL = c.PostForm("reverse_url")
 	conf.ReverseServers[0].ReverseEventURL = c.PostForm("reverse_event_url")
 	t, _ := strconv.ParseUint(c.PostForm("reverse_reconnect_interval"), 10, 16)
 	conf.ReverseServers[0].ReverseReconnectInterval = uint16(t)
 	if c.PostForm("enable") == "true" {
 		conf.ReverseServers[0].Enabled = true
 	} else {
 		conf.ReverseServers[0].Enabled = false
 	}
 	if err := conf.Save("config.hjson"); err != nil {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
 		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
 // AdminDoConfigJSON config.hjson配置修改
 func AdminDoConfigJSON(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	JSON := c.PostForm("json")
 	err := json.Unmarshal([]byte(JSON), &conf)
 	if err != nil {
 		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", "config.hjson", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 		return
 	}
 	if err := conf.Save("config.hjson"); err != nil {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
 		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
 // AdminGetConfigJSON 拉取config.hjson配置
 func AdminGetConfigJSON(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	c.JSON(200, coolq.OK(coolq.MSG{"config": conf}))
 }
--- a/server/daemon.go
+++ b/server/daemon.go
@ -1,51 +0,0 @@
 package server
 // daemon 功能写在这，目前仅支持了-d 作为后台运行参数，stop，start，restart这些功能目前看起来并不需要，可以通过api控制，后续需要的话再补全。
 import (
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 )
 // Daemon go-cqhttp server 的 daemon的实现函数
 func Daemon() {
 	args := os.Args[1:]
 	execArgs := make([]string, 0)
 	l := len(args)
 	for i := 0; i < l; i++ {
 		if strings.Index(args[i], "-d") == 0 {
 			continue
 		}
 		execArgs = append(execArgs, args[i])
 	}
 	proc := exec.Command(os.Args[0], execArgs...)
 	err := proc.Start()
 	if err != nil {
 		panic(err)
 	}
 	log.Info("[PID] ", proc.Process.Pid)
 	// pid写入到pid文件中，方便后续stop的时候kill
 	pidErr := savePid("go-cqhttp.pid", fmt.Sprintf("%d", proc.Process.Pid))
 	if pidErr != nil {
 		log.Errorf("save pid file error: %v", pidErr)
 	}
 	os.Exit(0)
 }
 // savePid 保存pid到文件中，便于后续restart/stop的时候kill pid用。
 func savePid(path string, data string) error {
 	return global.WriteAllText(path, data)
 }
--- a/server/http.go
+++ b/server/http.go
@ -1,7 +1,6 @@
 package server
 import (
 	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
@ -13,8 +12,6 @@ import (
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
 	"github.com/guonaihong/gout/dataflow"
@ -29,8 +26,7 @@ type httpServer struct {
 	api    apiCaller
 }
-// HTTPClient 反向HTTP上报客户端
+type httpClient struct {
 type HTTPClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
@ -41,8 +37,7 @@ type httpContext struct {
 	ctx *gin.Context
 }
-// CQHTTPApiServer CQHTTPApiServer实例
+var cqHTTPServer = &httpServer{}
 var CQHTTPApiServer = &httpServer{}
 // Debug 是否启用Debug模式
 var Debug = false
@ -77,15 +72,15 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	if authToken != "" {
 		s.engine.Use(func(c *gin.Context) {
-			auth := c.Request.Header.Get("Authorization")
+			if auth := c.Request.Header.Get("Authorization"); auth != "" {
-			switch {
+				if strings.SplitN(auth, " ", 2)[1] != authToken {
-			case auth != "" && strings.SplitN(auth, " ", 2)[1] != authToken:
+					c.AbortWithStatus(401)
 					return
 				}
 			} else if c.Query("access_token") != authToken {
 				c.AbortWithStatus(401)
 				return
-			case c.Query("access_token") != authToken:
+			} else {
 				c.AbortWithStatus(401)
 				return
 			default:
 				c.Next()
 			}
 		})
@ -109,13 +104,11 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	}()
 }
-// NewHTTPClient 返回反向HTTP客户端
+func newHTTPClient() *httpClient {
-func NewHTTPClient() *HTTPClient {
+	return &httpClient{}
 	return &HTTPClient{}
 }
-// Run 运行反向HTTP服务
+func (c *httpClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
 func (c *HTTPClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
 	c.bot = bot
 	c.secret = secret
 	c.addr = addr
@ -127,16 +120,16 @@ func (c *HTTPClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
 	log.Infof("HTTP POST上报器已启动: %v", addr)
 }
-func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
+func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 	var res string
-	err := gout.POST(c.addr).SetJSON(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
+	err := gout.POST(c.addr).SetJSON(m).BindBody(&res).SetHeader(func() gout.H {
 		h := gout.H{
 			"X-Self-ID":  c.bot.Client.Uin,
 			"User-Agent": "CQHttp/4.15.0",
 		}
 		if c.secret != "" {
 			mac := hmac.New(sha1.New, []byte(c.secret))
-			_, err := mac.Write(m.Bytes())
+			_, err := mac.Write([]byte(m.ToJSON()))
 			if err != nil {
 				log.Error(err)
 				return nil
@ -154,12 +147,12 @@ func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
 			return nil
 		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJSON(), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
+	log.Debugf("上报Event数据 %v 到 %v", m.ToJSON(), c.addr)
 	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(utils.B2S(m.Bytes())), gjson.Parse(res))
+		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJSON()), gjson.Parse(res))
 	}
 }
--- a/server/websocket.go
+++ b/server/websocket.go
@ -1,7 +1,6 @@
 package server
 import (
 	"bytes"
 	"context"
 	"fmt"
 	"net/http"
@ -13,8 +12,6 @@ import (
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
@ -100,7 +97,7 @@ func (c *WebSocketClient) connectAPI() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header)
 	if err != nil {
 		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
@ -124,7 +121,7 @@ func (c *WebSocketClient) connectEvent() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header)
 	if err != nil {
 		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
@ -155,7 +152,7 @@ func (c *WebSocketClient) connectUniversal() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header)
 	if err != nil {
 		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
@ -164,6 +161,7 @@ func (c *WebSocketClient) connectUniversal() {
 		}
 		return
 	}
 	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
 		c.bot.Client.Uin, time.Now().Unix())
 	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
@ -177,27 +175,16 @@ func (c *WebSocketClient) connectUniversal() {
 }
 func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
-	defer func() { _ = conn.Close() }()
+	defer conn.Close()
 	for {
-		buffer := global.NewBuffer()
+		_, buf, err := conn.ReadMessage()
 		t, reader, err := conn.NextReader()
 		if err != nil {
 			log.Warnf("监听反向WS API时出现错误: %v", err)
 			break
 		}
-		_, err = buffer.ReadFrom(reader)
+
-		if err != nil {
+		go conn.handleRequest(c.bot, buf)
-			log.Warnf("监听反向WS API时出现错误: %v", err)
+
 			break
 		}
 		if t == websocket.TextMessage {
 			go func(buffer *bytes.Buffer) {
 				defer global.PutBuffer(buffer)
 				conn.handleRequest(c.bot, buffer.Bytes())
 			}(buffer)
 		} else {
 			global.PutBuffer(buffer)
 		}
 	}
 	if c.conf.ReverseReconnectInterval != 0 {
 		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
@ -207,14 +194,14 @@ func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
 	}
 }
-func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
+func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
 	if c.eventConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJSON())
 		conn := c.eventConn
 		conn.Lock()
 		defer conn.Unlock()
 		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+		if err := c.eventConn.WriteJSON(m); err != nil {
 			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
 			_ = c.eventConn.Close()
 			if c.conf.ReverseReconnectInterval != 0 {
@ -224,12 +211,12 @@ func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
 		}
 	}
 	if c.universalConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJSON())
 		conn := c.universalConn
 		conn.Lock()
 		defer conn.Unlock()
 		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+		if err := c.universalConn.WriteJSON(m); err != nil {
 			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
 			_ = c.universalConn.Close()
 			if c.conf.ReverseReconnectInterval != 0 {
@ -258,7 +245,7 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		_ = c.Close()
+		c.Close()
 		return
 	}
@ -309,7 +296,7 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		_ = c.Close()
+		c.Close()
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
@ -321,25 +308,15 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 }
 func (s *webSocketServer) listenAPI(c *webSocketConn) {
-	defer func() { _ = c.Close() }()
+	defer c.Close()
 	for {
-		buffer := global.NewBuffer()
+		t, payload, err := c.ReadMessage()
 		t, reader, err := c.NextReader()
 		if err != nil {
 			break
 		}
 		_, err = buffer.ReadFrom(reader)
 		if err != nil {
 			break
 		}
 		if t == websocket.TextMessage {
-			go func(buffer *bytes.Buffer) {
+			go c.handleRequest(s.bot, payload)
 				defer global.PutBuffer(buffer)
 				c.handleRequest(s.bot, buffer.Bytes())
 			}(buffer)
 		} else {
 			global.PutBuffer(buffer)
 		}
 	}
 }
@ -348,7 +325,7 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
-			_ = c.Close()
+			c.Close()
 		}
 	}()
 	global.RateLimit(context.Background())
@ -364,14 +341,14 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	_ = c.WriteJSON(ret)
 }
-func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
+func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
 	s.eventConnMutex.Lock()
 	defer s.eventConnMutex.Unlock()
 	for i, l := 0, len(s.eventConn); i < l; i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJSON())
 		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJSON())); err != nil {
 			_ = conn.Close()
 			next := i + 1
 			if next >= l {
Author	SHA1	Message	Date
Ink33	4526e00d79	update .goreleaser.yml (cherry picked from commit `eb8a65c682`) add maintainer (cherry picked from commit `a5947ece10`)	2021-04-30 19:26:06 +08:00
wdvxdr	f6280baa0c	use goreleaser (cherry picked from commit `2b3842e61c`)	2021-04-30 19:25:20 +08:00
Sam	8974adb009	fix: panic on empty forward msg (cherry picked from commit `c06aee39d9`)	2021-04-30 17:00:29 +08:00
wdvxdr	2226be777a	fix: reduce limitedString memory cost (cherry picked from commit `5b0c693aba`)	2021-04-30 16:53:47 +08:00
Ink33	127d636b8a	fix unexpected ReadPassword behavior in linux(#794 ) (cherry picked from commit `a361366916`)	2021-04-30 16:53:47 +08:00
wdvxdr	f1a480c01d	update MiraiGo	2021-04-30 16:53:47 +08:00
Kanri	2f227842f7	fix: send temp message (cherry picked from commit `cebf9c25e1`)	2021-04-30 16:22:27 +08:00
wdvxdr	c24a2b327a	fix: tts can't play on ios(#849 ) (cherry picked from commit `1ecb1f62dc`) (cherry picked from commit `0487f849bc`)	2021-04-30 15:47:31 +08:00
wdvxdr	5f247715b9	feat(go-silk): update go-silk support darwin arm64 (cherry picked from commit `ad260f6217`)	2021-04-30 15:28:55 +08:00
wdvxdr	ae73451677	fix(cqcode): some escape error in cqcode serialize fix typo (cherry picked from commit `ecf695a68d`) fix escape (cherry picked from commit `337e53ebc6`)	2021-04-30 14:58:06 +08:00
wdvxdr	2aed5d5a16	fix(ws server): add lock when accept a connection (cherry picked from commit `5d61a254e6`)	2021-04-30 14:48:14 +08:00
Sam	190eb00143	fix(coolq): fix temp message when group does not exist(#717 ) (cherry picked from commit `2febee01d9`)	2021-04-30 14:46:53 +08:00
wdvxdr	84fef8f0c0	fix(cqcode): split url does not work (cherry picked from commit `8db68f9427`)	2021-04-30 14:45:17 +08:00