feat enable_self_message config.

修复bug&更正代码

.github/ISSUE_TEMPLATE/bug--.md

@@ -1,6 +1,6 @@
 ---
 name: Bug汇报
-about: Create a report to help us improve
+about: 遇到了bug? 你可以在这里开始汇报
 title: ''
 labels: ''
 assignees: ''
@@ -8,22 +8,34 @@ assignees: ''
 ---
 
 <!--
-在提出ISSUE前，希望您能花费一定的时间执行以下几个步骤以方便我们定位BUG.
+在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
-1: 确定没有相同问题的ISSUE已被提出.
+
-2: 准确填写环境信息.
+1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
-3: 最好能打开DEBUG模式并复现相关问题.
+2: 🌎| 请准确填写环境信息.
-4: 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+3: ❔ | 打开DEBUG模式复现，并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
+4: ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+
+注: 如果您不知道如何有效、精准地表述，我们建议您先阅读《提问的智慧》
+(链接: https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
+
+请确保您已经仔细阅读此教程，并勾选下方的确认框。(将 [ ] 修改为 [x])
+--------
+- [ ] 我已经仔细阅读上述教程和"提问前需知 [图+文]": https://github.com/Mrs4s/go-cqhttp/issues/633
+- [ ] 我已知晓并同意，如果我不遵循以下格式提交 Issue，或者我使用的并非最新版本，或者我没有提供足够的环境信息，则我的 Issue 可能会被无条件自动关闭和锁定。
+- [ ] 我已知晓并同意，我仅需要把选项前的 [ ] 替换为 [x]。如果我删除、修改这些复选框的其他部分，或是在 x 之前或之后留了空格，则我的 Issue 可能会被无条件自动关闭和锁定。
+- [ ] 我已知晓并同意，此处仅用于汇报程序中存在的问题。若这个 Issue 是关于其他非程序本身问题或是新功能需求，则我的 Issue 可能会被无条件自动关闭和锁定。（这些问题应当在 Discussion 板块提出。）
+--------
 -->
 
 **环境信息**
-请根据实际使用环境修改以下信息
+<!-- 请根据实际使用环境修改以下信息。请勿留空。 -->
 go-cqhttp版本: 
 运行环境: 
 连接方式: 
 使用协议: 
 
 **bug内容**
-请在这里详细描述bug的内容
+<!-- 请在这里详细描述bug的内容 -->
 
 **复现方法**
-请在这里分步骤的描述如何复现这个bug
+<!-- 请在这里分步骤的描述如何复现这个bug -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 提出新建议/功能
+    url: https://github.com/Mrs4s/go-cqhttp/discussions/new
+    about: 请在这里提出你的建议或功能

.github/workflows/ci.yml

@@ -14,28 +14,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64
+        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64, darwin/arm64
         goos: [linux, windows, darwin]
         goarch: ["386", amd64, arm, arm64]
         exclude:
           - goos: darwin
             goarch: arm
-          - goos: darwin
-            goarch: arm64
           - goos: darwin
             goarch: "386"
           - goos: windows
             goarch: arm64
       fail-fast: true
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-        go-version: 1.15
+          go-version: 1.16
-    
       - name: Build binary file
         env:
           GOOS: ${{ matrix.goos }}
@@ -46,8 +41,7 @@ jobs:
           if $IS_PR ; then echo $PR_PROMPT; fi
           export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
           export CGO_ENABLED=0
-        go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" .
+          go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
-    
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         if: ${{ !github.head_ref }}
@@ -55,4 +49,12 @@ jobs:
           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

.github/workflows/issuebot.yml

@@ -0,0 +1,12 @@
+name: Issuebot
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  new_issue:
+    name: Run Issuebot on new Issue
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wfjsw/actions-gocqhttp-issue-prefilter@master

.github/workflows/release.yml

@@ -8,14 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
+        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64, darwin/arm64
         goos: [linux, windows, darwin]
         goarch: ["386", amd64, arm, arm64]
         exclude: 
           - goos: darwin
             goarch: arm
-          - goos: darwin
-            goarch: arm64
           - goos: darwin
             goarch: "386"
           - goos: windows
@@ -32,6 +30,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "https://golang.org/dl/go1.15.3.linux-amd64.tar.gz"
+          goversion: "https://golang.org/dl/go1.16.linux-amd64.tar.gz"
+          build_flags: -trimpath
           ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
           

README.md

@@ -6,7 +6,8 @@
 
 # go-cqhttp
 
-_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [cqhttp](https://github.com/howmanybots/onebot/blob/master/README.md) golang 原生实现 ✨_
+_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_  
+
 
 </div>
 
@@ -23,23 +24,21 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
   <a href="https://github.com/Mrs4s/go-cqhttp/actions">
     <img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action">
   </a>
+  <a href="https://goreportcard.com/report/github.com/Mrs4s/go-cqhttp">
+  <img src="https://goreportcard.com/badge/github.com/Mrs4s/go-cqhttp" alt="GoReportCard">
+  </a>
 </p>
 
 <p align="center">
-  <a href="http://ishkong.github.io/go-cqhttp-docs">文档</a>
+  <a href="https://docs.go-cqhttp.org/">文档</a>
   ·
   <a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
   ·
-  <a href="https://ishkong.github.io/go-cqhttp-docs/guide/quick_start.html">开始使用</a>
+  <a href="https://docs.go-cqhttp.org/guide/quick_start.html">开始使用</a>
 </p>
 
----
-
-go-cqhttp 在[原版 cqhttp](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
-
----
-
 ## 兼容性
+go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs)绝大多数内容，并在其基础上做了一些扩展，详情请看go-cqhttp的文档
 
 ### 接口
 
@@ -276,6 +275,7 @@ go-cqhttp 在[原版 cqhttp](https://github.com/richardchien/coolq-http-api)的
 - 重复提问
 
 > 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。  
+> 有关如何提问，请阅读[《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
 
 ## 性能
 

coolq/bot.go

@@ -13,21 +13,19 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-
-	"github.com/syndtr/goleveldb/leveldb"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/Mrs4s/go-cqhttp/global"
-
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
+	"github.com/syndtr/goleveldb/leveldb"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 
+// CQBot CQBot结构体,存储Bot实例相关配置
 type CQBot struct {
 	Client *client.QQClient
 
@@ -38,10 +36,13 @@ type CQBot struct {
 	oneWayMsgCache sync.Map
 }
 
+// MSG 消息Map
 type MSG map[string]interface{}
 
+// ForceFragmented 是否启用强制分片
 var ForceFragmented = false
 
+// NewQQBot 初始化一个QQBot实例
 func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot := &CQBot{
 		Client: cli,
@@ -60,6 +61,9 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
+	if conf.EnableSelfMessage {
+		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
@@ -78,6 +82,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
 	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
+	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
 		i := conf.HeartbeatInterval
 		if i < 0 {
@@ -102,10 +107,12 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	return bot
 }
 
+// OnEventPush 注册事件上报函数
 func (bot *CQBot) OnEventPush(f func(m MSG)) {
 	bot.events = append(bot.events, f)
 }
 
+// GetMessage 获取给定消息id对应的消息
 func (bot *CQBot) GetMessage(mid int32) MSG {
 	if bot.db != nil {
 		m := MSG{}
@@ -123,6 +130,7 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 	return nil
 }
 
+// UploadLocalImageAsGroup 上传本地图片至群聊
 func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
 	if img.Stream != nil {
 		return bot.Client.UploadGroupImage(groupCode, img.Stream)
@@ -130,6 +138,7 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 	return bot.Client.UploadGroupImageByFile(groupCode, img.File)
 }
 
+// UploadLocalVideo 上传本地短视频至群聊
 func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
 	if v.File != "" {
 		video, err := os.Open(v.File)
@@ -146,9 +155,10 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
 	return &v.ShortVideoElement, nil
 }
 
-func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement) (*message.FriendImageElement, error) {
+// UploadLocalImageAsPrivate 上传本地图片至私聊
+func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
 	if img.Stream != nil {
-		return bot.Client.UploadPrivateImage(userId, img.Stream)
+		return bot.Client.UploadPrivateImage(userID, img.Stream)
 	}
 	// need update.
 	f, err := os.Open(img.File)
@@ -156,41 +166,43 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement
 		return nil, err
 	}
 	defer f.Close()
-	return bot.Client.UploadPrivateImage(userId, f)
+	return bot.Client.UploadPrivateImage(userID, f)
 }
 
-func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int32 {
+// SendGroupMessage 发送群消息
+func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
+	group := bot.Client.FindGroup(groupID)
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
-			gm, err := bot.UploadLocalImageAsGroup(groupId, i)
+			gm, err := bot.UploadLocalImageAsGroup(groupID, i)
 			if err != nil {
-				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err)
+				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
 				continue
 			}
 			newElem = append(newElem, gm)
 			continue
 		}
 		if i, ok := elem.(*message.VoiceElement); ok {
-			gv, err := bot.Client.UploadGroupPtt(groupId, bytes.NewReader(i.Data))
+			gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
 			if err != nil {
-				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
+				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
 				continue
 			}
 			newElem = append(newElem, gv)
 			continue
 		}
 		if i, ok := elem.(*LocalVideoElement); ok {
-			gv, err := bot.UploadLocalVideo(groupId, i)
+			gv, err := bot.UploadLocalVideo(groupID, i)
 			if err != nil {
-				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupId, err)
+				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
 				continue
 			}
 			newElem = append(newElem, gv)
 			continue
 		}
 		if i, ok := elem.(*PokeElement); ok {
-			if group := bot.Client.FindGroup(groupId); group != nil {
+			if group := bot.Client.FindGroup(groupID); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
 					return 0
@@ -198,69 +210,20 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 			}
 		}
 		if i, ok := elem.(*GiftElement); ok {
-			bot.Client.SendGroupGift(uint64(groupId), uint64(i.Target), i.GiftId)
+			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
 			return 0
 		}
-		if i, ok := elem.(*QQMusicElement); ok {
+		if i, ok := elem.(*message.MusicShareElement); ok {
-			var msgStyle uint32 = 4
+			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
-			if i.MusicUrl == "" {
-				msgStyle = 0 // fix vip song
-			}
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 100497308, 1, msgStyle, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.tencent.qqmusic",
-				Signature:   "cbd27cd7c861227d013a25b2d10f0799",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
 			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
+				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
 				return -1
 			}
 			return bot.InsertGroupMessage(ret)
 		}
-		if i, ok := elem.(*CloudMusicElement); ok {
+		if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 100495085, 1, 4, client.RichClientInfo{
+			newElem = append(newElem, message.NewText("@全体成员"))
-				Platform:    1,
+			continue
-				SdkVersion:  "0.0.0",
-				PackageName: "com.netease.cloudmusic",
-				Signature:   "da6b069da1e2982db3e386233f68d76d",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
-				return -1
-			}
-			return bot.InsertGroupMessage(ret)
-		}
-		if i, ok := elem.(*MiguMusicElement); ok {
-			ret, err := bot.Client.SendGroupRichMessage(groupId, 1101053067, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "cmccwm.mobilemusic",
-				Signature:   "6cdc72a439cef99a3418d2a78aa28c73",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err)
-				return -1
-			}
-			return bot.InsertGroupMessage(ret)
 		}
 		newElem = append(newElem, elem)
 	}
@@ -270,7 +233,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem)
-	ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
+	ret := bot.Client.SendGroupMessage(groupID, m, ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
 		return -1
@@ -278,6 +241,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 	return bot.InsertGroupMessage(ret)
 }
 
+// SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
 	for _, elem := range m.Elements {
@@ -312,53 +276,8 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 			newElem = append(newElem, gv)
 			continue
 		}
-		if i, ok := elem.(*QQMusicElement); ok {
+		if i, ok := elem.(*message.MusicShareElement); ok {
-			var msgStyle uint32 = 4
+			bot.Client.SendFriendMusicShare(target, i)
-			if i.MusicUrl == "" {
-				msgStyle = 0 // fix vip song
-			}
-			bot.Client.SendFriendRichMessage(target, 100497308, 1, msgStyle, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.tencent.qqmusic",
-				Signature:   "cbd27cd7c861227d013a25b2d10f0799",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			return 0
-		}
-		if i, ok := elem.(*CloudMusicElement); ok {
-			bot.Client.SendFriendRichMessage(target, 100495085, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "com.netease.cloudmusic",
-				Signature:   "da6b069da1e2982db3e386233f68d76d",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
-			return 0
-		}
-		if i, ok := elem.(*MiguMusicElement); ok {
-			bot.Client.SendFriendRichMessage(target, 1101053067, 1, 4, client.RichClientInfo{
-				Platform:    1,
-				SdkVersion:  "0.0.0",
-				PackageName: "cmccwm.mobilemusic",
-				Signature:   "6cdc72a439cef99a3418d2a78aa28c73",
-			}, &message.RichMessage{
-				Title:      i.Title,
-				Summary:    i.Summary,
-				Url:        i.Url,
-				PictureUrl: i.PictureUrl,
-				MusicUrl:   i.MusicUrl,
-			})
 			return 0
 		}
 		newElem = append(newElem, elem)
@@ -378,7 +297,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 	} else if code, ok := bot.tempMsgCache.Load(target); ok { // 临时会话
 		msg := bot.Client.SendTempMessage(code.(int64), target, m)
 		if msg != nil {
-			id = msg.Id
+			id = bot.InsertTempMessage(target, msg)
 		}
 	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
@@ -392,6 +311,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 	return id
 }
 
+// InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	val := MSG{
 		"message-id":  m.Id,
@@ -402,7 +322,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 		"time":        m.Time,
 		"message":     ToStringMessage(m.Elements, m.GroupCode, true),
 	}
-	id := ToGlobalId(m.GroupCode, m.Id)
+	id := toGlobalID(m.GroupCode, m.Id)
 	if bot.db != nil {
 		buf := new(bytes.Buffer)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
@@ -417,6 +337,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	return id
 }
 
+// InsertPrivateMessage 私聊消息入数据库
 func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	val := MSG{
 		"message-id":  m.Id,
@@ -426,7 +347,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 		"time":        m.Time,
 		"message":     ToStringMessage(m.Elements, m.Sender.Uin, true),
 	}
-	id := ToGlobalId(m.Sender.Uin, m.Id)
+	id := toGlobalID(m.Sender.Uin, m.Id)
 	if bot.db != nil {
 		buf := new(bytes.Buffer)
 		if err := gob.NewEncoder(buf).Encode(val); err != nil {
@@ -441,10 +362,39 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	return id
 }
 
-func ToGlobalId(code int64, msgId int32) int32 {
+// InsertTempMessage 临时消息入数据库
-	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgId))))
+func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
+	val := MSG{
+		"message-id": m.Id,
+		// FIXME(InsertTempMessage) InternalId missing
+		"group":      m.GroupCode,
+		"group-name": m.GroupName,
+		"target":     target,
+		"sender":     m.Sender,
+		"time":       time.Now().Unix(),
+		"message":    ToStringMessage(m.Elements, m.Sender.Uin, true),
+	}
+	id := toGlobalID(m.Sender.Uin, m.Id)
+	if bot.db != nil {
+		buf := new(bytes.Buffer)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+	}
+	return id
 }
 
+// toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
+func toGlobalID(code int64, msgID int32) int32 {
+	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
+}
+
+// Release 释放Bot实例
 func (bot *CQBot) Release() {
 	if bot.db != nil {
 		_ = bot.db.Close()
@@ -482,7 +432,12 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
 		"message_type": "group",
 		"message_seq":  m.Id,
-		"post_type":    "message",
+		"post_type": func() string {
+			if m.Sender.Uin == bot.Client.Uin {
+				return "message_sent"
+			}
+			return "message"
+		}(),
 		"raw_message": cqm,
 		"self_id":     bot.Client.Uin,
 		"sender": MSG{
@@ -505,7 +460,21 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 		gm["sender"].(MSG)["nickname"] = "匿名消息"
 		gm["sub_type"] = "anonymous"
 	} else {
-		mem := bot.Client.FindGroup(m.GroupCode).FindMember(m.Sender.Uin)
+		group := bot.Client.FindGroup(m.GroupCode)
+		mem := group.FindMember(m.Sender.Uin)
+		if mem == nil {
+			log.Warnf("获取 %v 成员信息失败，尝试刷新成员列表", m.Sender.Uin)
+			t, err := bot.Client.GetGroupMembers(group)
+			if err != nil {
+				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
+				return nil
+			}
+			group.Members = t
+			mem = group.FindMember(m.Sender.Uin)
+			if mem == nil {
+				return nil
+			}
+		}
 		ms := gm["sender"].(MSG)
 		ms["role"] = func() string {
 			switch mem.Permission {
@@ -535,7 +504,8 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 
-func (m MSG) ToJson() string {
+// ToJSON 生成JSON字符串
+func (m MSG) ToJSON() string {
 	b, _ := json.Marshal(m)
 	return string(b)
 }

coolq/cqcode.go

@@ -4,21 +4,23 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/base64"
+	goBinary "encoding/binary"
 	"encoding/hex"
 	xml2 "encoding/xml"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"math"
 	"math/rand"
 	"net/url"
 	"os"
 	"path"
+	"reflect"
 	"runtime"
 	"strconv"
 	"strings"
 	"time"
+	"unsafe"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
@@ -34,67 +36,73 @@ var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 */
 
+// IgnoreInvalidCQCode 是否忽略无效CQ码
 var IgnoreInvalidCQCode = false
-var SplitUrl = false
+
+// SplitURL 是否分割URL
+var SplitURL = false
+
+// magicCQ 代表 uint32([]byte("[CQ:"))
+var magicCQ = uint32(0)
+
+func init() {
+	const sizeInt = int(unsafe.Sizeof(0))
+	x := 0x1234
+	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 指针运算
+func add(ptr unsafe.Pointer, offset uintptr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(ptr) + offset)
+}
 
 const maxImageSize = 1024 * 1024 * 30  // 30MB
 const maxVideoSize = 1024 * 1024 * 100 // 100MB
-
+// PokeElement 拍一拍
 type PokeElement struct {
 	Target int64
 }
 
+// GiftElement 礼物
 type GiftElement struct {
 	Target int64
-	GiftId message.GroupGift
+	GiftID message.GroupGift
-}
-
-type MusicElement struct {
-	Title      string
-	Summary    string
-	Url        string
-	PictureUrl string
-	MusicUrl   string
-}
-
-type QQMusicElement struct {
-	MusicElement
-}
-
-type CloudMusicElement struct {
-	MusicElement
-}
-
-type MiguMusicElement struct {
-	MusicElement
 }
 
+// LocalImageElement 本地图片
 type LocalImageElement struct {
 	message.ImageElement
 	Stream io.ReadSeeker
 	File   string
 }
 
+// LocalVoiceElement 本地语音
 type LocalVoiceElement struct {
 	message.VoiceElement
 	Stream io.ReadSeeker
 }
 
+// LocalVideoElement 本地视频
 type LocalVideoElement struct {
 	message.ShortVideoElement
 	File  string
 	thumb io.ReadSeeker
 }
 
+// Type 获取元素类型ID
 func (e *GiftElement) Type() message.ElementType {
+	// Make message.IMessageElement Happy
 	return message.At
 }
 
-func (e *MusicElement) Type() message.ElementType {
+// GiftID 礼物ID数组
-	return message.Service
+var GiftID = [...]message.GroupGift{
-}
-
-var GiftId = [...]message.GroupGift{
 	message.SweetWink,
 	message.HappyCola,
 	message.LuckyBracelet,
@@ -111,15 +119,18 @@ var GiftId = [...]message.GroupGift{
 	message.LoveMask,
 }
 
+// Type 获取元素类型ID
 func (e *PokeElement) Type() message.ElementType {
+	// Make message.IMessageElement Happy
 	return message.At
 }
 
-func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []MSG) {
+// ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
+func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []MSG) {
 	r = []MSG{}
 	ur := false
-	if len(raw) != 0 {
+	if len(isRaw) != 0 {
-		ur = raw[0]
+		ur = isRaw[0]
 	}
 	m := &message.SendingMessage{Elements: e}
 	reply := m.FirstOrNil(func(e message.IMessageElement) bool {
@@ -129,7 +140,7 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 	if reply != nil {
 		r = append(r, MSG{
 			"type": "reply",
-			"data": map[string]string{"id": fmt.Sprint(ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq))},
+			"data": map[string]string{"id": fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))},
 		})
 	}
 	for _, elem := range e {
@@ -141,10 +152,10 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 				"data": map[string]string{"text": o.Content},
 			}
 		case *message.LightAppElement:
-			//m = MSG{
+			// m = MSG{
 			// 	"type": "text",
 			// 	"data": map[string]string{"text": o.Content},
-			//}
+			// }
 			m = MSG{
 				"type": "json",
 				"data": map[string]string{"data": o.Content},
@@ -266,10 +277,11 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 	return
 }
 
-func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r string) {
+// ToStringMessage 将消息元素数组转为字符串以用于消息上报
+func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r string) {
 	ur := false
-	if len(raw) != 0 {
+	if len(isRaw) != 0 {
-		ur = raw[0]
+		ur = isRaw[0]
 	}
 	// 方便
 	m := &message.SendingMessage{Elements: e}
@@ -278,7 +290,7 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 		return ok
 	})
 	if reply != nil {
-		r += fmt.Sprintf("[CQ:reply,id=%d]", ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq))
+		r += fmt.Sprintf("[CQ:reply,id=%d]", toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))
 	}
 	for _, elem := range e {
 		switch o := elem.(type) {
@@ -338,72 +350,21 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 			}
 		case *message.LightAppElement:
 			r += fmt.Sprintf(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content))
-			//r += CQCodeEscapeText(o.Content)
+			// r += CQCodeEscapeText(o.Content)
 		}
 	}
 	return
 }
 
-func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMessageElement) {
+// ConvertStringMessage 将消息字符串转为消息元素数组
-	index := 0
+func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMessageElement) {
-	stat := 0
+	var t, key string
-	rMsg := []rune(msg)
+	var d = map[string]string{}
-	var tempText, cqCode []rune
+	ptr := unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(&s)).Data)
-	hasNext := func() bool {
+	l := len(s)
-		return index < len(rMsg)
+	i, j, CQBegin := 0, 0, 0
-	}
+
-	next := func() rune {
-		r := rMsg[index]
-		index++
-		return r
-	}
-	move := func(steps int) {
-		index += steps
-	}
-	peekN := func(count int) string {
-		lastIdx := int(math.Min(float64(index+count), float64(len(rMsg))))
-		return string(rMsg[index:lastIdx])
-	}
-	isCQCodeBegin := func(r rune) bool {
-		return r == '[' && peekN(3) == "CQ:"
-	}
-	saveTempText := func() {
-		if len(tempText) != 0 {
-			if SplitUrl {
-				for _, t := range global.SplitURL(CQCodeUnescapeValue(string(tempText))) {
-					r = append(r, message.NewText(t))
-				}
-			} else {
-				r = append(r, message.NewText(CQCodeUnescapeValue(string(tempText))))
-			}
-		}
-		tempText = []rune{}
-		cqCode = []rune{}
-	}
 	saveCQCode := func() {
-		defer func() {
-			cqCode = []rune{}
-			tempText = []rune{}
-		}()
-		s := strings.SplitN(string(cqCode), ",", -1)
-		if len(s) == 0 {
-			return
-		}
-		t := s[0]
-		params := make(map[string]string)
-		for i := 1; i < len(s); i++ {
-			p := s[i]
-			p = strings.TrimSpace(p)
-			if p == "" {
-				continue
-			}
-			data := strings.SplitN(p, "=", 2)
-			if len(data) == 2 {
-				params[data[0]] = CQCodeUnescapeValue(data[1])
-			} else {
-				params[p] = ""
-			}
-		}
 		if t == "reply" { // reply 特殊处理
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
@@ -411,8 +372,8 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
 					return
 				}
 			}
-			mid, err := strconv.Atoi(params["id"])
+			mid, err := strconv.Atoi(d["id"])
-			customText := params["text"]
+			customText := d["text"]
 			if err == nil {
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
@@ -421,41 +382,45 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
 							ReplySeq: org["message-id"].(int32),
 							Sender:   org["sender"].(message.Sender).Uin,
 							Time:     org["time"].(int32),
-							Elements: bot.ConvertStringMessage(org["message"].(string), group),
+							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
 						},
 					}, r...)
 					return
 				}
 			} else if customText != "" {
-				sender, err := strconv.ParseInt(params["qq"], 10, 64)
+				sender, err := strconv.ParseInt(d["qq"], 10, 64)
 				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
 					return
 				}
-				msgTime, err := strconv.ParseInt(params["time"], 10, 64)
+				msgTime, err := strconv.ParseInt(d["time"], 10, 64)
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
+				messageSeq, err := strconv.ParseInt(d["seq"], 10, 64)
+				if err != nil {
+					messageSeq = 0
+				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
-						ReplySeq: int32(0),
+						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, group),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
 					},
 				}, r...)
 				return
 			}
 		}
 		if t == "forward" { // 单独处理转发
-			if id, ok := params["id"]; ok {
+			if id, ok := d["id"]; ok {
 				r = []message.IMessageElement{bot.Client.DownloadForwardMessage(id)}
 				return
 			}
 		}
-		elem, err := bot.ToElement(t, params, group)
+		elem, err := bot.ToElement(t, d, isGroup)
 		if err != nil {
-			org := "[CQ:" + string(cqCode) + "]"
+			org := s[CQBegin:i]
 			if !IgnoreInvalidCQCode {
 				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
 				r = append(r, message.NewText(org))
@@ -471,39 +436,80 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
 			r = append(r, i...)
 		}
 	}
-	for hasNext() {
+
-		ch := next()
+S1: // Plain Text
-		switch stat {
+	for ; i < l; i++ {
-		case 0:
+		if *(*byte)(add(ptr, uintptr(i))) == '[' && i+4 < l &&
-			if isCQCodeBegin(ch) {
+			*(*uint32)(add(ptr, uintptr(i))) == magicCQ { // Magic :uint32([]byte("[CQ:"))
-				saveTempText()
+			if i > j {
-				tempText = append(tempText, []rune("[CQ:")...)
+				r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
-				move(3)
-				stat = 1
-			} else {
-				tempText = append(tempText, ch)
 			}
-		case 1:
+			CQBegin = i
-			if isCQCodeBegin(ch) {
+			i += 4
-				move(-1)
+			j = i
-				stat = 0
+			goto S2
-			} else if ch == ']' {
+		}
+	}
+	goto End
+S2: // CQCode Type
+	for k := range d { // 内存复用，减小GC压力
+		delete(d, k)
+	}
+	for ; i < l; i++ {
+		switch *(*byte)(add(ptr, uintptr(i))) {
+		case ',': // CQ Code with params
+			t = s[j:i]
+			i++
+			j = i
+			goto S3
+		case ']': // CQ Code without params
+			t = s[j:i]
+			i++
+			j = i
 			saveCQCode()
-				stat = 0
+			goto S1
-			} else {
-				cqCode = append(cqCode, ch)
-				tempText = append(tempText, ch)
 		}
 	}
+	goto End
+S3: // CQCode param key
+	for ; i < l; i++ {
+		if *(*byte)(add(ptr, uintptr(i))) == '=' {
+			key = s[j:i]
+			i++
+			j = i
+			goto S4
+		}
+	}
+	goto End
+S4: // CQCode param value
+	for ; i < l; i++ {
+		switch *(*byte)(add(ptr, uintptr(i))) {
+		case ',': // more param
+			d[key] = CQCodeUnescapeValue(s[j:i])
+			i++
+			j = i
+			goto S3
+		case ']':
+			d[key] = CQCodeUnescapeValue(s[j:i])
+			i++
+			j = i
+			saveCQCode()
+			goto S1
+		}
+	}
+	goto End
+End:
+	if i > j {
+		r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
 	}
-	saveTempText()
 	return
 }
 
-func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.IMessageElement) {
+// ConvertObjectMessage 将消息JSON对象转为消息元素数组
+func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []message.IMessageElement) {
 	convertElem := func(e gjson.Result) {
 		t := e.Get("type").Str
-		if t == "reply" && group {
+		if t == "reply" && isGroup {
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
 					log.Warnf("警告: 一条信息只能包含一个 Reply 元素.")
@@ -520,7 +526,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 							ReplySeq: org["message-id"].(int32),
 							Sender:   org["sender"].(message.Sender).Uin,
 							Time:     org["time"].(int32),
-							Elements: bot.ConvertStringMessage(org["message"].(string), group),
+							Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
 						},
 					}, r...)
 					return
@@ -528,19 +534,23 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 			} else if customText != "" {
 				sender, err := strconv.ParseInt(e.Get("data").Get("qq").String(), 10, 64)
 				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
 					return
 				}
 				msgTime, err := strconv.ParseInt(e.Get("data").Get("time").String(), 10, 64)
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
+				messageSeq, err := strconv.ParseInt(e.Get("data").Get("seq").String(), 10, 64)
+				if err != nil {
+					messageSeq = 0
+				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
-						ReplySeq: int32(0),
+						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, group),
+						Elements: bot.ConvertStringMessage(customText, isGroup),
 					},
 				}, r...)
 				return
@@ -555,9 +565,9 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 			d[key.Str] = value.String()
 			return true
 		})
-		elem, err := bot.ToElement(t, d, group)
+		elem, err := bot.ToElement(t, d, isGroup)
 		if err != nil {
-			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
+			log.Warnf("转换CQ码 (%v) 到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", e.Raw, err)
 			return
 		}
 		switch i := elem.(type) {
@@ -568,7 +578,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 		}
 	}
 	if m.Type == gjson.String {
-		return bot.ConvertStringMessage(m.Str, group)
+		return bot.ConvertStringMessage(m.Str, isGroup)
 	}
 	if m.IsArray() {
 		for _, e := range m.Array() {
@@ -582,12 +592,14 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 }
 
 // ToElement 将解码后的CQCode转换为Element.
+//
 // 返回 interface{} 存在三种类型
+//
 // message.IMessageElement []message.IMessageElement nil
-func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) {
+func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m interface{}, err error) {
 	switch t {
 	case "text":
-		if SplitUrl {
+		if SplitURL {
 			var ret []message.IMessageElement
 			for _, text := range global.SplitURL(d["text"]) {
 				ret = append(ret, message.NewText(text))
@@ -596,7 +608,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		}
 		return message.NewText(d["text"]), nil
 	case "image":
-		img, err := bot.makeImageOrVideoElem(d, false, group)
+		img, err := bot.makeImageOrVideoElem(d, false, isGroup)
 		if err != nil {
 			return nil, err
 		}
@@ -605,7 +617,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 			return img, nil
 		}
 		if i, ok := img.(*LocalImageElement); ok { // 秀图，闪照什么的就直接传了吧
-			if group {
+			if isGroup {
 				img, err = bot.UploadLocalImageAsGroup(1, i)
 			} else {
 				img, err = bot.UploadLocalImageAsPrivate(1, i)
@@ -637,7 +649,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		t, _ := strconv.ParseInt(d["qq"], 10, 64)
 		return &PokeElement{Target: t}, nil
 	case "gift":
-		if !group {
+		if !isGroup {
 			return nil, errors.New("private gift unsupported") // no free private gift
 		}
 		t, _ := strconv.ParseInt(d["qq"], 10, 64)
@@ -645,7 +657,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		if id < 0 || id >= 14 {
 			return nil, errors.New("invalid gift id")
 		}
-		return &GiftElement{Target: t, GiftId: GiftId[id]}, nil
+		return &GiftElement{Target: t, GiftID: GiftID[id]}, nil
 	case "tts":
 		defer func() {
 			if r := recover(); r != nil {
@@ -699,27 +711,28 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 				return nil, errors.New("song not found")
 			}
 			aid := strconv.FormatInt(info.Get("track_info.album.id").Int(), 10)
-			name := info.Get("track_info.name").Str + " - " + info.Get("track_info.singer.0.name").Str
+			name := info.Get("track_info.name").Str
 			mid := info.Get("track_info.mid").Str
 			albumMid := info.Get("track_info.album.mid").Str
 			pinfo, _ := global.GetBytes("http://u.y.qq.com/cgi-bin/musicu.fcg?g_tk=2034008533&uin=0&format=json&data={\"comm\":{\"ct\":23,\"cv\":0},\"url_mid\":{\"module\":\"vkey.GetVkeyServer\",\"method\":\"CgiGetVkey\",\"param\":{\"guid\":\"4311206557\",\"songmid\":[\"" + mid + "\"],\"songtype\":[0],\"uin\":\"0\",\"loginflag\":1,\"platform\":\"23\"}}}&_=1599039471576")
-			jumpUrl := "https://i.y.qq.com/v8/playsong.html?platform=11&appshare=android_qq&appversion=10030010&hosteuin=oKnlNenz7i-s7c**&songmid=" + mid + "&type=0&appsongtype=1&_wv=1&source=qq&ADTAG=qfshare"
+			jumpURL := "https://i.y.qq.com/v8/playsong.html?platform=11&appshare=android_qq&appversion=10030010&hosteuin=oKnlNenz7i-s7c**&songmid=" + mid + "&type=0&appsongtype=1&_wv=1&source=qq&ADTAG=qfshare"
 			purl := gjson.ParseBytes(pinfo).Get("url_mid.data.midurlinfo.0.purl").Str
 			preview := "http://y.gtimg.cn/music/photo_new/T002R180x180M000" + albumMid + ".jpg"
 			if len(aid) < 2 {
 				return nil, errors.New("song error")
 			}
-			content := "来自go-cqhttp"
+			content := info.Get("track_info.singer.0.name").Str
 			if d["content"] != "" {
 				content = d["content"]
 			}
-			return &QQMusicElement{MusicElement: MusicElement{
+			return &message.MusicShareElement{
+				MusicType:  message.QQMusic,
 				Title:      name,
 				Summary:    content,
-				Url:        jumpUrl,
+				Url:        jumpURL,
 				PictureUrl: preview,
 				MusicUrl:   purl,
-			}}, nil
+			}, nil
 		}
 		if d["type"] == "163" {
 			info, err := global.NeteaseMusicSongInfo(d["id"])
@@ -730,51 +743,46 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 				return nil, errors.New("song not found")
 			}
 			name := info.Get("name").Str
-			jumpUrl := "https://y.music.163.com/m/song/" + d["id"]
+			jumpURL := "https://y.music.163.com/m/song/" + d["id"]
-			musicUrl := "http://music.163.com/song/media/outer/url?id=" + d["id"]
+			musicURL := "http://music.163.com/song/media/outer/url?id=" + d["id"]
-			picUrl := info.Get("album.picUrl").Str
+			picURL := info.Get("album.picUrl").Str
 			artistName := ""
 			if info.Get("artists.0").Exists() {
 				artistName = info.Get("artists.0.name").Str
 			}
-			return &CloudMusicElement{MusicElement{
+			return &message.MusicShareElement{
+				MusicType:  message.CloudMusic,
 				Title:      name,
 				Summary:    artistName,
-				Url:        jumpUrl,
+				Url:        jumpURL,
-				PictureUrl: picUrl,
+				PictureUrl: picURL,
-				MusicUrl:   musicUrl,
+				MusicUrl:   musicURL,
-			}}, nil
+			}, nil
 		}
 		if d["type"] == "custom" {
-			if d["subtype"] == "qq" {
+			if d["subtype"] != "" {
-				return &QQMusicElement{MusicElement{
+				var subtype = map[string]int{
-					Title:      d["title"],
+					"qq":    message.QQMusic,
-					Summary:    d["content"],
+					"163":   message.CloudMusic,
-					Url:        d["url"],
+					"migu":  message.MiguMusic,
-					PictureUrl: d["image"],
+					"kugou": message.KugouMusic,
-					MusicUrl:   d["purl"],
+					"kuwo":  message.KuwoMusic,
-				}}, nil
 				}
-			if d["subtype"] == "163" {
+				var musicType = 0
-				return &CloudMusicElement{MusicElement{
+				if tp, ok := subtype[d["subtype"]]; ok {
-					Title:      d["title"],
+					musicType = tp
-					Summary:    d["content"],
-					Url:        d["url"],
-					PictureUrl: d["image"],
-					MusicUrl:   d["purl"],
-				}}, nil
 				}
-			if d["subtype"] == "migu" {
+				return &message.MusicShareElement{
-				return &MiguMusicElement{MusicElement{
+					MusicType:  musicType,
 					Title:      d["title"],
 					Summary:    d["content"],
 					Url:        d["url"],
 					PictureUrl: d["image"],
 					MusicUrl:   d["purl"],
-				}}, nil
+				}, nil
 			}
 			xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="%s" src="%s"/><title>%s</title><summary>%s</summary></item><source name="音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
-				XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"]))
+				XMLEscape(d["title"]), d["url"], d["image"], d["audio"], XMLEscape(d["title"]), XMLEscape(d["content"]))
 			return &message.ServiceElement{
 				Id:      60,
 				Content: xml,
@@ -783,25 +791,26 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		}
 		return nil, errors.New("unsupported music type: " + d["type"])
 	case "xml":
-		resId := d["resid"]
+		resID := d["resid"]
 		template := CQCodeEscapeValue(d["data"])
-		i, _ := strconv.ParseInt(resId, 10, 64)
+		i, _ := strconv.ParseInt(resID, 10, 64)
 		msg := message.NewRichXml(template, i)
 		return msg, nil
 	case "json":
-		resId := d["resid"]
+		resID := d["resid"]
-		i, _ := strconv.ParseInt(resId, 10, 64)
+		i, _ := strconv.ParseInt(resID, 10, 64)
 		if i == 0 {
-			//默认情况下走小程序通道
+			// 默认情况下走小程序通道
-			msg := message.NewLightApp(CQCodeUnescapeValue(d["data"]))
+			msg := message.NewLightApp(d["data"])
 			return msg, nil
 		}
-		//resid不为0的情况下走富文本通道，后续补全透传service Id，此处暂时不处理 TODO
+		// resid不为0的情况下走富文本通道，后续补全透传service Id，此处暂时不处理 TODO
-		msg := message.NewRichJson(CQCodeUnescapeValue(d["data"]))
+		msg := message.NewRichJson(d["data"])
 		return msg, nil
 	case "cardimage":
 		source := d["source"]
 		icon := d["icon"]
+		brief := d["brief"]
 		minWidth, _ := strconv.ParseInt(d["minwidth"], 10, 64)
 		if minWidth == 0 {
 			minWidth = 200
@@ -818,17 +827,17 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		if maxHeight == 0 {
 			maxHeight = 1000
 		}
-		img, err := bot.makeImageOrVideoElem(d, false, group)
+		img, err := bot.makeImageOrVideoElem(d, false, isGroup)
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
-		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
+		return bot.makeShowPic(img, source, brief, icon, minWidth, minHeight, maxWidth, maxHeight, isGroup)
 	case "video":
 		cache := d["cache"]
 		if cache == "" {
 			cache = "1"
 		}
-		file, err := bot.makeImageOrVideoElem(d, true, group)
+		file, err := bot.makeImageOrVideoElem(d, true, isGroup)
 		if err != nil {
 			return nil, err
 		}
@@ -876,12 +885,22 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 	return nil, nil
 }
 
-func XmlEscape(c string) string {
+// XMLEscape 将字符串c转义为XML字符串
+func XMLEscape(c string) string {
 	buf := new(bytes.Buffer)
 	_ = xml2.EscapeText(buf, []byte(c))
 	return buf.String()
 }
 
+/*CQCodeEscapeText 将字符串raw中部分字符转义
+
+& -> &amp;
+
+[ -> &#91;
+
+] -> &#93;
+
+*/
 func CQCodeEscapeText(raw string) string {
 	ret := raw
 	ret = strings.ReplaceAll(ret, "&", "&amp;")
@@ -890,12 +909,32 @@ func CQCodeEscapeText(raw string) string {
 	return ret
 }
 
+/*CQCodeEscapeValue 将字符串value中部分字符转义
+
+, -> &#44;
+
+& -> &amp;
+
+[ -> &#91;
+
+] -> &#93;
+
+*/
 func CQCodeEscapeValue(value string) string {
 	ret := CQCodeEscapeText(value)
 	ret = strings.ReplaceAll(ret, ",", "&#44;")
 	return ret
 }
 
+/*CQCodeUnescapeText 将字符串content中部分字符反转义
+
+&amp; -> &
+
+&#91; -> [
+
+&#93; -> ]
+
+*/
 func CQCodeUnescapeText(content string) string {
 	ret := content
 	ret = strings.ReplaceAll(ret, "&#91;", "[")
@@ -904,13 +943,24 @@ func CQCodeUnescapeText(content string) string {
 	return ret
 }
 
+/*CQCodeUnescapeValue 将字符串content中部分字符反转义
+
+&#44; -> ,
+
+&amp; -> &
+
+&#91; -> [
+
+&#93; -> ]
+
+*/
 func CQCodeUnescapeValue(content string) string {
 	ret := strings.ReplaceAll(content, "&#44;", ",")
 	ret = CQCodeUnescapeText(ret)
 	return ret
 }
 
-// 图片 elem 生成器，单独拎出来，用于公用
+// makeImageOrVideoElem 图片 elem 生成器，单独拎出来，用于公用
 func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
 	f := d["file"]
 	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
@@ -986,9 +1036,8 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 				Name:      r.ReadString(),
 				Uuid:      r.ReadAvailable(),
 			}}, nil
-		} else {
-			return &LocalVideoElement{File: rawPath}, nil
 		}
+		return &LocalVideoElement{File: rawPath}, nil
 	}
 	if strings.HasPrefix(f, "base64") {
 		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
@@ -1071,10 +1120,13 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 	return nil, errors.New("invalid image")
 }
 
-//makeShowPic 一种xml 方式发送的群消息图片
+// makeShowPic 一种xml 方式发送的群消息图片
-func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
+func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, brief string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
 	xml := ""
 	var suf message.IMessageElement
+	if brief == "" {
+		brief = "&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！"
+	}
 	if i, ok := elem.(*LocalImageElement); ok {
 		if !group {
 			gm, err := bot.UploadLocalImageAsPrivate(1, i)
@@ -1083,7 +1135,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 				return nil, err
 			}
 			suf = gm
-			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		} else {
 			gm, err := bot.UploadLocalImageAsGroup(1, i)
 			if err != nil {
@@ -1091,20 +1143,20 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 				return nil, err
 			}
 			suf = gm
-			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		}
 	}
 
 	if i, ok := elem.(*message.GroupImageElement); ok {
-		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		suf = i
 	}
 	if i, ok := elem.(*message.FriendImageElement); ok {
-		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		suf = i
 	}
 	if xml != "" {
-		//log.Warn(xml)
+		// log.Warn(xml)
 		ret := []message.IMessageElement{suf}
 		ret = append(ret, message.NewRichXml(xml, 5))
 		return ret, nil

coolq/cqcode_test.go

@@ -0,0 +1,25 @@
+package coolq
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+var bot = NewQQBot(client.NewClient(1, ""), global.DefaultConfig())
+
+func TestCQBot_ConvertStringMessage(t *testing.T) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
+		fmt.Println(v)
+	}
+}
+
+var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] [CQ:text,text=123] [`
+
+func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		bot.ConvertStringMessage(bench, false)
+	}
+}

coolq/doc.go

@@ -0,0 +1,2 @@
+// Package coolq 包含CQBot实例,CQ码处理,消息发送,消息处理等的相关函数与结构体
+package coolq

coolq/event.go

@@ -17,17 +17,17 @@ import (
 
 var format = "string"
 
-//SetMessageFormat 设置消息上报格式，默认为string
+// SetMessageFormat 设置消息上报格式，默认为string
 func SetMessageFormat(f string) {
 	format = f
 }
 
-//ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
+// ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, id int64, raw ...bool) (r interface{}) {
+func ToFormattedMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r interface{}) {
 	if format == "string" {
-		r = ToStringMessage(e, id, raw...)
+		r = ToStringMessage(e, id, isRaw...)
 	} else if format == "array" {
-		r = ToArrayMessage(e, id, raw...)
+		r = ToArrayMessage(e, id, isRaw...)
 	}
 	return
 }
@@ -94,22 +94,29 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	}
 	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	gm := bot.formatGroupMessage(m)
+	if gm == nil {
+		return
+	}
 	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
 	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	}
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
-		"message_id":   m.Id,
+		"message_id":   id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -164,7 +171,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 
 func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := ToGlobalId(e.GroupCode, e.MessageId)
+	gid := toGlobalID(e.GroupCode, e.MessageId)
 	log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
 		formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
 	bot.dispatchEventMessage(MSG{
@@ -258,7 +265,7 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 
 func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
 	f := c.FindFriend(e.FriendUin)
-	gid := ToGlobalId(e.FriendUin, e.MessageId)
+	gid := toGlobalID(e.FriendUin, e.MessageId)
 	if f != nil {
 		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
 	} else {
@@ -431,7 +438,47 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 		"self_id": c.Uin,
 		"time":    time.Now().Unix(),
 	})
+}
 
+func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
+	g := c.FindGroup(e.GroupCode)
+	gid := toGlobalID(e.GroupCode, e.MessageID)
+	if e.OperationType == 1 {
+		log.Infof(
+			"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
+			formatGroupName(g),
+			formatMemberName(g.FindMember(e.OperatorUin)),
+			formatMemberName(g.FindMember(e.SenderUin)),
+			gid,
+		)
+	} else {
+		log.Infof(
+			"群 %v 内 %v 将 %v 的消息(%v)移出了精华消息.",
+			formatGroupName(g),
+			formatMemberName(g.FindMember(e.OperatorUin)),
+			formatMemberName(g.FindMember(e.SenderUin)),
+			gid,
+		)
+	}
+	if e.OperatorUin == bot.Client.Uin {
+		return
+	}
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"group_id":    e.GroupCode,
+		"notice_type": "essence",
+		"sub_type": func() string {
+			if e.OperationType == 1 {
+				return "add"
+			}
+			return "delete"
+		}(),
+		"self_id":     c.Uin,
+		"sender_id":   e.SenderUin,
+		"operator_id": e.OperatorUin,
+		"time":        time.Now().Unix(),
+		"message_id":  gid,
+	})
 }
 
 func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {

docs/config.md

@@ -21,6 +21,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
   "encrypt_password": false,
   "password_encrypted": "",
   "enable_db": true,
+  "enable_self_message": false,
   "access_token": "",
   "relogin": {
     "enabled": true,
@@ -42,7 +43,9 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
     "host": "0.0.0.0",
     "port": 5700,
     "timeout": 5,
-		"post_urls": {"url:port": "secret"}
+    "post_urls": {
+      "url:port": "secret"
+    }
   },
   "ws_config": {
     "enabled": true,
@@ -68,6 +71,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
 | password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
 | enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
+| enable_self_message   | bool     | 是否启用 `message_sent` 事件                                                       |
 | access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
 | relogin               | bool     | 是否自动重新登录                                                                         |
 | relogin_delay         | int      | 重登录延时（秒）                                                                         |
@@ -127,6 +131,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
 
 示例:
+
 ````
 1.1.1.1:53
 1.1.2.2:8899

docs/cqhttp.md

@@ -26,9 +26,9 @@
 - [获取图片信息](#获取图片信息)
 - [获取消息](#获取消息)
 - [获取合并转发内容](#获取合并转发内容)
-- [发送合并转发(群)](#发送合并转发(群))
+- [发送合并转发(群)](#发送合并转发群)
 - [获取中文分词](#获取中文分词)
-- [图片OCR](#图片OCR)
+- [图片OCR](#图片ocr)
 - [获取中文分词](#获取中文分词)
 - [获取群系统消息](#获取群文件系统信息)
 - [获取群文件系统信息](#获取群文件系统信息)
@@ -36,9 +36,15 @@
 - [获取群子目录文件列表](#获取群子目录文件列表)
 - [获取群文件资源链接](#获取群文件资源链接)
 - [获取状态](#获取状态)
-- [获取群子目录文件列表](#设置群名)
+- [获取群@全体成员剩余次数](#获取群全体成员剩余次数)
-- [获取用户VIP信息](#获取用户VIP信息)
+- [下载文件到缓存目录](#下载文件到缓存目录)
+- [获取群消息历史记录](#获取群消息历史记录)
+- [设置群名](#设置群名)
+- [获取用户VIP信息](#获取用户vip信息)
 - [发送群公告](#发送群公告)
+- [设置精华消息](#设置精华消息)
+- [移出精华消息](#移出精华消息)
+- [获取精华消息列表](#获取精华消息列表)
 - [重载事件过滤器](#重载事件过滤器)
 
 ##### 事件
@@ -50,6 +56,7 @@
 - [群成员荣誉变更提示](#群成员荣誉变更提示)
 - [群成员名片更新](#群成员名片更新)
 - [接收到离线文件](#接收到离线文件)
+- [群精华消息](#精华消息)
 
 </p>
 </details>
@@ -65,13 +72,13 @@ Type : `image`
 参数:
 
 | 参数名  | 可能的值        | 说明                                                                   |
-| ------- | --------------- | --------------------------------------------------------------- |
+| ------- | --------------- | ---------------------------------------------------------------------- |
 | `file`  | -               | 图片文件名                                                             |
 | `type`  | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片              |
 | `url`   | -               | 图片 URL                                                               |
 | `cache` | `0` `1`         | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1`        |
 | `id`    | -               | 发送秀图时的特效id，默认为40000                                        |
-| `c`     | `2` `3`         | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
+| `c`     | `2` `3`         | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
 
 可用的特效ID:
 
@@ -99,18 +106,67 @@ Type : `reply`
 参数:
 
 | 参数名 | 类型   | 说明                                                |
-| ------ | ---- | ------------------------------------- |
+| ------ | ------ | --------------------------------------------------- |
 | `id`   | int    | 回复时所引用的消息id, 必须为本群消息.               |
 | `text` | string | 自定义回复的信息                                    |
 | `qq`   | int64  | 自定义回复时的自定义QQ, 如果使用自定义信息必须指定. |
-| `time`   | int64  | 自定义回复时的时间, 格式为Unix时间 |
+| `time` | int64  | 可选. 自定义回复时的时间, 格式为Unix时间 |
+| `seq` | int64  | 起始消息序号, 可通过 `get_msg` 获得 |
 
 
 
 示例: `[CQ:reply,id=123456]` 
 \
-自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000]`
+自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000,seq=5123]`
 
+### 音乐分享 <Badge text="发"/>
+
+```json
+{
+    "type": "music",
+    "data": {
+        "type": "163",
+        "id": "28949129"
+    }
+}
+```
+
+```
+[CQ:music,type=163,id=28949129]
+```
+
+| 参数名 | 收  | 发  | 可能的值   | 说明                             |
+| ------ | --- | --- | ---------- | -------------------------------- |
+| `type` |     | ✓   | `qq` `163` | 分别表示使用 QQ 音乐、网易云音乐 |
+| `id`   |     | ✓   | -          | 歌曲 ID                          |
+
+### 音乐自定义分享 <Badge text="发"/>
+
+```json
+{
+    "type": "music",
+    "data": {
+        "type": "custom",
+        "url": "http://baidu.com",
+        "audio": "http://baidu.com/1.mp3",
+        "title": "音乐标题"
+    }
+}
+```
+
+```
+[CQ:music,type=custom,url=http://baidu.com,audio=http://baidu.com/1.mp3,title=音乐标题]
+```
+
+| 参数名    | 收  | 发  | 可能的值                 | 说明                                                  |
+| --------- | --- | --- | ------------------------ | ----------------------------------------------------- |
+| `type`    |     | ✓   | `custom`                 | 表示音乐自定义分享                                    |
+| `subtype` |     | ✓   | `qq,163,migu,kugou,kuwo` | 表示分享类型，不填写发送为xml卡片，推荐填写提高稳定性 |
+| `url`     |     | ✓   | -                        | 点击后跳转目标 URL                                    |
+| `audio`   |     | ✓   | -                        | 音乐 URL                                              |
+| `title`   |     | ✓   | -                        | 标题                                                  |
+| `content` |     | ✓   | -                        | 内容描述                                              |
+| `image`   |     | ✓   | -                        | 图片 URL                                              |
 
 ### 红包
 
@@ -189,7 +245,7 @@ Type: `forward`
 参数:
 
 | 参数名 | 类型   | 说明                                                          |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ------------------------------------------------------------- |
 | `id`   | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
 
 示例: `[CQ:forward,id=xxxx]`
@@ -203,13 +259,14 @@ Type: `node`
 参数:
 
 | 参数名    | 类型    | 说明           | 特殊说明                                                                               |
-| --------- | ------- | -------------- | ------------------------------------------------------------ |
+| --------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
 | `id`      | int32   | 转发消息id     | 直接引用他人的消息合并转发,  实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
 | `name`    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序)                  |
 | `uin`     | int64   | 发送者QQ号     | 用于自定义消息                                                                         |
 | `content` | message | 具体消息       | 用于自定义消息                                                                         |
+| `seq`     | message | 具体消息       | 用于自定义消息                                                                         |
 
-特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.  另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
+特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.  另外按 [CQHTTP](https://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
 示例: 
 
@@ -270,6 +327,7 @@ Type: `node`
             "name": "自定义发送者",
             "uin": "10086",
             "content": "我是自定义消息",
+            "seq": "5123",
             "time": "3376656000"
         }
     },
@@ -290,10 +348,10 @@ Type: `video`
 参数:
 
 | 参数名  | 类型    | 说明                                                                   |
-| ------- | ------ | ------------------------------------------------|
+| ------- | ------- | ---------------------------------------------------------------------- |
 | `file`  | string  | 支持http和file发送                                                     |
 | `cover` | string  | 视频封面，支持http，file和base64发送，格式必须为jpg                    |
-| `c`     | `2` `3`| 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
+| `c`     | `2` `3` | 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
 示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
 
 ### XML 消息
@@ -512,7 +570,7 @@ Type: `tts`
 
 响应示例
 
-````json
+````json5
 {
     "data": {
         "messages": [
@@ -530,7 +588,7 @@ Type: `tts`
                     "nickname": "发送者B",
                     "user_id": 10087
                 },
-                "time": 1595694393
+                "time": 1595694393 //  可选
             }
         ]
     },
@@ -548,7 +606,7 @@ Type: `tts`
 | 字段       | 类型           | 说明                         |
 | ---------- | -------------- | ---------------------------- |
 | `group_id` | int64          | 群号                         |
-| `messages` | forward node[] | 自定义转发消息, 具体看CQCode |
+| `messages` | forward node[] | 自定义转发消息, 具体看 [CQCode](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/cqhttp.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9) |
 
 响应数据
     
@@ -572,11 +630,63 @@ Type: `tts`
 | -------- | -------- | ---- |
 | `slices` | string[] | 词组 |
 
+### 设置精华消息
+
+终结点: `/set_essence_msg`
+
+**参数**
+
+| 字段         | 类型  | 说明   |
+| ------------ | ----- | ------ |
+| `message_id` | int32 | 消息ID |
+
+**响应数据**
+
+无
+
+### 移出精华消息
+
+终结点: `/delete_essence_msg`
+
+**参数**
+
+| 字段         | 类型  | 说明   |
+| ------------ | ----- | ------ |
+| `message_id` | int32 | 消息ID |
+
+**响应数据**
+
+无
+
+### 获取精华消息列表
+
+终结点: `/get_essence_msg_list`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `group_id` | int64 | 群号 |
+
+**响应数据**
+
+响应内容为 JSON 数组，每个元素如下：
+
+| 字段名          | 数据类型 | 说明         |
+| --------------- | -------- | ------------ |
+| `sender_id`     | int64    | 发送者QQ 号  |
+| `sender_nick`   | string   | 发送者昵称   |
+| `sender_time`   | int64    | 消息发送时间 |
+| `operator_id`   | int64    | 操作者QQ 号  |
+| `operator_nick` | string   | 操作者昵称   |
+| `operator_time` | int64    | 精华设置时间 |
+| `message_id`    | int32    | 消息ID       |
+
 ### 图片OCR
 
 > 注意: 目前图片OCR接口仅支持接受的图片
 
-终结点: `/.ocr_image` 
+终结点: `/ocr_image` 
 
 **参数** 
 
@@ -742,6 +852,22 @@ Type: `tts`
 | `creator_name`     | string | 创建者名字 |
 | `total_file_count` | int32  | 子文件数量 |
 
+### 上传群文件
+
+终结点: `/upload_group_file`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `group_id` | int64  | 群号                      |
+| `file`     | string |  本地文件路径       |
+| `name`     | string | 储存名称         |
+| `folder`   | string | 父目录ID           |
+
+> 在不提供 `folder` 参数的情况下默认上传到根目录
+> 只能上传本地文件, 需要上传 `http` 文件的话请先调用 `download_file` API下载
+
 ### 获取状态
 
 终结点: `/get_status`
@@ -780,13 +906,13 @@ Type: `tts`
 **参数** 
 
 | 字段       | 类型  | 说明 |
-| ---------- | ------ | ------------------------- |
+| ---------- | ----- | ---- |
 | `group_id` | int64 | 群号 |
 
 **响应数据**
 
 | 字段                            | 类型  | 说明                              |
-| ------------------------------- | ---------- | ------------------------------- |
+| ------------------------------- | ----- | --------------------------------- |
 | `can_at_all`                    | bool  | 是否可以@全体成员                 |
 | `remain_at_all_count_for_group` | int16 | 群内所有管理当天剩余@全体成员次数 |
 | `remain_at_all_count_for_uin`   | int16 | BOT当天剩余@全体成员次数          |
@@ -798,7 +924,7 @@ Type: `tts`
 **参数** 
 
 | 字段           | 类型            | 说明         |
-| ---------- | ------ | ------------------------- |
+| -------------- | --------------- | ------------ |
 | `url`          | string          | 链接地址     |
 | `thread_count` | int32           | 下载线程数   |
 | `headers`      | string or array | 自定义请求头 |
@@ -825,7 +951,7 @@ JSON数组:
 **响应数据**
 
 | 字段   | 类型   | 说明                 |
-| ---------- | ---------- | ------------ |
+| ------ | ------ | -------------------- |
 | `file` | string | 下载文件的*绝对路径* |
 
 > 通过这个API下载的文件能直接放入CQ码作为图片或语音发送
@@ -838,14 +964,14 @@ JSON数组:
 **参数** 
 
 | 字段          | 类型  | 说明                                |
-| ---------- | ------ | ------------------------- |
+| ------------- | ----- | ----------------------------------- |
 | `message_seq` | int64 | 起始消息序号, 可通过 `get_msg` 获得 |
 | `group_id`    | int64 | 群号                                |
 
 **响应数据**
 
 | 字段       | 类型      | 说明                       |
-| ---------- | ---------- | ------------ |
+| ---------- | --------- | -------------------------- |
 | `messages` | []Message | 从起始序号开始的前19条消息 |
 
 > 不提供起始序号将默认获取最新的消息
@@ -857,23 +983,39 @@ JSON数组:
 **参数** 
 
 | 字段       | 类型 | 说明         |
-| ---------- | ------ | ------------------------- |
+| ---------- | ---- | ------------ |
 | `no_cache` | bool | 是否无视缓存 |
 
 **响应数据**
 
 | 字段      | 类型     | 说明           |
-| ---------- | ---------- | ------------ |
+| --------- | -------- | -------------- |
 | `clients` | []Device | 在线客户端列表 |
 
 **Device**
 
 | 字段          | 类型   | 说明     |
-| ---------- | ---------- | ------------ |
+| ------------- | ------ | -------- |
 | `app_id`      | int64  | 客户端ID |
 | `device_name` | string | 设备名称 |
 | `device_kind` | string | 设备类型 |
 
+### 检查链接安全性
+
+终结点：`/check_url_safely`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `url` | string  | 需要检查的链接  |
+
+**响应数据**
+
+| 字段        | 类型       | 说明            |
+| ---------- | ---------- | ------------ |
+| `level`    | int       |  安全等级, 1: 安全 2: 未知 3: 危险  |
+
 ### 获取用户VIP信息
 
 终结点：`/_get_vip_info`
@@ -881,13 +1023,13 @@ JSON数组:
 **参数**
 
 | 字段名    | 数据类型 | 默认值 | 说明  |
-| ----- | ------- | ----- | --- |
+| --------- | -------- | ------ | ----- |
 | `user_id` | int64    |        | QQ 号 |
 
 **响应数据**
 
 | 字段               | 类型    | 说明         |
-| ------------------ | ------- | ---------- |
+| ------------------ | ------- | ------------ |
 | `user_id`          | int64   | QQ 号        |
 | `nickname`         | string  | 用户昵称     |
 | `level`            | int64   | QQ 等级      |
@@ -903,7 +1045,7 @@ JSON数组:
 **参数**
 
 | 字段名     | 数据类型 | 默认值 | 说明     |
-| ---------- | ------- | ----- | ------ |
+| ---------- | -------- | ------ | -------- |
 | `group_id` | int64    |        | 群号     |
 | `content`  | string   |        | 公告内容 |
 
@@ -947,7 +1089,7 @@ JSON数组:
 **事件数据**
 
 | 字段名        | 数据类型 | 可能的值 | 说明         |
-| ------------- | ------ | -------- | --- |
+| ------------- | -------- | -------- | ------------ |
 | `post_type`   | string   | `notice` | 上报类型     |
 | `notice_type` | string   | `notify` | 消息类型     |
 | `sub_type`    | string   | `poke`   | 提示类型     |
@@ -1043,8 +1185,21 @@ JSON数组:
 **上报数据**
 
 | 字段          | 类型   | 可能的值        | 说明         |
-| ------------- | ------ | -------------- | -------- |
+| ------------- | ------ | --------------- | ------------ |
 | `post_type`   | string | `notice`        | 上报类型     |
 | `notice_type` | string | `client_status` | 消息类型     |
 | `client`      | Device |                 | 客户端信息   |
 | `online`      | bool   |                 | 当前是否在线 |
+
+### 精华消息
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明                       |
+| ------------- | ------ | -------------- | -------------------------- |
+| `post_type`   | string | `notice`       | 上报类型                   |
+| `notice_type` | string | `essence`      | 消息类型                   |
+| `sub_type`    | string | `add`,`delete` | 添加为`add`,移出为`delete` |
+| `sender_id`   | int64  |                | 消息发送者ID               |
+| `operator_id` | int64  |                | 操作者ID                   |
+| `message_id`  | int32  |                | 消息ID                     |

global/codec.go

@@ -2,37 +2,21 @@ package global
 
 import (
 	"crypto/md5"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os/exec"
 	"path"
 
 	"github.com/Mrs4s/go-cqhttp/global/codec"
-	log "github.com/sirupsen/logrus"
+	"github.com/pkg/errors"
 )
 
-var useSilkCodec = true
+// EncoderSilk 将音频编码为Silk
-
-//InitCodec 初始化Silk编码器
-func InitCodec() {
-	log.Info("正在加载silk编码器...")
-	err := codec.Init()
-	if err != nil {
-		log.Error(err)
-		useSilkCodec = false
-	}
-}
-
-//EncoderSilk 将音频编码为Silk
 func EncoderSilk(data []byte) ([]byte, error) {
-	if !useSilkCodec {
-		return nil, errors.New("no silk encoder")
-	}
 	h := md5.New()
 	_, err := h.Write(data)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "calc md5 failed")
 	}
 	tempName := fmt.Sprintf("%x", h.Sum(nil))
 	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
@@ -40,24 +24,24 @@ func EncoderSilk(data []byte) ([]byte, error) {
 	}
 	slk, err := codec.EncodeToSilk(data, tempName, true)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "encode silk failed")
 	}
 	return slk, nil
 }
 
-//EncodeMP4 将给定视频文件编码为MP4
+// EncodeMP4 将给定视频文件编码为MP4
 func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
 	cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
 	err := cmd1.Run()
 	if err != nil {
 		cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst)
-		return cmd2.Run()
+		return errors.Wrap(cmd2.Run(), "convert mp4 failed")
 	}
 	return err
 }
 
-//ExtractCover 获取给定视频文件的Cover
+// ExtractCover 获取给定视频文件的Cover
 func ExtractCover(src string, target string) error {
 	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
-	return cmd.Run()
+	return errors.Wrap(cmd.Run(), "extract video cover failed")
 }

global/codec/codec.go

@@ -1,69 +1,30 @@
-// +build linux windows darwin
+// +build linux windows,!arm darwin,!arm64
 // +build 386 amd64 arm arm64
 
+// Package codec Slik编码核心模块
 package codec
 
 import (
-	"errors"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"os/exec"
 	"path"
-	"runtime"
+
+	"github.com/pkg/errors"
+	"github.com/wdvxdr1123/go-silk"
 )
 
 const (
 	silkCachePath = "data/cache"
-	encoderPath   = "codec"
 )
 
-func downloadCodec(url string) (err error) {
-	resp, err := http.Get(url)
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return
-	}
-	err = ioutil.WriteFile(getEncoderFilePath(), body, os.ModePerm)
-	return
-}
-
-func getEncoderFilePath() string {
-	encoderFile := path.Join(encoderPath, runtime.GOOS+"-"+runtime.GOARCH+"-encoder")
-	if runtime.GOOS == "windows" {
-		encoderFile = encoderFile + ".exe"
-	}
-	return encoderFile
-}
-
-//Init 下载Silk编码器
-func Init() error {
-	if !fileExist(silkCachePath) {
-		_ = os.MkdirAll(silkCachePath, os.ModePerm)
-	}
-	if !fileExist(encoderPath) {
-		_ = os.MkdirAll(encoderPath, os.ModePerm)
-	}
-	p := getEncoderFilePath()
-	if !fileExist(p) {
-		if err := downloadCodec("https://cdn.jsdelivr.net/gh/wdvxdr1123/tosilk/codec/" + runtime.GOOS + "-" + runtime.GOARCH + "-encoder"); err != nil {
-			return errors.New("下载依赖失败")
-		}
-	}
-	return nil
-}
-
 //EncodeToSilk 将音频编码为Silk
-func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
 	// 1. 写入缓存文件
 	rawPath := path.Join(silkCachePath, tempName+".wav")
-	err := ioutil.WriteFile(rawPath, record, os.ModePerm)
+	err = ioutil.WriteFile(rawPath, record, os.ModePerm)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "write temp file error")
 	}
 	defer os.Remove(rawPath)
 
@@ -71,27 +32,22 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error)
 	pcmPath := path.Join(silkCachePath, tempName+".pcm")
 	cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
 	if err = cmd.Run(); err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "convert pcm file error")
 	}
 	defer os.Remove(pcmPath)
 
 	// 3. 转silk
+	pcm, err := ioutil.ReadFile(pcmPath)
+	if err != nil {
+		return nil, errors.Wrap(err, "read pcm file err")
+	}
+	silkWav, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
+	if err != nil {
+		return nil, errors.Wrap(err, "silk encode error")
+	}
+	if useCache {
 		silkPath := path.Join(silkCachePath, tempName+".silk")
-	cmd = exec.Command(getEncoderFilePath(), pcmPath, silkPath, "-rate", "24000", "-quiet", "-tencent")
+		err = ioutil.WriteFile(silkPath, silkWav, 0666)
-	if err = cmd.Run(); err != nil {
-		return nil, err
 	}
-	if !useCache {
+	return
-		defer os.Remove(silkPath)
-	}
-	return ioutil.ReadFile(silkPath)
-}
-
-// FileExist 检查文件是否存在
-func fileExist(path string) bool {
-	if runtime.GOOS == "windows" {
-		path = path + ".exe"
-	}
-	_, err := os.Lstat(path)
-	return !os.IsNotExist(err)
 }

global/codec/codec_darwin_arm64.go

@@ -0,0 +1,8 @@
+package codec
+
+import "github.com/pkg/errors"
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}

global/codec/codec_unsupportedarch.go

@@ -1,15 +1,10 @@
-// +build !386,!arm64,!amd64,!arm
+// +build !arm,!arm64,!amd64,!386
 
 package codec
 
 import "errors"
 
-//Init 下载silk编码器
-func Init() error {
-	return errors.New("Unsupport arch now")
-}
-
 //EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
-	return nil, errors.New("Unsupport arch now")
+	return nil, errors.New("not supported now")
 }

global/codec/codec_unsupportedos.go

@@ -4,12 +4,7 @@ package codec
 
 import "errors"
 
-//Init 下载silk编码器
-func Init() error {
-	return errors.New("not support now")
-}
-
 //EncodeToSilk 将音频编码为Silk
 func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
-	return nil, errors.New("not support now")
+	return nil, errors.New("not supported now")
 }

global/codec/codec_windows_arm.go

@@ -0,0 +1,8 @@
+package codec
+
+import "errors"
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}

global/config.go

@@ -12,7 +12,7 @@ import (
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 
-//DefaultConfigWithComments 为go-cqhttp的默认配置文件
+// DefaultConfigWithComments 为go-cqhttp的默认配置文件
 var DefaultConfigWithComments = `
 /*
     go-cqhttp 默认配置文件
@@ -119,8 +119,8 @@ var DefaultConfigWithComments = `
     use_sso_address: false
     // 是否启用 DEBUG
     debug: false
-    // 日志等级
+    // 日志等级 trace,debug,info,warn,error
-    log_level: ""
+    log_level: "info"
     // WebUi 设置
     web_ui: {
         // 是否启用 WebUi
@@ -135,13 +135,17 @@ var DefaultConfigWithComments = `
 }
 `
 
-//JSONConfig Config对应的结构体
+// PasswordHash 存储QQ密码哈希供登录使用
+var PasswordHash [16]byte
+
+// JSONConfig Config对应的结构体
 type JSONConfig struct {
 	Uin               int64  `json:"uin"`
 	Password          string `json:"password"`
 	EncryptPassword   bool   `json:"encrypt_password"`
 	PasswordEncrypted string `json:"password_encrypted"`
 	EnableDB          bool   `json:"enable_db"`
+	EnableSelfMessage bool   `json:"enable_self_message"`
 	AccessToken       string `json:"access_token"`
 	ReLogin           struct {
 		Enabled         bool `json:"enabled"`
@@ -168,7 +172,7 @@ type JSONConfig struct {
 	WebUI               *GoCQWebUI                    `json:"web_ui"`
 }
 
-//CQHTTPAPIConfig HTTPAPI对应的Config结构体
+// CQHTTPAPIConfig HTTPAPI对应的Config结构体
 type CQHTTPAPIConfig struct {
 	Host                         string `json:"host"`
 	Port                         uint16 `json:"port"`
@@ -188,7 +192,7 @@ type CQHTTPAPIConfig struct {
 	PostMessageFormat            string `json:"post_message_format"`
 }
 
-//GoCQHTTPConfig 正向HTTP对应config结构体
+// GoCQHTTPConfig 正向HTTP对应config结构体
 type GoCQHTTPConfig struct {
 	Enabled  bool              `json:"enabled"`
 	Host     string            `json:"host"`
@@ -197,14 +201,14 @@ type GoCQHTTPConfig struct {
 	PostUrls map[string]string `json:"post_urls"`
 }
 
-//GoCQWebSocketConfig 正向WebSocket对应Config结构体
+// GoCQWebSocketConfig 正向WebSocket对应Config结构体
 type GoCQWebSocketConfig struct {
 	Enabled bool   `json:"enabled"`
 	Host    string `json:"host"`
 	Port    uint16 `json:"port"`
 }
 
-//GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
+// GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
 type GoCQReverseWebSocketConfig struct {
 	Enabled                  bool   `json:"enabled"`
 	ReverseURL               string `json:"reverse_url"`
@@ -213,7 +217,7 @@ type GoCQReverseWebSocketConfig struct {
 	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
 }
 
-//GoCQWebUI WebUI对应Config结构体
+// GoCQWebUI WebUI对应Config结构体
 type GoCQWebUI struct {
 	Enabled   bool   `json:"enabled"`
 	Host      string `json:"host"`
@@ -221,7 +225,7 @@ type GoCQWebUI struct {
 	WebInput  bool   `json:"web_input"`
 }
 
-//DefaultConfig 返回一份默认配置对应结构体
+// DefaultConfig 返回一份默认配置对应结构体
 func DefaultConfig() *JSONConfig {
 	return &JSONConfig{
 		EnableDB: true,
@@ -274,8 +278,8 @@ func DefaultConfig() *JSONConfig {
 	}
 }
 
-//Load 加载配置文件
+// LoadConfig 加载配置文件
-func Load(p string) *JSONConfig {
+func LoadConfig(p string) *JSONConfig {
 	if !PathExists(p) {
 		log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
 		return nil
@@ -296,7 +300,7 @@ func Load(p string) *JSONConfig {
 	return &c
 }
 
-//Save 写入配置文件至path
+// Save 写入配置文件至path
 func (c *JSONConfig) Save(path string) error {
 	data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
 		Eol:            "\n",

global/doc.go

@@ -0,0 +1,2 @@
+// Package global 包含文件下载,视频音频编码,本地文件缓存处理,消息过滤器,调用速率限制,gocq主配置等的相关函数与结构体
+package global

global/filter.go

@@ -10,14 +10,14 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-//MSG 消息Map
+// MSG 消息Map
 type MSG map[string]interface{}
 
-//Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
+// Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
 //
-//若所给key对应的值的类型是global.MSG,则返回此值
+// 若所给key对应的值的类型是global.MSG,则返回此值
 //
-//若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
+// 若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
 func (m MSG) Get(s string) MSG {
 	if v, ok := m[s]; ok {
 		if msg, ok := v.(MSG); ok {
@@ -25,19 +25,25 @@ func (m MSG) Get(s string) MSG {
 		}
 		return MSG{"__str__": v} // 用这个名字应该没问题吧
 	}
-	return MSG{}
+	return nil // 不存在为空
 }
 
-//String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
+// String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
 func (m MSG) String() string {
+	if m == nil {
+		return "" // 空 JSON
+	}
 	if str, ok := m["__str__"]; ok {
+		if str == nil {
+			return "" // 空 JSON
+		}
 		return fmt.Sprint(str)
 	}
 	str, _ := json.MarshalToString(m)
 	return str
 }
 
-//Filter 定义了一个消息上报过滤接口
+// Filter 定义了一个消息上报过滤接口
 type Filter interface {
 	Eval(payload MSG) bool
 }
@@ -47,7 +53,7 @@ type operationNode struct {
 	filter Filter
 }
 
-//NotOperator 定义了过滤器中Not操作符
+// NotOperator 定义了过滤器中Not操作符
 type NotOperator struct {
 	operand Filter
 }
@@ -61,12 +67,12 @@ func notOperatorConstruct(argument gjson.Result) *NotOperator {
 	return op
 }
 
-//Eval 对payload执行Not过滤
+// Eval 对payload执行Not过滤
 func (op *NotOperator) Eval(payload MSG) bool {
 	return !op.operand.Eval(payload)
 }
 
-//AndOperator 定义了过滤器中And操作符
+// AndOperator 定义了过滤器中And操作符
 type AndOperator struct {
 	operands []operationNode
 }
@@ -102,10 +108,10 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 	return op
 }
 
-//Eval 对payload执行And过滤
+// Eval 对payload执行And过滤
-func (andOperator *AndOperator) Eval(payload MSG) bool {
+func (op *AndOperator) Eval(payload MSG) bool {
 	res := true
-	for _, operand := range andOperator.operands {
+	for _, operand := range op.operands {
 
 		if len(operand.key) == 0 {
 			// is an operator
@@ -123,7 +129,7 @@ func (andOperator *AndOperator) Eval(payload MSG) bool {
 	return res
 }
 
-//OrOperator 定义了过滤器中Or操作符
+// OrOperator 定义了过滤器中Or操作符
 type OrOperator struct {
 	operands []Filter
 }
@@ -140,7 +146,7 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
 	return op
 }
 
-//Eval 对payload执行Or过滤
+// Eval 对payload执行Or过滤
 func (op *OrOperator) Eval(payload MSG) bool {
 	res := false
 	for _, operand := range op.operands {
@@ -152,7 +158,7 @@ func (op *OrOperator) Eval(payload MSG) bool {
 	return res
 }
 
-//EqualOperator 定义了过滤器中Equal操作符
+// EqualOperator 定义了过滤器中Equal操作符
 type EqualOperator struct {
 	operand string
 }
@@ -163,12 +169,12 @@ func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
 	return op
 }
 
-//Eval 对payload执行Equal过滤
+// Eval 对payload执行Equal过滤
 func (op *EqualOperator) Eval(payload MSG) bool {
 	return payload.String() == op.operand
 }
 
-//NotEqualOperator 定义了过滤器中NotEqual操作符
+// NotEqualOperator 定义了过滤器中NotEqual操作符
 type NotEqualOperator struct {
 	operand string
 }
@@ -179,12 +185,12 @@ func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
 	return op
 }
 
-//Eval 对payload执行NotEqual过滤
+// Eval 对payload执行NotEqual过滤
 func (op *NotEqualOperator) Eval(payload MSG) bool {
 	return !(payload.String() == op.operand)
 }
 
-//InOperator 定义了过滤器中In操作符
+// InOperator 定义了过滤器中In操作符
 type InOperator struct {
 	operandString string
 	operandArray  []string
@@ -207,7 +213,7 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
 	return op
 }
 
-//Eval 对payload执行In过滤
+// Eval 对payload执行In过滤
 func (op *InOperator) Eval(payload MSG) bool {
 	payloadStr := payload.String()
 	if op.operandArray != nil {
@@ -221,7 +227,7 @@ func (op *InOperator) Eval(payload MSG) bool {
 	return strings.Contains(op.operandString, payloadStr)
 }
 
-//ContainsOperator 定义了过滤器中Contains操作符
+// ContainsOperator 定义了过滤器中Contains操作符
 type ContainsOperator struct {
 	operand string
 }
@@ -235,12 +241,12 @@ func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
 	return op
 }
 
-//Eval 对payload执行Contains过滤
+// Eval 对payload执行Contains过滤
 func (op *ContainsOperator) Eval(payload MSG) bool {
 	return strings.Contains(payload.String(), op.operand)
 }
 
-//RegexOperator 定义了过滤器中Regex操作符
+// RegexOperator 定义了过滤器中Regex操作符
 type RegexOperator struct {
 	regex *regexp.Regexp
 }
@@ -254,13 +260,13 @@ func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
 	return op
 }
 
-//Eval 对payload执行RegexO过滤
+// Eval 对payload执行RegexO过滤
 func (op *RegexOperator) Eval(payload MSG) bool {
 	matched := op.regex.MatchString(payload.String())
 	return matched
 }
 
-//Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
+// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
 func Generate(opName string, argument gjson.Result) Filter {
 	switch opName {
 	case "not":
@@ -284,10 +290,10 @@ func Generate(opName string, argument gjson.Result) Filter {
 	}
 }
 
-//EventFilter 初始化一个nil过滤器
+// EventFilter 初始化一个nil过滤器
-var EventFilter Filter = nil
+var EventFilter Filter
 
-//BootFilter 启动事件过滤器
+// BootFilter 启动事件过滤器
 func BootFilter() {
 	defer func() {
 		if e := recover(); e != nil {

global/fs.go

@@ -27,36 +27,36 @@ import (
 )
 
 const (
-	//ImagePath go-cqhttp使用的图片缓存目录
+	// ImagePath go-cqhttp使用的图片缓存目录
 	ImagePath = "data/images"
-	//ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
+	// ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
 	ImagePathOld = "data/image"
-	//VoicePath go-cqhttp使用的语音缓存目录
+	// VoicePath go-cqhttp使用的语音缓存目录
 	VoicePath = "data/voices"
-	//VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
+	// VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
 	VoicePathOld = "data/record"
-	//VideoPath go-cqhttp使用的视频缓存目录
+	// VideoPath go-cqhttp使用的视频缓存目录
 	VideoPath = "data/videos"
-	//CachePath go-cqhttp使用的缓存目录
+	// CachePath go-cqhttp使用的缓存目录
 	CachePath = "data/cache"
 )
 
 var (
-	//ErrSyntax Path语法错误时返回的错误
+	// ErrSyntax Path语法错误时返回的错误
 	ErrSyntax = errors.New("syntax error")
-	//HeaderAmr AMR文件头
+	// HeaderAmr AMR文件头
 	HeaderAmr = []byte("#!AMR")
-	//HeaderSilk Silkv3文件头
+	// HeaderSilk Silkv3文件头
 	HeaderSilk = []byte("\x02#!SILK_V3")
 )
 
-//PathExists 判断给定path是否存在
+// PathExists 判断给定path是否存在
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
 	return err == nil || os.IsExist(err)
 }
 
-//ReadAllText 读取给定path对应文件，无法读取时返回空值
+// ReadAllText 读取给定path对应文件，无法读取时返回空值
 func ReadAllText(path string) string {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
@@ -66,25 +66,25 @@ func ReadAllText(path string) string {
 	return string(b)
 }
 
-//WriteAllText 将给定text写入给定path
+// WriteAllText 将给定text写入给定path
 func WriteAllText(path, text string) error {
 	return ioutil.WriteFile(path, []byte(text), 0644)
 }
 
-//Check 检测err是否为nil
+// Check 检测err是否为nil
 func Check(err error) {
 	if err != nil {
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
 
-//IsAMRorSILK 判断给定文件是否为Amr或Silk格式
+// IsAMRorSILK 判断给定文件是否为Amr或Silk格式
 func IsAMRorSILK(b []byte) bool {
 	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
 }
 
-//FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
+// FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
-//对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
+// 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
 func FindFile(file, cache, PATH string) (data []byte, err error) {
 	data, err = nil, ErrSyntax
 	if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") {
@@ -128,7 +128,7 @@ func FindFile(file, cache, PATH string) (data []byte, err error) {
 	return
 }
 
-//DelFile 删除一个给定path，并返回删除结果
+// DelFile 删除一个给定path，并返回删除结果
 func DelFile(path string) bool {
 	err := os.Remove(path)
 	if err != nil {
@@ -141,7 +141,7 @@ func DelFile(path string) bool {
 	return true
 }
 
-//ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
+// ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
 func ReadAddrFile(path string) []*net.TCPAddr {
 	d, err := ioutil.ReadFile(path)
 	if err != nil {
@@ -160,12 +160,12 @@ func ReadAddrFile(path string) []*net.TCPAddr {
 	return ret
 }
 
-//WriteCounter 写入量计算实例
+// WriteCounter 写入量计算实例
 type WriteCounter struct {
 	Total uint64
 }
 
-//Write 方法将写入的byte长度追加至写入的总长度Total中
+// Write 方法将写入的byte长度追加至写入的总长度Total中
 func (wc *WriteCounter) Write(p []byte) (int, error) {
 	n := len(p)
 	wc.Total += uint64(n)
@@ -173,13 +173,13 @@ func (wc *WriteCounter) Write(p []byte) (int, error) {
 	return n, nil
 }
 
-//PrintProgress 方法将打印当前的总写入量
+// PrintProgress 方法将打印当前的总写入量
 func (wc *WriteCounter) PrintProgress() {
 	fmt.Printf("\r%s", strings.Repeat(" ", 35))
 	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
 }
 
-//UpdateFromStream copy form getlantern/go-update
+// UpdateFromStream copy form getlantern/go-update
 func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
 	updatePath, err := osext.Executable()
 	if err != nil {

global/log_hook.go

@@ -0,0 +1,165 @@
+package global
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"reflect"
+	"sync"
+
+	"github.com/sirupsen/logrus"
+)
+
+// LocalHook logrus本地钩子
+type LocalHook struct {
+	lock      *sync.Mutex
+	levels    []logrus.Level   // hook级别
+	formatter logrus.Formatter // 格式
+	path      string           // 写入path
+	writer    io.Writer        // io
+}
+
+// Levels ref: logrus/hooks.go impl Hook interface
+func (hook *LocalHook) Levels() []logrus.Level {
+	if len(hook.levels) == 0 {
+		return logrus.AllLevels
+	}
+	return hook.levels
+}
+
+func (hook *LocalHook) ioWrite(entry *logrus.Entry) error {
+	log, err := hook.formatter.Format(entry)
+	if err != nil {
+		return err
+	}
+
+	_, err = hook.writer.Write(log)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
+	dir := filepath.Dir(hook.path)
+	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+		return err
+	}
+
+	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
+	if err != nil {
+		return err
+	}
+	defer fd.Close()
+
+	log, err := hook.formatter.Format(entry)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = fd.Write(log)
+	return err
+}
+
+// Fire ref: logrus/hooks.go impl Hook interface
+func (hook *LocalHook) Fire(entry *logrus.Entry) error {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+
+	if hook.writer != nil {
+		return hook.ioWrite(entry)
+	}
+
+	if hook.path != "" {
+		return hook.pathWrite(entry)
+	}
+
+	return nil
+}
+
+// SetFormatter 设置日志格式
+func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+
+	if formatter == nil {
+		// 用默认的
+		formatter = &logrus.TextFormatter{DisableColors: true}
+	} else {
+		switch f := formatter.(type) {
+		case *logrus.TextFormatter:
+			textFormatter := f
+			textFormatter.DisableColors = true
+		default:
+			// todo
+		}
+	}
+	logrus.SetFormatter(formatter)
+	hook.formatter = formatter
+}
+
+// SetWriter 设置Writer
+func (hook *LocalHook) SetWriter(writer io.Writer) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+	hook.writer = writer
+}
+
+// SetPath 设置日志写入路径
+func (hook *LocalHook) SetPath(path string) {
+	hook.lock.Lock()
+	defer hook.lock.Unlock()
+	hook.path = path
+}
+
+// NewLocalHook 初始化本地日志钩子实现
+func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
+	hook := &LocalHook{
+		lock: new(sync.Mutex),
+	}
+	hook.SetFormatter(formatter)
+	hook.levels = append(hook.levels, levels...)
+
+	switch arg := args.(type) {
+	case string:
+		hook.SetPath(arg)
+	case io.Writer:
+		hook.SetWriter(arg)
+	default:
+		panic(fmt.Sprintf("unsupported type: %v", reflect.TypeOf(args)))
+	}
+
+	return hook
+}
+
+// GetLogLevel 获取日志等级
+//
+// 可能的值有
+//
+// "trace","debug","info","warn","warn","error"
+func GetLogLevel(level string) []logrus.Level {
+	switch level {
+	case "trace":
+		return []logrus.Level{logrus.TraceLevel, logrus.DebugLevel,
+			logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
+	case "debug":
+		return []logrus.Level{logrus.DebugLevel, logrus.InfoLevel,
+			logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
+	case "info":
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
+	case "warn":
+		return []logrus.Level{logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
+	case "error":
+		return []logrus.Level{logrus.ErrorLevel, logrus.FatalLevel,
+			logrus.PanicLevel}
+	default:
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
+	}
+}

global/net.go

@@ -37,17 +37,17 @@ var (
 		},
 	}
 
-	//Proxy 存储Config.proxy_rewrite,用于设置代理
+	// Proxy 存储Config.proxy_rewrite,用于设置代理
 	Proxy string
 
-	//ErrOverSize 响应主体过大时返回此错误
+	// ErrOverSize 响应主体过大时返回此错误
 	ErrOverSize = errors.New("oversize")
 
-	//UserAgent HTTP请求时使用的UA
+	// UserAgent HTTP请求时使用的UA
 	UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
 )
 
-//GetBytes 对给定URL发送Get请求，返回响应主体
+// GetBytes 对给定URL发送Get请求，返回响应主体
 func GetBytes(url string) ([]byte, error) {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -73,7 +73,7 @@ func GetBytes(url string) ([]byte, error) {
 	return body, nil
 }
 
-//DownloadFile 将给定URL对应的文件下载至给定Path
+// DownloadFile 将给定URL对应的文件下载至给定Path
 func DownloadFile(url, path string, limit int64, headers map[string]string) error {
 	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
@@ -107,7 +107,7 @@ func DownloadFile(url, path string, limit int64, headers map[string]string) erro
 	return nil
 }
 
-//DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
+// DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
 func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
 	if threadCount < 2 {
 		return DownloadFile(url, path, limit, headers)
@@ -265,7 +265,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	return lastErr
 }
 
-//GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
+// GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
 func GetSliderTicket(raw, id string) (string, error) {
 	var rsp string
 	if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
@@ -281,7 +281,7 @@ func GetSliderTicket(raw, id string) (string, error) {
 	return g.Get("ticket").Str, nil
 }
 
-//QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
+// QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
 func QQMusicSongInfo(id string) (gjson.Result, error) {
 	d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
 	if err != nil {
@@ -290,7 +290,7 @@ func QQMusicSongInfo(id string) (gjson.Result, error) {
 	return gjson.ParseBytes(d).Get("songinfo.data"), nil
 }
 
-//NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
+// NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
 func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
 	d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
 	if err != nil {

global/param.go

@@ -21,15 +21,15 @@ var falseSet = map[string]struct{}{
 	"0":     {},
 }
 
-//EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
+// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
 //
-//支持的合法类型有
+// 支持的合法类型有
 //
-//type bool
+// type bool
 //
-//type gjson.True or gjson.False
+// type gjson.True or gjson.False
 //
-//type string "true","yes","1" or "false","no","0" (case insensitive)
+// type string "true","yes","1" or "false","no","0" (case insensitive)
 func EnsureBool(p interface{}, defaultVal bool) bool {
 	var str string
 	if b, ok := p.(bool); ok {
@@ -85,7 +85,7 @@ func VersionNameCompare(current, remote string) bool {
 	return len(cur) < len(re)
 }
 
-//SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
+// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
 func SplitURL(s string) []string {
 	reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
 	idx := reg.FindAllStringIndex(s, -1)

global/ratelimit.go

@@ -9,14 +9,14 @@ import (
 var limiter *rate.Limiter
 var limitEnable = false
 
-//RateLimit 执行API调用速率限制
+// RateLimit 执行API调用速率限制
 func RateLimit(ctx context.Context) {
 	if limitEnable {
 		_ = limiter.Wait(ctx)
 	}
 }
 
-//InitLimiter 初始化速率限制器
+// InitLimiter 初始化速率限制器
 func InitLimiter(frequency float64, bucketSize int) {
 	limitEnable = true
 	limiter = rate.NewLimiter(rate.Limit(frequency), bucketSize)

global/terminal/double_click.go

@@ -0,0 +1,7 @@
+// +build !windows
+
+package terminal
+
+func RunningByDoubleClick() bool {
+	return false
+}

global/terminal/double_click_windows.go

@@ -0,0 +1,23 @@
+// +build windows
+
+package terminal
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// RunningByDoubleClick 检查是否通过双击直接运行
+func RunningByDoubleClick() bool {
+	kernel32 := syscall.NewLazyDLL("kernel32.dll")
+	lp := kernel32.NewProc("GetConsoleProcessList")
+	if lp != nil {
+		var ids [2]uint32
+		var maxCount uint32 = 2
+		ret, _, _ := lp.Call(uintptr(unsafe.Pointer(&ids)), uintptr(maxCount))
+		if ret > 1 {
+			return false
+		}
+	}
+	return true
+}

go.mod

@@ -1,9 +1,9 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.15
+go 1.16
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a
+	github.com/Mrs4s/MiraiGo v0.0.0-20210302163721-39a33e4c4965
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
@@ -15,12 +15,14 @@ require (
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/sirupsen/logrus v1.7.0
 	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.7
+	github.com/tidwall/gjson v1.6.8
+	github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
 )

go.sum

@@ -1,7 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a h1:ov5QCDpZpsr+geKLVON7E63UqrpNF0oTiKuZwbKwEmo=
+github.com/Mrs4s/MiraiGo v0.0.0-20210302163721-39a33e4c4965 h1:zrm7q2Wnj82pqdbaF72es7SYm2aV4dlrwfvVcNoR4hc=
-github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a/go.mod h1:9V7DdSwpEfCKQNvLZhRnFJFkelTU0tPLfwR5l6UFF1Y=
+github.com/Mrs4s/MiraiGo v0.0.0-20210302163721-39a33e4c4965/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
 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=
@@ -84,8 +84,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
+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.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
@@ -94,12 +94,13 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.6.7 h1:Mb1M9HZCRWEcXQ8ieJo7auYyyiSux6w9XN3AdTpxJrE=
+github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
-github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
+github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
 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=
@@ -108,9 +109,13 @@ 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-20210207032612-169bbdf8861d h1:gJTKbjZtlMt/almOeFi/UpVtT3RHqRWscgEuDtnF5TU=
+github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d/go.mod h1:twOxzexmM2Il1ReUu1fB5tnUotOq/dp56xjk/ZHwb1I=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+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=
@@ -120,8 +125,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-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
+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-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
+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=
@@ -129,15 +136,19 @@ 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-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+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-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
 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=
@@ -171,5 +182,13 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+modernc.org/libc v1.7.6 h1:P0qDJAlSR6hSAuE8mQgz9eH/GzigfEd3IIn7HmTQgT0=
+modernc.org/libc v1.7.6/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
+modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=

main.go

@@ -2,9 +2,15 @@ package main
 
 import (
 	"bufio"
+	"crypto/aes"
 	"crypto/md5"
+	"crypto/sha1"
 	"encoding/base64"
+	"encoding/hex"
 	"fmt"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	easy "github.com/t-tomalak/logrus-easy-formatter"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -22,6 +28,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/server"
 	"github.com/guonaihong/gout"
 	"github.com/tidwall/gjson"
+	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/term"
 
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -29,43 +36,36 @@ import (
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	jsoniter "github.com/json-iterator/go"
-	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
-	"github.com/rifflock/lfshook"
 	log "github.com/sirupsen/logrus"
-	easy "github.com/t-tomalak/logrus-easy-formatter"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var conf *global.JSONConfig
+var isFastStart = false
 
 func init() {
-	log.SetFormatter(&easy.Formatter{
+	logFormatter := &easy.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05",
 		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
-	})
+	}
 	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
-	if err == nil {
+	if err != nil {
-		log.SetOutput(io.MultiWriter(os.Stderr, w))
+		log.Errorf("rotatelogs init err: %v", err)
+		panic(err)
 	}
-	if !global.PathExists(global.ImagePath) {
+
-		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
+	conf = getConfig()
-			log.Fatalf("创建图片缓存文件夹失败: %v", err)
+	if conf == nil {
-		}
+		os.Exit(1)
-	}
-	if !global.PathExists(global.VoicePath) {
-		if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
-			log.Fatalf("创建语音缓存文件夹失败: %v", err)
-		}
-	}
-	if !global.PathExists(global.VideoPath) {
-		if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
-			log.Fatalf("创建视频缓存文件夹失败: %v", err)
-		}
-	}
-	if !global.PathExists(global.CachePath) {
-		if err := os.MkdirAll(global.CachePath, 0755); err != nil {
-			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
 	}
+
+	// 在debug模式下,将在标准输出中打印当前执行行数
+	if conf.Debug {
+		log.SetReportCaller(true)
 	}
+
+	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
+
 	if global.PathExists("cqhttp.json") {
 		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
 		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
@@ -95,12 +95,36 @@ func init() {
 		}
 		_ = os.Remove("cqhttp.json")
 	}
+
+	if !global.PathExists(global.ImagePath) {
+		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
+			log.Fatalf("创建图片缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.VoicePath) {
+		if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
+			log.Fatalf("创建语音缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.VideoPath) {
+		if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
+			log.Fatalf("创建视频缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.CachePath) {
+		if err := os.MkdirAll(global.CachePath, 0755); err != nil {
+			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
+		}
+	}
 }
 
 func main() {
-
+	if terminal.RunningByDoubleClick() {
+		log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
+		log.Warning("将等待10s后启动")
+		time.Sleep(time.Second * 10)
+	}
 	var byteKey []byte
-	var isFastStart = false
 	arg := os.Args
 	if len(arg) > 1 {
 		for i := range arg {
@@ -122,93 +146,14 @@ func main() {
 		}
 	}
 
-	var conf *global.JSONConfig
-	if global.PathExists("config.json") {
-		conf = global.Load("config.json")
-		_ = conf.Save("config.hjson")
-		_ = os.Remove("config.json")
-	} else if os.Getenv("UIN") != "" {
-		log.Infof("将从环境变量加载配置.")
-		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
-		pwd := os.Getenv("PASS")
-		post := os.Getenv("HTTP_POST")
-		conf = &global.JSONConfig{
-			Uin:      uin,
-			Password: pwd,
-			HTTPConfig: &global.GoCQHTTPConfig{
-				Enabled:  true,
-				Host:     "0.0.0.0",
-				Port:     5700,
-				PostUrls: map[string]string{},
-			},
-			WSConfig: &global.GoCQWebSocketConfig{
-				Enabled: true,
-				Host:    "0.0.0.0",
-				Port:    6700,
-			},
-			PostMessageFormat: "string",
-			Debug:             os.Getenv("DEBUG") == "true",
-		}
-		if post != "" {
-			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
-		}
-	} else {
-		conf = global.Load("config.hjson")
-	}
-	if conf == nil {
-		err := global.WriteAllText("config.hjson", global.DefaultConfigWithComments)
-		if err != nil {
-			log.Fatalf("创建默认配置文件时出现错误: %v", err)
-			return
-		}
-		log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
-		time.Sleep(time.Second * 5)
-		return
-	}
 	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
 		log.Warnf("请修改 config.hjson 以添加账号密码.")
+		if !isFastStart {
 			time.Sleep(time.Second * 5)
+		}
 		return
 	}
 
-	// log classified by level
-	// Collect all records up to the specified level (default level: warn)
-	logLevel := conf.LogLevel
-	if logLevel != "" {
-		date := time.Now().Format("2006-01-02")
-		var logPathMap lfshook.PathMap
-		switch conf.LogLevel {
-		case "warn":
-			logPathMap = lfshook.PathMap{
-				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
-				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
-				log.FatalLevel: path.Join("logs", date+"-warn.log"),
-				log.PanicLevel: path.Join("logs", date+"-warn.log"),
-			}
-		case "error":
-			logPathMap = lfshook.PathMap{
-				log.ErrorLevel: path.Join("logs", date+"-error.log"),
-				log.FatalLevel: path.Join("logs", date+"-error.log"),
-				log.PanicLevel: path.Join("logs", date+"-error.log"),
-			}
-		default:
-			logPathMap = lfshook.PathMap{
-				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
-				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
-				log.FatalLevel: path.Join("logs", date+"-warn.log"),
-				log.PanicLevel: path.Join("logs", date+"-warn.log"),
-			}
-		}
-
-		log.AddHook(lfshook.NewHook(
-			logPathMap,
-			&easy.Formatter{
-				TimestampFormat: "2006-01-02 15:04:05",
-				LogFormat:       "[%time%] [%lvl%]: %msg% \n",
-			},
-		))
-	}
-
 	log.Info("当前版本:", coolq.Version)
 	if conf.Debug {
 		log.SetLevel(log.DebugLevel)
@@ -233,15 +178,11 @@ func main() {
 	}
 	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
 		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-		byteKey, _ := term.ReadPassword(int(os.Stdin.Fd()))
+		byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-		key := md5.Sum(byteKey)
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
-		if encrypted := EncryptPwd(conf.Password, key[:]); encrypted != "" {
 		conf.Password = ""
-			conf.PasswordEncrypted = encrypted
+		conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
 		_ = conf.Save("config.hjson")
-		} else {
-			log.Warnf("加密时出现问题.")
-		}
 	}
 	if conf.PasswordEncrypted != "" {
 		if len(byteKey) == 0 {
@@ -262,8 +203,25 @@ func main() {
 		} else {
 			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
 		}
-		key := md5.Sum(byteKey)
+
-		conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
+		// 升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
+		// 升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5
+		if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
+			password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
+			passwordHash := md5.Sum([]byte(password))
+			newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
+			conf.PasswordEncrypted = "AES:" + newPasswordHash
+			_ = conf.Save("config.hjson")
+			log.Debug("密码加密方案升级完成")
+		}
+
+		ph, err := PasswordHashDecrypt(conf.PasswordEncrypted[4:], byteKey)
+		if err != nil {
+			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+		}
+		copy(global.PasswordHash[:], ph)
+	} else {
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
 	}
 	if !isFastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
@@ -283,7 +241,7 @@ func main() {
 		}
 		return "未知"
 	}())
-	cli := client.NewClient(conf.Uin, conf.Password)
+	cli := client.NewClientMd5(conf.Uin, global.PasswordHash)
 	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
 		switch e.Type {
 		case "INFO":
@@ -340,27 +298,50 @@ func main() {
 	}
 }
 
-//EncryptPwd 通过给定key加密给定pwd
+// PasswordHashEncrypt 使用key加密给定passwordHash
-func EncryptPwd(pwd string, key []byte) string {
+func PasswordHashEncrypt(passwordHash []byte, key []byte) string {
-	tea := binary.NewTeaCipher(key)
+	if len(passwordHash) != 16 {
-	if tea == nil {
+		panic("密码加密参数错误")
-		return ""
 	}
-	return base64.StdEncoding.EncodeToString(tea.Encrypt([]byte(pwd)))
+
+	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
+
+	cipher, _ := aes.NewCipher(key)
+	result := make([]byte, 16)
+	cipher.Encrypt(result, passwordHash)
+
+	return hex.EncodeToString(result)
 }
 
-//DecryptPwd 通过给定key解密给定ePwd
+// PasswordHashDecrypt 使用key解密给定passwordHash
-func DecryptPwd(ePwd string, key []byte) string {
+func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, error) {
+	ciphertext, err := hex.DecodeString(encryptedPasswordHash)
+	if err != nil {
+		return nil, err
+	}
+
+	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
+
+	cipher, _ := aes.NewCipher(key)
+	result := make([]byte, 16)
+	cipher.Decrypt(result, ciphertext)
+
+	return result, nil
+}
+
+// OldPasswordDecrypt 使用key解密老password，仅供兼容使用
+func OldPasswordDecrypt(encryptedPassword string, key []byte) string {
 	defer func() {
 		if pan := recover(); pan != nil {
 			log.Fatalf("密码解密失败: %v", pan)
 		}
 	}()
-	encrypted, err := base64.StdEncoding.DecodeString(ePwd)
+	encKey := md5.Sum(key)
+	encrypted, err := base64.StdEncoding.DecodeString(encryptedPassword)
 	if err != nil {
 		panic(err)
 	}
-	tea := binary.NewTeaCipher(key)
+	tea := binary.NewTeaCipher(encKey[:])
 	if tea == nil {
 		panic("密钥错误")
 	}
@@ -491,3 +472,52 @@ func restart(Args []string) {
 	}
 	_ = cmd.Start()
 }
+
+func getConfig() *global.JSONConfig {
+	var conf *global.JSONConfig
+	if global.PathExists("config.json") {
+		conf = global.LoadConfig("config.json")
+		_ = conf.Save("config.hjson")
+		_ = os.Remove("config.json")
+	} else if os.Getenv("UIN") != "" {
+		log.Infof("将从环境变量加载配置.")
+		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
+		pwd := os.Getenv("PASS")
+		post := os.Getenv("HTTP_POST")
+		conf = &global.JSONConfig{
+			Uin:      uin,
+			Password: pwd,
+			HTTPConfig: &global.GoCQHTTPConfig{
+				Enabled:  true,
+				Host:     "0.0.0.0",
+				Port:     5700,
+				PostUrls: map[string]string{},
+			},
+			WSConfig: &global.GoCQWebSocketConfig{
+				Enabled: true,
+				Host:    "0.0.0.0",
+				Port:    6700,
+			},
+			PostMessageFormat: "string",
+			Debug:             os.Getenv("DEBUG") == "true",
+		}
+		if post != "" {
+			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
+		}
+	} else {
+		conf = global.LoadConfig("config.hjson")
+	}
+	if conf == nil {
+		err := global.WriteAllText("config.hjson", global.DefaultConfigWithComments)
+		if err != nil {
+			log.Fatalf("创建默认配置文件时出现错误: %v", err)
+			return nil
+		}
+		log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
+		if !isFastStart {
+			time.Sleep(time.Second * 5)
+		}
+		return nil
+	}
+	return conf
+}

server/api.go

@@ -0,0 +1,382 @@
+package server
+
+import (
+	"strings"
+	"time"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/tidwall/gjson"
+)
+
+type resultGetter interface {
+	Get(string) gjson.Result
+}
+
+type apiCaller struct {
+	bot *coolq.CQBot
+}
+
+func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetLoginInfo()
+}
+
+func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetFriendList()
+}
+
+func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupList(p.Get("no_cache").Bool())
+}
+
+func getGroupInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberInfo(
+		p.Get("group_id").Int(), p.Get("user_id").Int(),
+	)
+}
+func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
+	if p.Get("message_type").Str == "private" {
+		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("message_type").Str == "group" {
+		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("group_id").Int() != 0 {
+		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("user_id").Int() != 0 {
+		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
+	}
+	return coolq.MSG{}
+}
+
+func sendGroupMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
+}
+
+func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func deleteMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
+}
+
+func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	apr := true
+	if p.Get("approve").Exists() {
+		apr = p.Get("approve").Bool()
+	}
+	return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
+}
+
+func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	subType := p.Get("sub_type").Str
+	apr := true
+	if subType == "" {
+		subType = p.Get("type").Str
+	}
+	if p.Get("approve").Exists() {
+		apr = p.Get("approve").Bool()
+	}
+	return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
+}
+
+func setGroupCard(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
+}
+
+func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
+}
+
+func setGroupKick(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
+}
+
+func setGroupBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
+		if p.Get("duration").Exists() {
+			return uint32(p.Get("duration").Int())
+		}
+		return 1800
+	}())
+}
+
+func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
+		if p.Get("enable").Exists() {
+			return p.Get("enable").Bool()
+		}
+		return true
+	}())
+}
+
+func setGroupName(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
+}
+
+func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
+		if p.Get("enable").Exists() {
+			return p.Get("enable").Bool()
+		}
+		return true
+	}())
+}
+
+func sendGroupNotice(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
+}
+
+func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupLeave(p.Get("group_id").Int())
+}
+
+func getImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetImage(p.Get("file").Str)
+}
+
+func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	id := p.Get("message_id").Str
+	if id == "" {
+		id = p.Get("id").Str
+	}
+	return bot.CQGetForwardMessage(id)
+}
+
+func getMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetMessage(int32(p.Get("message_id").Int()))
+}
+
+func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	headers := map[string]string{}
+	headersToken := p.Get("headers")
+	if headersToken.IsArray() {
+		for _, sub := range headersToken.Array() {
+			str := strings.SplitN(sub.String(), "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	if headersToken.Type == gjson.String {
+		lines := strings.Split(headersToken.String(), "\r\n")
+		for _, sub := range lines {
+			str := strings.SplitN(sub, "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
+}
+
+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, p resultGetter) coolq.MSG {
+	var delay int64
+	delay = p.Get("delay").Int()
+	if delay < 0 {
+		delay = 0
+	}
+	defer func(delay int64) {
+		time.Sleep(time.Duration(delay) * time.Millisecond)
+		Restart <- struct{}{}
+	}(delay)
+	return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
+
+}
+
+func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendImage()
+}
+
+func canSendRecord(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendRecord()
+}
+
+func getStrangerInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetStrangerInfo(p.Get("user_id").Int())
+}
+
+func getStatus(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetStatus()
+}
+
+func getVersionInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetVersionInfo()
+}
+
+func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetGroupSystemMessages()
+}
+
+func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
+}
+
+func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
+}
+
+func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
+}
+
+func getGroupFileURL(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
+}
+
+func uploadGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
+}
+
+func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
+}
+
+func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetVipInfo(p.Get("user_id").Int())
+}
+
+func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQReloadEventFilter()
+}
+
+func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetAtAllRemain(p.Get("group_id").Int())
+}
+
+func ocrImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQOcrImage(p.Get("image").Str)
+}
+
+func getOnlineClients(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
+}
+
+func getWordSlices(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetWordSlices(p.Get("content").Str)
+}
+
+func setGroupPortrait(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
+}
+
+func setEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+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 {
+	return bot.CQCheckURLSafely(p.Get("url").String())
+}
+
+func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	obj := p.Get("anonymous")
+	flag := p.Get("anonymous_flag")
+	if !flag.Exists() {
+		flag = p.Get("flag")
+	}
+	if !flag.Exists() && !obj.Exists() {
+		return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
+	}
+	if !flag.Exists() {
+		flag = obj.Get("flag")
+	}
+	return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
+}
+
+func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
+}
+
+var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
+	"get_login_info":             getLoginInfo,
+	"get_friend_list":            getFriendList,
+	"get_group_list":             getGroupList,
+	"get_group_info":             getGroupInfo,
+	"get_group_member_list":      getGroupMemberList,
+	"get_group_member_info":      getGroupMemberInfo,
+	"send_msg":                   sendMSG,
+	"send_group_msg":             sendGroupMSG,
+	"send_group_forward_msg":     sendGroupForwardMSG,
+	"send_private_msg":           sendPrivateMSG,
+	"delete_msg":                 deleteMSG,
+	"set_friend_add_request":     setFriendAddRequest,
+	"set_group_add_request":      setGroupAddRequest,
+	"set_group_card":             setGroupCard,
+	"set_group_special_title":    setGroupSpecialTitle,
+	"set_group_kick":             setGroupKick,
+	"set_group_ban":              setGroupBan,
+	"set_group_whole_ban":        setGroupWholeBan,
+	"set_group_name":             setGroupName,
+	"set_group_admin":            setGroupAdmin,
+	"_send_group_notice":         sendGroupNotice,
+	"set_group_leave":            setGroupLeave,
+	"get_image":                  getImage,
+	"get_forward_msg":            getForwardMSG,
+	"get_msg":                    getMSG,
+	"download_file":              downloadFile,
+	"get_group_honor_info":       getGroupHonorInfo,
+	"set_restart":                setRestart,
+	"can_send_image":             canSendImage,
+	"can_send_record":            canSendRecord,
+	"get_stranger_info":          getStrangerInfo,
+	"get_status":                 getStatus,
+	"get_version_info":           getVersionInfo,
+	"get_group_system_msg":       getGroupSystemMSG,
+	"get_group_file_system_info": getGroupFileSystemInfo,
+	"get_group_root_files":       getGroupRootFiles,
+	"get_group_files_by_folder":  getGroupFilesByFolder,
+	"get_group_file_url":         getGroupFileURL,
+	"upload_group_file":          uploadGroupFile,
+	"get_group_msg_history":      getGroupMsgHistory,
+	"_get_vip_info":              getVipInfo,
+	"reload_event_filter":        reloadEventFilter,
+	".ocr_image":                 ocrImage,
+	"ocr_image":                  ocrImage,
+	"get_group_at_all_remain":    getGroupAtAllRemain,
+	"get_online_clients":         getOnlineClients,
+	".get_word_slices":           getWordSlices,
+	"set_group_portrait":         setGroupPortrait,
+	"set_essence_msg":            setEssenceMSG,
+	"delete_essence_msg":         deleteEssenceMSG,
+	"get_essence_msg_list":       getEssenceMsgList,
+	"check_url_safely":           checkUrlSafely,
+	"set_group_anonymous_ban":    setGroupAnonymousBan,
+	".handle_quick_operation":    handleQuickOperation,
+}
+
+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不存在")
+	}
+}

server/apiAdmin.go

@@ -30,12 +30,16 @@ import (
 
 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 {
@@ -46,23 +50,25 @@ type webServer struct {
 	Console *bufio.Reader
 }
 
+// WebServer Admin子站的Server
 var WebServer = &webServer{}
 
-// admin 子站的 路由映射
+// APIAdminRoutingTable Admin子站的路由映射
-var HttpuriAdmin = map[string]func(s *webServer, c *gin.Context){
+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_http":     AdminDoConfigHTTP,      //修改config.json的http部分
-	"do_config_ws":       AdminDoConfigWs,      //修改config.json的正向ws部分
+	"do_config_ws":       AdminDoConfigWS,        //修改config.json的正向ws部分
-	"do_config_reverse":  AdminDoConfigReverse, //修改config.json 中的反向ws部分
+	"do_config_reverse":  AdminDoConfigReverseWS, //修改config.json 中的反向ws部分
-	"do_config_json":     AdminDoConfigJson,    //直接修改 config.json配置
+	"do_config_json":     AdminDoConfigJSON,      //直接修改 config.json配置
-	"get_config_json":    AdminGetConfigJson,   //拉取 当前的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}
 }
@@ -76,11 +82,11 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 
 	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)
@@ -98,7 +104,7 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 				os.Exit(1)
 			}
 		} else {
-			//关闭端口监听
+			// 关闭端口监听
 			c := make(chan os.Signal, 1)
 			signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 			<-c
@@ -107,241 +113,266 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 	}()
 	s.Dologin()
 	s.UpServer()
-	b := s.bot //外部引入 bot对象，用于操作bot
+	b := s.bot // 外部引入 bot对象，用于操作bot
 	return b
 }
 
-func (s *webServer) Dologin() {
+// 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
 	}
-	conf := GetConf()
+
-	cli := s.Cli
+	if s.Cli.Online {
-	cli.AllowSlider = true
+		log.Warn("Bot已登录")
-	rsp, err := cli.Login()
+		return
-	count := 0
+	}
-	for {
+
-		global.Check(err)
+	var times uint = 1 // 重试次数
+	for res, err := s.Cli.Login(); ; res, err = s.Cli.Login() {
+
 		var text string
-		if !rsp.Success {
+		count := 0
-			switch rsp.Error {
+
+		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 <-")
-				log.Warn("请输入(1 - 3): ")
+			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.", rsp.VerifyUrl)
+				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()
-					rsp, err = cli.SubmitTicket(strings.TrimSpace(text))
+				}
-					continue
+				res, err = s.Cli.SubmitTicket(strings.TrimSpace(text))
+				goto Again
 			}
 			if strings.Contains(text, "3") {
-					cli.AllowSlider = false
+				s.Cli.AllowSlider = false
-					cli.Disconnect()
+				s.Cli.Disconnect()
-					rsp, err = cli.Login()
 				continue
 			}
 			id := utils.RandomStringRange(6, "0123456789")
 			log.Warnf("滑块ID为 %v 请在30S内处理.", id)
-				ticket, err := global.GetSliderTicket(rsp.VerifyUrl, id)
+			ticket, err := global.GetSliderTicket(res.VerifyUrl, id)
 			if err != nil {
 				log.Warnf("错误: " + err.Error())
 				os.Exit(0)
 			}
-				rsp, err = cli.SubmitTicket(ticket)
+			res, err = s.Cli.SubmitTicket(ticket)
 			if err != nil {
 				log.Warnf("错误: " + err.Error())
-					os.Exit(0)
+				continue // 尝试重新登录
 			}
-				continue
+			goto Again
 		case client.NeedCaptcha:
-				_ = ioutil.WriteFile("captcha.jpg", rsp.CaptchaImage, 0644)
+			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
-				img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
+			img, _, _ := image.Decode(bytes.NewReader(res.CaptchaImage))
 			fmt.Println(asciiart.New("image", img).Art)
-				if conf.WebUI != nil && conf.WebUI.WebInput {
+			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-					log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", conf.WebUI.Host, conf.WebUI.WebUIPort)
+				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()
 			}
-				rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign)
 			global.DelFile("captcha.jpg")
-				continue
+			res, err = s.Cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), res.CaptchaSign)
+			goto Again
 		case client.SMSNeededError:
-				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", rsp.SMSPhone)
+			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
+				log.Warnf("账号已开启设备锁, 已向手机 %v 发送短信验证码.", res.SMSPhone)
+			} else {
+				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
 				readLine()
-				if !cli.RequestSMS() {
+			}
+			if !s.Cli.RequestSMS() {
 				log.Warnf("发送验证码失败，可能是请求过于频繁.")
 				time.Sleep(time.Second * 5)
-					os.Exit(0)
+				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()
-				rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
+			}
-				continue
+			res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
+			goto Again
 		case client.SMSOrVerifyNeededError:
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
-				log.Warnf("1. 向手机 %v 发送短信验证码", rsp.SMSPhone)
+			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
-				log.Warn("请输入(1 - 2): ")
+			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 !cli.RequestSMS() {
+				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()
-					rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
-					continue
 				}
-				log.Warnf("请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
+				res, err = s.Cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
+				goto Again
+			}
+			log.Warnf("请前往 -> %v <- 验证.", res.VerifyUrl)
 			log.Infof("按 Enter 继续....")
 			readLine()
-				os.Exit(0)
+			continue
-				return
 		case client.UnsafeDeviceError:
-				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
+			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证.", res.VerifyUrl)
-				if conf.WebUI != nil && conf.WebUI.WebInput {
+			if s.Conf.WebUI != nil && s.Conf.WebUI.WebInput {
-					log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", conf.WebUI.Host, conf.WebUI.WebUIPort)
+				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)
-				os.Exit(0)
+			continue
-				return
 		case client.OtherLoginError, client.UnknownLoginError:
-				msg := rsp.ErrorMessage
+			msg := res.ErrorMessage
 			if strings.Contains(msg, "版本") {
 				msg = "密码错误或账号被冻结"
 			}
 			if strings.Contains(msg, "上网环境") && count < 5 {
-					cli.Disconnect()
+				s.Cli.Disconnect()
-					rsp, err = cli.Login()
-					count++
 				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
 		}
-		break
 	}
-	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
+	if relogin {
-	time.Sleep(time.Second)
+		log.Info("重连成功")
+	}
+}
+
+// Dologin 主程序登录
+func (s *webServer) Dologin() {
+
+	s.Cli.AllowSlider = true
+	s.logincore(false)
+	log.Infof("登录成功 欢迎使用: %v", s.Cli.Nickname)
 	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList())
+	global.Check(s.Cli.ReloadFriendList())
-	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
+	log.Infof("共加载 %v 个好友.", len(s.Cli.FriendList))
 	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList())
+	global.Check(s.Cli.ReloadGroupList())
-	log.Infof("共加载 %v 个群.", len(cli.GroupList))
+	log.Infof("共加载 %v 个群.", len(s.Cli.GroupList))
-	s.bot = coolq.NewQQBot(cli, conf)
+	s.bot = coolq.NewQQBot(s.Cli, s.Conf)
-	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
+	if s.Conf.PostMessageFormat != "string" && s.Conf.PostMessageFormat != "array" {
 		log.Warnf("post_message_format 配置错误, 将自动使用 string")
 		coolq.SetMessageFormat("string")
 	} else {
-		coolq.SetMessageFormat(conf.PostMessageFormat)
+		coolq.SetMessageFormat(s.Conf.PostMessageFormat)
 	}
-	if conf.RateLimit.Enabled {
+	if s.Conf.RateLimit.Enabled {
-		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+		global.InitLimiter(s.Conf.RateLimit.Frequency, s.Conf.RateLimit.BucketSize)
 	}
 	log.Info("正在加载事件过滤器.")
 	global.BootFilter()
-	global.InitCodec()
+	coolq.IgnoreInvalidCQCode = s.Conf.IgnoreInvalidCQCode
-	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
+	coolq.SplitURL = s.Conf.FixURL
-	coolq.SplitUrl = conf.FixURL
+	coolq.ForceFragmented = s.Conf.ForceFragmented
-	coolq.ForceFragmented = conf.ForceFragmented
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
-	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
+
-		if conf.ReLogin.Enabled {
+	s.Cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
-			conf.ReLogin.Enabled = false
+		if !s.Conf.ReLogin.Enabled {
-			defer func() { conf.ReLogin.Enabled = true }()
-			var times uint = 1
-			for {
-				if cli.Online {
-					log.Warn("Bot已登录")
 			return
 		}
-				if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
+		log.Warnf("Bot已离线 (%v)，尝试重连", e.Message)
-					break
+		s.logincore(true)
-				}
-				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
-					e.Message, conf.ReLogin.ReLoginDelay, times)
-				times++
-				time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
-				rsp, err := cli.Login()
-				if err != nil {
-					log.Errorf("重连失败: %v", err)
-					cli.Disconnect()
-					continue
-				}
-				if !rsp.Success {
-					switch rsp.Error {
-					case client.NeedCaptcha:
-						log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)")
-					case client.UnsafeDeviceError:
-						log.Fatalf("重连失败: 设备锁")
-					default:
-						log.Errorf("重连失败: %v", rsp.ErrorMessage)
-						if strings.Contains(rsp.ErrorMessage, "冻结") {
-							log.Fatalf("账号被冻结, 放弃重连")
-						}
-						cli.Disconnect()
-						continue
-					}
-				}
-				log.Info("重连成功")
-				return
-			}
-			log.Fatal("重连失败: 重连次数达到设置的上限值")
-		}
-		s.bot.Release()
-		log.Fatalf("Bot已离线：%v", e.Message)
 	})
 }
 
 func (s *webServer) admin(c *gin.Context) {
 	action := c.Param("action")
 	log.Debugf("WebServer接收到cgi调用: %v", action)
-	if f, ok := HttpuriAdmin[action]; ok {
+	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.Load("config.hjson")
+	conf := global.LoadConfig("config.hjson")
 	return conf
 }
 
-// admin 控制器 登录验证
+// 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")
@@ -429,14 +460,15 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 	})
 	s.Cli = cli
 	s.Dologin()
-	//关闭之前的 server
+	// 关闭之前的 server
 	if OldConf.HTTPConfig != nil && OldConf.HTTPConfig.Enabled {
-		HttpServer.ShutDown()
+		cqHTTPServer.ShutDown()
 	}
-	//if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
+	// if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
 	// 	server.WsShutdown()
-	//}
+	// }
-	//s.UpServer()
+	// s.UpServer()
+
 	s.ReloadServer()
 	s.Conf = conf
 }
@@ -444,9 +476,9 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 func (s *webServer) UpServer() {
 	conf := GetConf()
 	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
-		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
+		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)
+			newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
 		}
 	}
 	if conf.WSConfig != nil && conf.WSConfig.Enabled {
@@ -461,9 +493,9 @@ func (s *webServer) UpServer() {
 func (s *webServer) ReloadServer() {
 	conf := GetConf()
 	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
-		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
+		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)
+			newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
 		}
 	}
 	for _, rc := range conf.ReverseServers {
@@ -471,7 +503,7 @@ func (s *webServer) ReloadServer() {
 	}
 }
 
-// 热重启
+// AdminDoRestart 热重启
 func AdminDoRestart(s *webServer, c *gin.Context) {
 	s.bot.Release()
 	s.bot = nil
@@ -480,19 +512,19 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
 	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{}))
 }
 
-// web输入 html 页面
+// AdminWebWrite web输入html页面
 func AdminWebWrite(s *webServer, c *gin.Context) {
 	pic := global.ReadAllText("captcha.jpg")
 	var picbase64 string
@@ -509,14 +541,14 @@ func AdminWebWrite(s *webServer, c *gin.Context) {
 	}))
 }
 
-// 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)
@@ -536,8 +568,8 @@ func AdminDoConfigBase(s *webServer, c *gin.Context) {
 	}
 }
 
-// http配置修改
+// AdminDoConfigHTTP HTTP配置修改
-func AdminDoConfigHttp(s *webServer, c *gin.Context) {
+func AdminDoConfigHTTP(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
 	conf.HTTPConfig.Port = uint16(p)
@@ -561,8 +593,8 @@ func AdminDoConfigHttp(s *webServer, c *gin.Context) {
 	}
 }
 
-// ws配置修改
+// AdminDoConfigWS ws配置修改
-func AdminDoConfigWs(s *webServer, c *gin.Context) {
+func AdminDoConfigWS(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
 	conf.WSConfig.Port = uint16(p)
@@ -581,8 +613,8 @@ func AdminDoConfigWs(s *webServer, c *gin.Context) {
 	}
 }
 
-// 反向ws配置修改
+// AdminDoConfigReverseWS 反向ws配置修改
-func AdminDoConfigReverse(s *webServer, c *gin.Context) {
+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")
@@ -603,11 +635,11 @@ func AdminDoConfigReverse(s *webServer, c *gin.Context) {
 	}
 }
 
-// config.json配置修改
+// AdminDoConfigJSON config.hjson配置修改
-func AdminDoConfigJson(s *webServer, c *gin.Context) {
+func AdminDoConfigJSON(s *webServer, c *gin.Context) {
 	conf := GetConf()
-	Json := c.PostForm("json")
+	JSON := c.PostForm("json")
-	err := json.Unmarshal([]byte(Json), &conf)
+	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)))
@@ -622,8 +654,8 @@ func AdminDoConfigJson(s *webServer, c *gin.Context) {
 	}
 }
 
-// 拉取config.json配置
+// AdminGetConfigJSON 拉取config.hjson配置
-func AdminGetConfigJson(s *webServer, c *gin.Context) {
+func AdminGetConfigJSON(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	c.JSON(200, coolq.OK(coolq.MSG{"config": conf}))
 

server/doc.go

@@ -0,0 +1,2 @@
+// Package server 包含Admin子站,HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
+package server

server/http.go

@@ -7,16 +7,14 @@ import (
 	"encoding/hex"
 	"net/http"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/guonaihong/gout/dataflow"
-
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
+	"github.com/guonaihong/gout/dataflow"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
@@ -24,7 +22,8 @@ import (
 type httpServer struct {
 	engine *gin.Engine
 	bot    *coolq.CQBot
-	Http   *http.Server
+	HTTP   *http.Server
+	api    apiCaller
 }
 
 type httpClient struct {
@@ -34,13 +33,20 @@ type httpClient struct {
 	timeout int32
 }
 
-var HttpServer = &httpServer{}
+type httpContext struct {
+	ctx *gin.Context
+}
+
+var cqHTTPServer = &httpServer{}
+
+// Debug 是否启用Debug模式
 var Debug = false
 
 func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	gin.SetMode(gin.ReleaseMode)
 	s.engine = gin.New()
 	s.bot = bot
+	s.api = apiCaller{s.bot}
 	s.engine.Use(func(c *gin.Context) {
 		if c.Request.Method != "GET" && c.Request.Method != "POST" {
 			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
@@ -84,11 +90,11 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		s.Http = &http.Server{
+		s.HTTP = &http.Server{
 			Addr:    addr,
 			Handler: s.engine,
 		}
-		if err := s.Http.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
 			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
 			log.Warnf("将在五秒后退出.")
@@ -98,7 +104,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	}()
 }
 
-func NewHttpClient() *httpClient {
+func newHTTPClient() *httpClient {
 	return &httpClient{}
 }
 
@@ -123,7 +129,7 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 		}
 		if c.secret != "" {
 			mac := hmac.New(sha1.New, []byte(c.secret))
-			_, err := mac.Write([]byte(m.ToJson()))
+			_, err := mac.Write([]byte(m.ToJSON()))
 			if err != nil {
 				log.Error(err)
 				return nil
@@ -141,12 +147,12 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 			return nil
 		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJSON(), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %v 到 %v", m.ToJson(), c.addr)
+	log.Debugf("上报Event数据 %v 到 %v", m.ToJSON(), c.addr)
 	if gjson.Valid(res) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJson()), gjson.Parse(res))
+		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJSON()), gjson.Parse(res))
 	}
 }
 
@@ -154,442 +160,35 @@ func (s *httpServer) HandleActions(c *gin.Context) {
 	global.RateLimit(context.Background())
 	action := strings.ReplaceAll(c.Param("action"), "_async", "")
 	log.Debugf("HTTPServer接收到API调用: %v", action)
-	if f, ok := httpApi[action]; ok {
+	c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))
-		f(s, c)
-	} else {
-		c.JSON(200, coolq.Failed(404))
-	}
 }
 
-func GetLoginInfo(s *httpServer, c *gin.Context) {
+func (h httpContext) Get(k string) gjson.Result {
-	c.JSON(200, s.bot.CQGetLoginInfo())
+	c := h.ctx
-}
-
-func GetFriendList(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetFriendList())
-}
-
-func GetGroupList(s *httpServer, c *gin.Context) {
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
-}
-
-func GetGroupInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupInfo(gid, nc == "true"))
-}
-
-func GetGroupMemberList(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
-}
-
-func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
-}
-
-func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
-}
-
-func GetGroupRootFiles(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
-}
-
-func GetGroupFilesByFolderId(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	folderId := getParam(c, "folder_id")
-	c.JSON(200, s.bot.CQGetGroupFilesByFolderId(gid, folderId))
-}
-
-func GetGroupFileUrl(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	fid := getParam(c, "file_id")
-	busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
-	c.JSON(200, s.bot.CQGetGroupFileUrl(gid, fid, int32(busid)))
-}
-
-func SendMessage(s *httpServer, c *gin.Context) {
-	if getParam(c, "message_type") == "private" {
-		SendPrivateMessage(s, c)
-		return
-	}
-	if getParam(c, "message_type") == "group" {
-		SendGroupMessage(s, c)
-		return
-	}
-	if getParam(c, "group_id") != "" {
-		SendGroupMessage(s, c)
-		return
-	}
-	if getParam(c, "user_id") != "" {
-		SendPrivateMessage(s, c)
-	}
-}
-
-func SendPrivateMessage(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
-}
-
-func SendGroupMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
-}
-
-func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg := getParam(c, "messages")
-	c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
-}
-
-func GetImage(s *httpServer, c *gin.Context) {
-	file := getParam(c, "file")
-	c.JSON(200, s.bot.CQGetImage(file))
-}
-
-func GetMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQGetMessage(int32(mid)))
-}
-
-func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
-}
-
-func ProcessFriendRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
-}
-
-func ProcessGroupRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	subType := getParam(c, "sub_type")
-	if subType == "" {
-		subType = getParam(c, "type")
-	}
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
-}
-
-func SetGroupCard(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
-}
-
-func SetSpecialTitle(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
-}
-
-func SetGroupKick(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg := getParam(c, "message")
-	block := getParamOrDefault(c, "reject_add_request", "false")
-	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg, block == "true"))
-}
-
-func SetGroupBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
-}
-
-func SetWholeBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-func SetGroupName(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
-}
-
-func SetGroupAdmin(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-func SendGroupNotice(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
-}
-
-func SetGroupLeave(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupLeave(gid))
-}
-
-func SetRestart(s *httpServer, c *gin.Context) {
-	delay, _ := strconv.ParseInt(getParam(c, "delay"), 10, 64)
-	c.JSON(200, coolq.MSG{"data": nil, "retcode": 0, "status": "async"})
-	go func(delay int64) {
-		time.Sleep(time.Duration(delay) * time.Millisecond)
-		Restart <- struct{}{}
-	}(delay)
-
-}
-
-func GetForwardMessage(s *httpServer, c *gin.Context) {
-	resId := getParam(c, "message_id")
-	if resId == "" {
-		resId = getParam(c, "id")
-	}
-	c.JSON(200, s.bot.CQGetForwardMessage(resId))
-}
-
-func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetGroupSystemMessages())
-}
-
-func DeleteMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
-}
-
-func CanSendImage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendImage())
-}
-
-func CanSendRecord(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendRecord())
-}
-
-func GetStatus(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetStatus())
-}
-
-func GetVersionInfo(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetVersionInfo())
-}
-
-func ReloadEventFilter(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQReloadEventFilter())
-}
-
-func GetVipInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetVipInfo(uid))
-}
-
-func GetStrangerInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
-}
-
-func GetGroupAtAllRemain(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetAtAllRemain(gid))
-}
-
-func SetGroupAnonymousBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	d, _ := strconv.ParseInt(getParam(c, "duration"), 10, 64)
-	flag := getParam(c, "flag")
-	if flag == "" {
-		flag = getParam(c, "anonymous_flag")
-	}
-	if flag == "" {
-		o := gjson.Parse(getParam(c, "anonymous"))
-		flag = o.Get("flag").String()
-	}
-	c.JSON(200, s.bot.CQSetGroupAnonymousBan(gid, flag, int32(d)))
-}
-
-func GetGroupMessageHistory(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	seq, _ := strconv.ParseInt(getParam(c, "message_seq"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMessageHistory(gid, seq))
-}
-
-func GetOnlineClients(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetOnlineClients(getParamOrDefault(c, "no_cache", "false") == "true"))
-}
-
-func HandleQuickOperation(s *httpServer, c *gin.Context) {
-	if c.Request.Method != "POST" {
-		c.AbortWithStatus(404)
-		return
-	}
-	if i, ok := c.Get("json_body"); ok {
-		body := i.(gjson.Result)
-		c.JSON(200, s.bot.CQHandleQuickOperation(body.Get("context"), body.Get("operation")))
-	}
-}
-
-func DownloadFile(s *httpServer, c *gin.Context) {
-	url := getParam(c, "url")
-	tc, _ := strconv.Atoi(getParam(c, "thread_count"))
-	h, t := getParamWithType(c, "headers")
-	headers := map[string]string{}
-	if t == gjson.Null || t == gjson.String {
-		lines := strings.Split(h, "\r\n")
-		for _, sub := range lines {
-			str := strings.SplitN(sub, "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	if t == gjson.JSON {
-		arr := gjson.Parse(h)
-		for _, sub := range arr.Array() {
-			str := strings.SplitN(sub.String(), "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	println(url, tc, h, t)
-	c.JSON(200, s.bot.CQDownloadFile(url, headers, tc))
-}
-
-func OcrImage(s *httpServer, c *gin.Context) {
-	img := getParam(c, "image")
-	c.JSON(200, s.bot.CQOcrImage(img))
-}
-
-func GetWordSlices(s *httpServer, c *gin.Context) {
-	content := getParam(c, "content")
-	c.JSON(200, s.bot.CQGetWordSlices(content))
-}
-
-func SetGroupPortrait(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	file := getParam(c, "file")
-	cache := getParam(c, "cache")
-	c.JSON(200, s.bot.CQSetGroupPortrait(gid, file, cache))
-}
-
-func getParamOrDefault(c *gin.Context, k, def string) string {
-	r := getParam(c, k)
-	if r != "" {
-		return r
-	}
-	return def
-}
-
-func getParam(c *gin.Context, k string) string {
-	p, _ := getParamWithType(c, k)
-	return p
-}
-
-func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 	if q := c.Query(k); q != "" {
-		return q, gjson.Null
+		return gjson.Result{Type: gjson.String, Str: q}
 	}
 	if c.Request.Method == "POST" {
 		if h := c.Request.Header.Get("Content-Type"); h != "" {
 			if strings.Contains(h, "application/x-www-form-urlencoded") {
 				if p, ok := c.GetPostForm(k); ok {
-					return p, gjson.Null
+					return gjson.Result{Type: gjson.String, Str: p}
 				}
 			}
 			if strings.Contains(h, "application/json") {
 				if obj, ok := c.Get("json_body"); ok {
-					res := obj.(gjson.Result).Get(k)
+					return obj.(gjson.Result).Get(k)
-					if res.Exists() {
-						switch res.Type {
-						case gjson.JSON:
-							return res.Raw, gjson.JSON
-						case gjson.String:
-							return res.Str, gjson.String
-						case gjson.Number:
-							return strconv.FormatInt(res.Int(), 10), gjson.Number // 似乎没有需要接受 float 类型的api
-						case gjson.True:
-							return "true", gjson.True
-						case gjson.False:
-							return "false", gjson.False
 				}
 			}
 		}
 	}
-		}
+	return gjson.Result{Type: gjson.Null, Str: ""}
-	}
-	return "", gjson.Null
-}
-
-var httpApi = map[string]func(s *httpServer, c *gin.Context){
-	"get_login_info":             GetLoginInfo,
-	"get_friend_list":            GetFriendList,
-	"get_group_list":             GetGroupList,
-	"get_group_info":             GetGroupInfo,
-	"get_group_member_list":      GetGroupMemberList,
-	"get_group_member_info":      GetGroupMemberInfo,
-	"get_group_file_system_info": GetGroupFileSystemInfo,
-	"get_group_root_files":       GetGroupRootFiles,
-	"get_group_files_by_folder":  GetGroupFilesByFolderId,
-	"get_group_file_url":         GetGroupFileUrl,
-	"send_msg":                   SendMessage,
-	"send_group_msg":             SendGroupMessage,
-	"send_group_forward_msg":     SendGroupForwardMessage,
-	"send_private_msg":           SendPrivateMessage,
-	"delete_msg":                 DeleteMessage,
-	"set_friend_add_request":     ProcessFriendRequest,
-	"set_group_add_request":      ProcessGroupRequest,
-	"set_group_card":             SetGroupCard,
-	"set_group_special_title":    SetSpecialTitle,
-	"set_group_kick":             SetGroupKick,
-	"set_group_ban":              SetGroupBan,
-	"set_group_whole_ban":        SetWholeBan,
-	"set_group_name":             SetGroupName,
-	"set_group_admin":            SetGroupAdmin,
-	"set_restart":                SetRestart,
-	"_send_group_notice":         SendGroupNotice,
-	"set_group_leave":            SetGroupLeave,
-	"get_image":                  GetImage,
-	"get_forward_msg":            GetForwardMessage,
-	"get_msg":                    GetMessage,
-	"get_group_system_msg":       GetGroupSystemMessage,
-	"get_group_honor_info":       GetGroupHonorInfo,
-	"can_send_image":             CanSendImage,
-	"can_send_record":            CanSendRecord,
-	"get_status":                 GetStatus,
-	"get_version_info":           GetVersionInfo,
-	"_get_vip_info":              GetVipInfo,
-	"get_stranger_info":          GetStrangerInfo,
-	"reload_event_filter":        ReloadEventFilter,
-	"set_group_portrait":         SetGroupPortrait,
-	"set_group_anonymous_ban":    SetGroupAnonymousBan,
-	"get_group_msg_history":      GetGroupMessageHistory,
-	"download_file":              DownloadFile,
-	".handle_quick_operation":    HandleQuickOperation,
-	".ocr_image":                 OcrImage,
-	"ocr_image":                  OcrImage,
-	"get_group_at_all_remain":    GetGroupAtAllRemain,
-	"get_online_clients":         GetOnlineClients,
-	".get_word_slices":           GetWordSlices,
 }
 
 func (s *httpServer) ShutDown() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	if err := s.Http.Shutdown(ctx); err != nil {
+	if err := s.HTTP.Shutdown(ctx); err != nil {
 		log.Fatal("http Server Shutdown:", err)
 	}
 	<-ctx.Done()

server/websocket.go

@@ -25,7 +25,7 @@ type webSocketServer struct {
 	handshake      string
 }
 
-//WebSocketClient Websocket客户端实例
+// WebSocketClient WebSocket客户端实例
 type WebSocketClient struct {
 	conf  *global.GoCQReverseWebSocketConfig
 	token string
@@ -38,9 +38,10 @@ type WebSocketClient struct {
 type webSocketConn struct {
 	*websocket.Conn
 	sync.Mutex
+	apiCaller apiCaller
 }
 
-//WebSocketServer 初始化一个WebSocketServer实例
+// WebSocketServer 初始化一个WebSocketServer实例
 var WebSocketServer = &webSocketServer{}
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool {
@@ -58,17 +59,17 @@ func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 	http.HandleFunc("/api", s.api)
 	http.HandleFunc("/", s.any)
 	go func() {
-		log.Infof("CQ Websocket 服务器已启动: %v", addr)
+		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
 		log.Fatal(http.ListenAndServe(addr, nil))
 	}()
 }
 
-//NewWebSocketClient 初始化一个NWebSocket客户端
+// NewWebSocketClient 初始化一个NWebSocket客户端
 func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
 	return &WebSocketClient{conf: conf, token: authToken, bot: b}
 }
 
-//Run 运行实例
+// Run 运行实例
 func (c *WebSocketClient) Run() {
 	if !c.conf.Enabled {
 		return
@@ -87,7 +88,7 @@ func (c *WebSocketClient) Run() {
 }
 
 func (c *WebSocketClient) connectAPI() {
-	log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseAPIURL)
+	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
 	header := http.Header{
 		"X-Client-Role": []string{"API"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -98,20 +99,20 @@ func (c *WebSocketClient) connectAPI() {
 	}
 	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
+		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectAPI()
 		}
 		return
 	}
-	log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseAPIURL)
+	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
-	wrappedConn := &webSocketConn{Conn: conn}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 	go c.listenAPI(wrappedConn, false)
 }
 
 func (c *WebSocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventURL)
+	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Event"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -122,7 +123,7 @@ func (c *WebSocketClient) connectEvent() {
 	}
 	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
+		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectEvent()
@@ -134,15 +135,15 @@ func (c *WebSocketClient) connectEvent() {
 		c.bot.Client.Uin, time.Now().Unix())
 	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
 	if err != nil {
-		log.Warnf("反向Websocket 握手时出现错误: %v", err)
+		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventURL)
+	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
-	c.eventConn = &webSocketConn{Conn: conn}
+	c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 }
 
 func (c *WebSocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseURL)
+	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Universal"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -153,7 +154,7 @@ func (c *WebSocketClient) connectUniversal() {
 	}
 	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
+		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectUniversal()
@@ -165,10 +166,10 @@ func (c *WebSocketClient) connectUniversal() {
 		c.bot.Client.Uin, time.Now().Unix())
 	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
 	if err != nil {
-		log.Warnf("反向Websocket 握手时出现错误: %v", err)
+		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &webSocketConn{Conn: conn}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 	go c.listenAPI(wrappedConn, true)
 	c.universalConn = wrappedConn
 }
@@ -195,7 +196,7 @@ func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
 
 func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
 	if c.eventConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson())
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJSON())
 		conn := c.eventConn
 		conn.Lock()
 		defer conn.Unlock()
@@ -210,7 +211,7 @@ func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
 		}
 	}
 	if c.universalConn != nil {
-		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson())
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJSON())
 		conn := c.universalConn
 		conn.Lock()
 		defer conn.Unlock()
@@ -230,7 +231,7 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
@@ -238,19 +239,19 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
-		log.Warnf("Websocket 握手时出现错误: %v", err)
+		log.Warnf("WebSocket 握手时出现错误: %v", err)
 		c.Close()
 		return
 	}
 
-	log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr)
+	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 
 	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
@@ -261,7 +262,7 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
@@ -269,11 +270,11 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
-	log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr)
+	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 	go s.listenAPI(conn)
 }
 
@@ -281,7 +282,7 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
@@ -289,17 +290,17 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
+		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
-		log.Warnf("Websocket 握手时出现错误: %v", err)
+		log.Warnf("WebSocket 握手时出现错误: %v", err)
 		c.Close()
 		return
 	}
-	log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
+	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 	s.eventConn = append(s.eventConn, conn)
 	s.listenAPI(conn)
 }
@@ -318,7 +319,7 @@ func (s *webSocketServer) listenAPI(c *webSocketConn) {
 	}
 }
 
-func (c *webSocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
+func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
@@ -329,23 +330,13 @@ func (c *webSocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 	j := gjson.ParseBytes(payload)
 	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	if f, ok := wsAPI[t]; ok {
+	ret := c.apiCaller.callAPI(t, j.Get("params"))
-		ret := f(bot, j.Get("params"))
 	if j.Get("echo").Exists() {
 		ret["echo"] = j.Get("echo").Value()
 	}
 	c.Lock()
 	defer c.Unlock()
 	_ = c.WriteJSON(ret)
-	} else {
-		ret := coolq.Failed(1404, "API_NOT_FOUND", "API不存在")
-		if j.Get("echo").Exists() {
-			ret["echo"] = j.Get("echo").Value()
-		}
-		c.Lock()
-		defer c.Unlock()
-		_ = c.WriteJSON(ret)
-	}
 }
 
 func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
@@ -353,9 +344,9 @@ func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
 	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(), m.ToJson())
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJSON())
 		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson())); err != nil {
+		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJSON())); err != nil {
 			_ = conn.Close()
 			next := i + 1
 			if next >= l {
@@ -371,239 +362,3 @@ func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
 		conn.Unlock()
 	}
 }
-
-var wsAPI = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
-	"get_login_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetLoginInfo()
-	},
-	"get_friend_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetFriendList()
-	},
-	"get_group_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupList(p.Get("no_cache").Bool())
-	},
-	"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-	},
-	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-	},
-	"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberInfo(
-			p.Get("group_id").Int(), p.Get("user_id").Int(),
-		)
-	},
-	"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
-		if p.Get("message_type").Str == "private" {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("message_type").Str == "group" {
-			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("group_id").Int() != 0 {
-			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("user_id").Int() != 0 {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		return coolq.MSG{}
-	},
-	"send_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"send_group_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
-	},
-	"send_private_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"delete_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
-	},
-	"set_friend_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		apr := true
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
-	},
-	"set_group_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		subType := p.Get("sub_type").Str
-		apr := true
-		if subType == "" {
-			subType = p.Get("type").Str
-		}
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
-	},
-	"set_group_card": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
-	},
-	"set_group_special_title": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
-	},
-	"set_group_kick": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
-	},
-	"set_group_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
-			if p.Get("duration").Exists() {
-				return uint32(p.Get("duration").Int())
-			}
-			return 1800
-		}())
-	},
-	"set_group_whole_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
-			if p.Get("enable").Exists() {
-				return p.Get("enable").Bool()
-			}
-			return true
-		}())
-	},
-	"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
-	},
-	"set_group_admin": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
-			if p.Get("enable").Exists() {
-				return p.Get("enable").Bool()
-			}
-			return true
-		}())
-	},
-	"_send_group_notice": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
-	},
-	"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupLeave(p.Get("group_id").Int())
-	},
-	"get_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetImage(p.Get("file").Str)
-	},
-	"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		id := p.Get("message_id").Str
-		if id == "" {
-			id = p.Get("id").Str
-		}
-		return bot.CQGetForwardMessage(id)
-	},
-	"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetMessage(int32(p.Get("message_id").Int()))
-	},
-	"download_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		headers := map[string]string{}
-		headersToken := p.Get("headers")
-		if headersToken.IsArray() {
-			for _, sub := range headersToken.Array() {
-				str := strings.SplitN(sub.String(), "=", 2)
-				if len(str) == 2 {
-					headers[str[0]] = str[1]
-				}
-			}
-		}
-		if headersToken.Type == gjson.String {
-			lines := strings.Split(headersToken.String(), "\r\n")
-			for _, sub := range lines {
-				str := strings.SplitN(sub, "=", 2)
-				if len(str) == 2 {
-					headers[str[0]] = str[1]
-				}
-			}
-		}
-		return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
-	},
-	"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
-	},
-	"set_restart": func(c *coolq.CQBot, p gjson.Result) coolq.MSG {
-		var delay int64
-		delay = p.Get("delay").Int()
-		if delay < 0 {
-			delay = 0
-		}
-		defer func(delay int64) {
-			time.Sleep(time.Duration(delay) * time.Millisecond)
-			Restart <- struct{}{}
-		}(delay)
-		return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
-
-	},
-	"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCanSendImage()
-	},
-	"can_send_record": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCanSendRecord()
-	},
-	"get_stranger_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetStrangerInfo(p.Get("user_id").Int())
-	},
-	"get_status": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetStatus()
-	},
-	"get_version_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetVersionInfo()
-	},
-	"get_group_system_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupSystemMessages()
-	},
-	"get_group_file_system_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
-	},
-	"get_group_root_files": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
-	},
-	"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFilesByFolderId(p.Get("group_id").Int(), p.Get("folder_id").Str)
-	},
-	"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileUrl(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
-	},
-	"get_group_msg_history": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
-	},
-	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetVipInfo(p.Get("user_id").Int())
-	},
-	"reload_event_filter": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQReloadEventFilter()
-	},
-	".ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQOcrImage(p.Get("image").Str)
-	},
-	"ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQOcrImage(p.Get("image").Str)
-	},
-	"get_group_at_all_remain": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetAtAllRemain(p.Get("group_id").Int())
-	},
-	"get_online_clients": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
-	},
-	".get_word_slices": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetWordSlices(p.Get("content").Str)
-	},
-	"set_group_portrait": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
-	},
-	"set_group_anonymous_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		obj := p.Get("anonymous")
-		flag := p.Get("anonymous_flag")
-		if !flag.Exists() {
-			flag = p.Get("flag")
-		}
-		if !flag.Exists() && !obj.Exists() {
-			return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
-		}
-		if !flag.Exists() {
-			flag = obj.Get("flag")
-		}
-		return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
-	},
-	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
-	},
-}