update MiraiGo.

remove mkdir, add set -ex

.github/workflows/ci.yml

@@ -14,21 +14,23 @@ 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/amd64
         goos: [linux, windows, darwin]
         goarch: ["386", amd64, arm]
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: "386"
       fail-fast: true
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Setup Go environment
-      uses: actions/setup-go@v2.1.1
+      uses: actions/setup-go@v2.1.3
       with:
-        go-version: 1.14
+        go-version: 1.15
     
     - name: Build binary file
       env:

.github/workflows/release.yml

@@ -14,17 +14,20 @@ jobs:
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: "386"
             
     steps:
       - uses: actions/checkout@v2
       - name: Set RELEASE_VERSION env
-        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
+        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-      - uses: wangyoucao577/go-release-action@master
+      - uses: pcrbot/go-release-action@master
         env:
           CGO_ENABLED: 0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
+          goversion: "https://golang.org/dl/go1.15.3.linux-amd64.tar.gz"
           ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
           

Dockerfile

@@ -1,15 +1,16 @@
-FROM golang:1.14.7-alpine AS builder
+FROM golang:1.15.5-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
-  && mkdir /build
+  && go env -w GOPROXY=https://goproxy.cn,direct 
 
 WORKDIR /build
 
 COPY ./ .
 
-RUN cd /build \
+RUN set -ex \
-  && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
+    && cd /build \
+    && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
 
 FROM alpine:latest
 

README.md

@@ -20,7 +20,7 @@
 - [x] 消息撤回事件
 - [x] 解析/发送 回复消息
 - [x] 解析/发送 合并转发
-- [ ] 使用代理请求网络图片
+- [x] 使用代理请求网络图片
 
 #### 实现
 <details>
@@ -35,6 +35,10 @@
 - [CQ:reply]
 - [CQ:forward]
 - [CQ:node]
+- [CQ:gift]
+- [CQ:redbag]
+- [CQ:tts]
+- [CQ:music]
 
 </details>
 
@@ -42,33 +46,34 @@
 <summary>已实现API</summary>
 
 ##### 注意: 部分API实现与CQHTTP原版略有差异，请参考文档
-| API                      | 功能                                                         |
+| API                      | 功能                                                                                                                                                                                                         |
-| ------------------------ | ------------------------------------------------------------ |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| /get_login_info          | [获取登录号信息](https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-获取登录号信息) |
+| /get_login_info          | [获取登录号信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF)                                   |
-| /get_friend_list         | [获取好友列表](https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-获取好友列表) |
+| /get_friend_list         | [获取好友列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8)                                             |
-| /get_group_list          | [获取群列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-获取群列表) |
+| /get_group_list          | [获取群列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8)                                                         |
-| /get_group_info          | [获取群信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-获取群信息) |
+| /get_group_info          | [获取群信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF)                                                         |
-| /get_group_member_list   | [获取群成员列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-获取群成员列表) |
+| /get_group_member_list   | [获取群成员列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8)                            |
-| /get_group_member_info   | [获取群成员信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-获取群成员信息) |
+| /get_group_member_info   | [获取群成员信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF)                            |
-| /send_msg                | [发送消息](https://cqhttp.cc/docs/4.15/#/API?id=send_msg-发送消息) |
+| /send_msg                | [发送消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF)                                                                          |
-| /send_group_msg          | [发送群消息](https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-发送群消息) |
+| /send_group_msg          | [发送群消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF)                                                         |
-| /send_private_msg        | [发送私聊消息](https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-发送私聊消息) |
+| /send_private_msg        | [发送私聊消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF)                                            |
-| /delete_msg              | [撤回信息](https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-撤回消息) |
+| /delete_msg              | [撤回信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF)                                                                        |
-| /set_friend_add_request  | [处理加好友请求](https://cqhttp.cc/docs/4.15/#/API?id=set_friend_add_request-处理加好友请求) |
+| /set_friend_add_request  | [处理加好友请求](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82)                           |
-| /set_group_add_request   | [处理加群请求/邀请](https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-处理加群请求／邀请) |
+| /set_group_add_request   | [处理加群请求/邀请](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7)                |
-| /set_group_card          | [设置群名片(群备注)](https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-设置群名片（群备注）) |
+| /set_group_card          | [设置群名片(群备注)](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8)                      |
-| /set_group_special_title | [设置群组专属头衔](https://cqhttp.cc/docs/4.15/#/API?id=set_group_special_title-设置群组专属头衔) |
+| /set_group_special_title | [设置群组专属头衔](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94)               |
-| /set_group_kick          | [群组T人](https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-群组踢人) |
+| /set_group_kick          | [群组T人](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA)                                                                     |
-| /set_group_ban           | [群组单人禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-群组单人禁言) |
+| /set_group_ban           | [群组单人禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80)                                               |
-| /set_group_whole_ban     | [群组全员禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-群组全员禁言) |
+| /set_group_whole_ban     | [群组全员禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80)                                         |
-| /set_group_leave         | [退出群组](https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-退出群组) |
+| /set_group_leave         | [退出群组](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84)                                                                   |
-| /set_group_name          | 设置群组名(拓展API)                                         |
+| /set_group_name          | [设置群组名](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D)                                                                  |
-| /get_image               | 获取图片信息(拓展API)                                        |
+| /set_restart             | [重启go-cqhttp](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0)                                                          |
-| /get_group_msg           | 获取群组消息(拓展API)                                        |
+| /get_image               | [获取图片信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87)                                                                     |
-| /can_send_image          | [检查是否可以发送图片](https://cqhttp.cc/docs/4.15/#/API?id=can_send_image-检查是否可以发送图片) |
+| /get_msg                 | [获取消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF)                                                                           |
-| /can_send_record         | [检查是否可以发送语音](https://cqhttp.cc/docs/4.15/#/API?id=can_send_record-检查是否可以发送语音) |
+| /can_send_image          | [检查是否可以发送图片](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87)  |
-| /get_status              | [获取插件运行状态](https://cqhttp.cc/docs/4.15/#/API?id=get_status-获取插件运行状态) |
+| /can_send_record         | [检查是否可以发送语音](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3) |
-| /get_version_info        | [获取 酷Q 及 CQHTTP插件的版本信息](https://cqhttp.cc/docs/4.15/#/API?id=get_version_info-获取-酷q-及-cqhttp-插件的版本信息) |
+| /get_status              | [获取插件运行状态](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81)                                              |
+| /get_version_info        | [获取 酷Q 及 CQHTTP插件的版本信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF)                        |
 
 </details>
 
@@ -76,20 +81,20 @@
 <summary>已实现Event</summary>
 
 ##### 注意: 部分Event数据与CQHTTP原版略有差异，请参考文档
-| Event                                                        |
+| Event                                                                                                                                                |
-| ------------------------------------------------------------ |
+| ---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息)   |
+| [私聊信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF)                        |
-| [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息)       |
+| [群消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF)                                   |
-| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回)           |
+| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回)                                                                                                   |
-| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回)       |
+| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回)                                                                                               |
-| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳)           |
+| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳)                                                                                     |
-| [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) |
+| [群管理员变动](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8)   |
-| [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
+| [群成员减少](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91)              |
-| [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
+| [群成员增加](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0)              |
-| [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言)       |
+| [群禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80)                                    |
-| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传) |
+| [群文件上传](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0)              |
-| [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) |
+| [加好友请求](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82)             |
-| [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求／邀请) |
+| [加群请求/邀请](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7) |
 
 </details>
 

coolq/api.go

@@ -6,6 +6,7 @@ import (
 	"path"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -57,7 +58,7 @@ func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
 func (bot *CQBot) CQGetGroupInfo(groupId int64) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
-		return Failed(100)
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
 	return OK(MSG{
 		"group_id":         group.Code,
@@ -71,13 +72,13 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64) MSG {
 func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
-		return Failed(100)
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
 	if noCache {
 		t, err := bot.Client.GetGroupMembers(group)
 		if err != nil {
 			log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err)
-			return Failed(100)
+			return Failed(100, "GET_MEMBERS_API_ERROR", err.Error())
 		}
 		group.Members = t
 	}
@@ -92,15 +93,79 @@ func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG {
 func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
-		return Failed(100)
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
 	member := group.FindMember(userId)
 	if member == nil {
-		return Failed(102)
+		return Failed(100, "MEMBER_NOT_FOUND", "群员不存在")
 	}
 	return OK(convertGroupMemberInfo(groupId, member))
 }
 
+func (bot *CQBot) CQGetGroupFileSystemInfo(groupId int64) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
+	}
+	return OK(fs)
+}
+
+func (bot *CQBot) CQGetGroupRootFiles(groupId int64) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
+	}
+	files, folders, err := fs.Root()
+	if err != nil {
+		log.Errorf("获取群 %v 根目录文件失败: %v", groupId, err)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
+	}
+	return OK(MSG{
+		"files":   files,
+		"folders": folders,
+	})
+}
+
+func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
+	}
+	files, folders, err := fs.GetFilesByFolder(folderId)
+	if err != nil {
+		log.Errorf("获取群 %v 根目录 %v 子文件失败: %v", groupId, folderId, err)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
+	}
+	return OK(MSG{
+		"files":   files,
+		"folders": folders,
+	})
+}
+
+func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) MSG {
+	url := bot.Client.GetGroupFileUrl(groupId, fileId, busId)
+	if url == "" {
+		return Failed(100, "FILE_SYSTEM_API_ERROR")
+	}
+	return OK(MSG{
+		"url": url,
+	})
+}
+
+func (bot *CQBot) CQGetWordSlices(content string) MSG {
+	slices, err := bot.Client.GetWordSegmentation(content)
+	if err != nil {
+		return Failed(100, "WORD_SEGMENTATION_API_ERROR", err.Error())
+	}
+	for i := 0; i < len(slices); i++ {
+		slices[i] = strings.ReplaceAll(slices[i], "\u0000", "")
+	}
+	return OK(MSG{"slices": slices})
+}
+
 // https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
 func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bool) MSG {
 	var str string
@@ -123,8 +188,9 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
 			fixAt(elem)
 			mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
-				return Failed(100)
+				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
+			log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupId, groupId, limitedString(m.String()), mid)
 			return OK(MSG{"message_id": mid})
 		}
 		str = func() string {
@@ -138,7 +204,7 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
 	}
 	if str == "" {
 		log.Warnf("群消息发送失败: 信息为空. MSG: %v", i)
-		return Failed(100)
+		return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
 	}
 	var elem []message.IMessageElement
 	if autoEscape {
@@ -149,8 +215,9 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
 	fixAt(elem)
 	mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
-		return Failed(100)
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
+	log.Infof("发送群 %v(%v)  的消息: %v (%v)", groupId, groupId, limitedString(str), mid)
 	return OK(MSG{"message_id": mid})
 }
 
@@ -175,7 +242,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 		ts.Add(time.Second)
 		if e.Get("data.id").Exists() {
 			i, _ := strconv.Atoi(e.Get("data.id").Str)
-			m := bot.GetGroupMessage(int32(i))
+			m := bot.GetMessage(int32(i))
 			if m != nil {
 				sender := m["sender"].(message.Sender)
 				nodes = append(nodes, &message.ForwardNode{
@@ -245,8 +312,9 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 			elem := bot.ConvertObjectMessage(m, true)
 			mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
-				return Failed(100)
+				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
+			log.Infof("发送好友 %v(%v)  的消息: %v (%v)", userId, userId, limitedString(m.String()), mid)
 			return OK(MSG{"message_id": mid})
 		}
 		str = func() string {
@@ -259,7 +327,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 		str = s
 	}
 	if str == "" {
-		return Failed(100)
+		return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
 	}
 	var elem []message.IMessageElement
 	if autoEscape {
@@ -269,8 +337,9 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 	}
 	mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
-		return Failed(100)
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
+	log.Infof("发送好友 %v(%v)  的消息: %v (%v)", userId, userId, limitedString(str), mid)
 	return OK(MSG{"message_id": mid})
 }
 
@@ -282,7 +351,7 @@ func (bot *CQBot) CQSetGroupCard(groupId, userId int64, card string) MSG {
 			return OK(nil)
 		}
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
@@ -293,7 +362,7 @@ func (bot *CQBot) CQSetGroupSpecialTitle(groupId, userId int64, title string) MS
 			return OK(nil)
 		}
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 func (bot *CQBot) CQSetGroupName(groupId int64, name string) MSG {
@@ -301,7 +370,7 @@ func (bot *CQBot) CQSetGroupName(groupId int64, name string) MSG {
 		g.UpdateName(name)
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 func (bot *CQBot) CQSetGroupMemo(groupId int64, msg string) MSG {
@@ -309,18 +378,18 @@ func (bot *CQBot) CQSetGroupMemo(groupId int64, msg string) MSG {
 		g.UpdateMemo(msg)
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
-func (bot *CQBot) CQSetGroupKick(groupId, userId int64, msg string) MSG {
+func (bot *CQBot) CQSetGroupKick(groupId, userId int64, msg string, block bool) MSG {
 	if g := bot.Client.FindGroup(groupId); g != nil {
 		if m := g.FindMember(userId); m != nil {
-			m.Kick(msg)
+			m.Kick(msg, block)
 			return OK(nil)
 		}
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
@@ -331,7 +400,7 @@ func (bot *CQBot) CQSetGroupBan(groupId, userId int64, duration uint32) MSG {
 			return OK(nil)
 		}
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
@@ -340,7 +409,7 @@ func (bot *CQBot) CQSetGroupWholeBan(groupId int64, enable bool) MSG {
 		g.MuteAll(enable)
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
@@ -349,14 +418,14 @@ func (bot *CQBot) CQSetGroupLeave(groupId int64) MSG {
 		g.Quit()
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
 func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
 	req, ok := bot.friendReqCache.Load(flag)
 	if !ok {
-		return Failed(100)
+		return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在")
 	}
 	if approve {
 		req.(*client.NewFriendRequest).Accept()
@@ -368,39 +437,67 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%EF%BC%8F%E9%82%80%E8%AF%B7
 func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) MSG {
+	msgs, err := bot.Client.GetGroupSystemMessages()
+	if err != nil {
+		log.Errorf("获取群系统消息失败: %v", err)
+		return Failed(100, "SYSTEM_MSG_API_ERROR", err.Error())
+	}
 	if subType == "add" {
-		req, ok := bot.joinReqCache.Load(flag)
+		for _, req := range msgs.JoinRequests {
-		if !ok {
+			if strconv.FormatInt(req.RequestId, 10) == flag {
-			return Failed(100)
+				if req.Checked {
+					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
+					return Failed(100, "FLAG_HAS_BEEN_CHECKED", "消息已被处理")
+				}
+				if approve {
+					req.Accept()
+				} else {
+					req.Reject(false, reason)
+				}
+				return OK(nil)
+			}
 		}
-		bot.joinReqCache.Delete(flag)
+	} else {
-		if approve {
+		for _, req := range msgs.InvitedRequests {
-			req.(*client.UserJoinGroupRequest).Accept()
+			if strconv.FormatInt(req.RequestId, 10) == flag {
-		} else {
+				if req.Checked {
-			req.(*client.UserJoinGroupRequest).Reject(false, reason)
+					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
+					return Failed(100, "FLAG_HAS_BEEN_CHECKED", "消息已被处理")
+				}
+				if approve {
+					req.Accept()
+				} else {
+					req.Reject(false, reason)
+				}
+				return OK(nil)
+			}
 		}
-		return OK(nil)
 	}
-	req, ok := bot.invitedReqCache.Load(flag)
+	log.Errorf("处理群系统消息失败: 消息 %v 不存在.", flag)
-	if ok {
+	return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在")
-		bot.invitedReqCache.Delete(flag)
-		if approve {
-			req.(*client.GroupInvitedRequest).Accept()
-		} else {
-			req.(*client.GroupInvitedRequest).Reject(false, reason)
-		}
-		return OK(nil)
-	}
-	return Failed(100)
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
 func (bot *CQBot) CQDeleteMessage(messageId int32) MSG {
-	msg := bot.GetGroupMessage(messageId)
+	msg := bot.GetMessage(messageId)
 	if msg == nil {
-		return Failed(100)
+		return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
+	}
+	if _, ok := msg["group"]; ok {
+		if err := bot.Client.RecallGroupMessage(msg["group"].(int64), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil {
+			log.Warnf("撤回 %v 失败: %v", messageId, err)
+			return Failed(100, "RECALL_API_ERROR", err.Error())
+		}
+	} else {
+		if msg["sender"].(message.Sender).Uin != bot.Client.Uin {
+			log.Warnf("撤回 %v 失败: 好友会话无法撤回对方消息.", messageId)
+			return Failed(100, "CANNOT_RECALL_FRIEND_MSG", "无法撤回对方消息")
+		}
+		if err := bot.Client.RecallPrivateMessage(msg["target"].(int64), int64(msg["time"].(int32)), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil {
+			log.Warnf("撤回 %v 失败: %v", messageId, err)
+			return Failed(100, "RECALL_API_ERROR", err.Error())
+		}
 	}
-	bot.Client.RecallGroupMessage(msg["group"].(int64), msg["message-id"].(int32), msg["internal-id"].(int32))
 	return OK(nil)
 }
 
@@ -408,29 +505,28 @@ func (bot *CQBot) CQDeleteMessage(messageId int32) MSG {
 func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil || group.OwnerUin != bot.Client.Uin {
-		return Failed(100)
+		return Failed(100, "PERMISSION_DENIED", "群不存在或权限不足")
 	}
 	mem := group.FindMember(userId)
 	if mem == nil {
-		return Failed(100)
+		return Failed(100, "GROUP_MEMBER_NOT_FOUND", "群成员不存在")
 	}
 	mem.SetAdmin(enable)
 	t, err := bot.Client.GetGroupMembers(group)
 	if err != nil {
 		log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err)
-		return Failed(100)
+		return Failed(100, "GET_MEMBERS_API_ERROR", err.Error())
 	}
 	group.Members = t
 	return OK(nil)
 }
 
 func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
-	msg := MSG{}
 	vip, err := bot.Client.GetVipInfo(userId)
 	if err != nil {
-		return Failed(100)
+		return Failed(100, "VIP_API_ERROR", err.Error())
 	}
-	msg = MSG{
+	msg := MSG{
 		"user_id":          vip.Uin,
 		"nickname":         vip.Name,
 		"level":            vip.Level,
@@ -501,7 +597,7 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG {
 func (bot *CQBot) CQGetStrangerInfo(userId int64) MSG {
 	info, err := bot.Client.GetSummaryInfo(userId)
 	if err != nil {
-		return Failed(100)
+		return Failed(100, "SUMMARY_API_ERROR", err.Error())
 	}
 	return OK(MSG{
 		"user_id":  info.Uin,
@@ -549,7 +645,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 				bot.CQDeleteMessage(int32(context.Get("message_id").Int()))
 			}
 			if operation.Get("kick").Bool() && !isAnonymous {
-				bot.CQSetGroupKick(context.Get("group_id").Int(), context.Get("user_id").Int(), "")
+				bot.CQSetGroupKick(context.Get("group_id").Int(), context.Get("user_id").Int(), "", operation.Get("reject_add_request").Bool())
 			}
 			if operation.Get("ban").Bool() {
 				var duration uint32 = 30 * 60
@@ -596,14 +692,15 @@ func (bot *CQBot) CQGetImage(file string) MSG {
 		}
 		msg["file"] = local
 		return OK(msg)
+	} else {
+		return Failed(100, "LOAD_FILE_ERROR", err.Error())
 	}
-	return Failed(100)
 }
 
 func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
 	m := bot.Client.GetForwardMessage(resId)
 	if m == nil {
-		return Failed(100)
+		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
 	}
 	r := make([]MSG, 0)
 	for _, n := range m.Nodes {
@@ -622,24 +719,42 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
 	})
 }
 
-func (bot *CQBot) CQGetGroupMessage(messageId int32) MSG {
+func (bot *CQBot) CQGetMessage(messageId int32) MSG {
-	msg := bot.GetGroupMessage(messageId)
+	msg := bot.GetMessage(messageId)
 	if msg == nil {
-		return Failed(100)
+		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
 	}
 	sender := msg["sender"].(message.Sender)
+	gid, isGroup := msg["group"]
+	raw := msg["message"].(string)
 	return OK(MSG{
 		"message_id": messageId,
 		"real_id":    msg["message-id"],
+		"group":      isGroup,
+		"group_id":   gid,
 		"sender": MSG{
 			"user_id":  sender.Uin,
 			"nickname": sender.Nickname,
 		},
-		"time":    msg["time"],
+		"time": msg["time"],
-		"content": msg["message"],
+		"message": ToFormattedMessage(bot.ConvertStringMessage(raw, isGroup), func() int64 {
+			if isGroup {
+				return gid.(int64)
+			}
+			return sender.Uin
+		}(), false),
 	})
 }
 
+func (bot *CQBot) CQGetGroupSystemMessages() MSG {
+	msg, err := bot.Client.GetGroupSystemMessages()
+	if err != nil {
+		log.Warnf("获取群系统消息失败: %v", err)
+		return Failed(100, "SYSTEM_MSG_API_ERROR", err.Error())
+	}
+	return OK(msg)
+}
+
 func (bot *CQBot) CQCanSendImage() MSG {
 	return OK(MSG{"yes": true})
 }
@@ -648,11 +763,39 @@ func (bot *CQBot) CQCanSendRecord() MSG {
 	return OK(MSG{"yes": true})
 }
 
+func (bot *CQBot) CQOcrImage(imageId string) MSG {
+	img, err := bot.makeImageElem(map[string]string{"file": imageId}, true)
+	if err != nil {
+		log.Warnf("load image error: %v", err)
+		return Failed(100, "LOAD_FILE_ERROR", err.Error())
+	}
+	rsp, err := bot.Client.ImageOcr(img)
+	if err != nil {
+		log.Warnf("ocr image error: %v", err)
+		return Failed(100, "OCR_API_ERROR", err.Error())
+	}
+	return OK(rsp)
+}
+
 func (bot *CQBot) CQReloadEventFilter() MSG {
 	global.BootFilter()
 	return OK(nil)
 }
 
+func (bot *CQBot) CQSetGroupPortrait(groupId int64, file, cache string) MSG {
+	if g := bot.Client.FindGroup(groupId); g != nil {
+		img, err := global.FindFile(file, cache, global.IMAGE_PATH)
+		if err != nil {
+			log.Warnf("set group portrait error: %v", err)
+			return Failed(100, "LOAD_FILE_ERROR", err.Error())
+		}
+		g.UpdateGroupHeadPortrait(img)
+		return OK(nil)
+	}
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+}
+
+// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81
 func (bot *CQBot) CQGetStatus() MSG {
 	return OK(MSG{
 		"app_initialized": true,
@@ -660,7 +803,8 @@ func (bot *CQBot) CQGetStatus() MSG {
 		"plugins_good":    nil,
 		"app_good":        true,
 		"online":          bot.Client.Online,
-		"good":            true,
+		"good":            bot.Client.Online,
+		"stat":            bot.Client.GetStatistics(),
 	})
 }
 
@@ -678,12 +822,14 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 		"version":                    Version,
 		"protocol": func() int {
 			switch client.SystemDeviceInfo.Protocol {
-			case client.AndroidPad:
+			case client.IPad:
 				return 0
 			case client.AndroidPhone:
 				return 1
 			case client.AndroidWatch:
 				return 2
+			case client.MacOS:
+				return 3
 			default:
 				return -1
 			}
@@ -695,8 +841,16 @@ func OK(data interface{}) MSG {
 	return MSG{"data": data, "retcode": 0, "status": "ok"}
 }
 
-func Failed(code int) MSG {
+func Failed(code int, msg ...string) MSG {
-	return MSG{"data": nil, "retcode": code, "status": "failed"}
+	m := ""
+	w := ""
+	if len(msg) > 0 {
+		m = msg[0]
+	}
+	if len(msg) > 1 {
+		w = msg[1]
+	}
+	return MSG{"data": nil, "retcode": code, "msg": m, "wording": w, "status": "failed"}
 }
 
 func convertGroupMemberInfo(groupId int64, m *client.GroupMemberInfo) MSG {
@@ -727,3 +881,12 @@ func convertGroupMemberInfo(groupId int64, m *client.GroupMemberInfo) MSG {
 		"card_changeable":   false,
 	}
 }
+
+func limitedString(str string) string {
+	if strings.Count(str, "") <= 10 {
+		return str
+	}
+	limited := []rune(str)
+	limited = limited[:10]
+	return string(limited) + " ..."
+}

coolq/bot.go

@@ -3,33 +3,34 @@ package coolq
 import (
 	"bytes"
 	"encoding/gob"
-	"encoding/json"
 	"fmt"
 	"hash/crc32"
 	"path"
 	"sync"
 	"time"
 
+	"github.com/syndtr/goleveldb/leveldb"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/go-cqhttp/global"
 
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-	"github.com/xujiajun/nutsdb"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 type CQBot struct {
 	Client *client.QQClient
 
-	events          []func(MSG)
+	events         []func(MSG)
-	db              *nutsdb.DB
+	db             *leveldb.DB
-	friendReqCache  sync.Map
+	friendReqCache sync.Map
-	invitedReqCache sync.Map
+	tempMsgCache   sync.Map
-	joinReqCache    sync.Map
+	oneWayMsgCache sync.Map
-	tempMsgCache    sync.Map
-	oneWayMsgCache  sync.Map
 }
 
 type MSG map[string]interface{}
@@ -41,12 +42,10 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 		Client: cli,
 	}
 	if conf.EnableDB {
-		opt := nutsdb.DefaultOptions
+		p := path.Join("data", "leveldb")
-		opt.Dir = path.Join("data", "db")
+		db, err := leveldb.OpenFile(p, nil)
-		opt.EntryIdxMode = nutsdb.HintBPTSparseIdxMode
-		db, err := nutsdb.Open(opt)
 		if err != nil {
-			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/db 文件夹或关闭数据库功能。")
+			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
 		}
 		bot.db = db
 		gob.Register(message.Sender{})
@@ -60,12 +59,15 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
 	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
+	bot.Client.OnFriendNotify(bot.friendNotifyEvent)
 	bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
+	bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
 	bot.Client.OnJoinGroup(bot.joinGroupEvent)
 	bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
 	bot.Client.OnGroupMemberJoined(bot.memberJoinEvent)
 	bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent)
 	bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent)
+	bot.Client.OnGroupMemberCardUpdated(bot.memberCardUpdatedEvent)
 	bot.Client.OnNewFriendRequest(bot.friendRequestEvent)
 	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
 	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
@@ -98,20 +100,17 @@ func (bot *CQBot) OnEventPush(f func(m MSG)) {
 	bot.events = append(bot.events, f)
 }
 
-func (bot *CQBot) GetGroupMessage(mid int32) MSG {
+func (bot *CQBot) GetMessage(mid int32) MSG {
 	if bot.db != nil {
 		m := MSG{}
-		err := bot.db.View(func(tx *nutsdb.Tx) error {
+		data, err := bot.db.Get(binary.ToBytes(mid), nil)
-			e, err := tx.Get("group-messages", binary.ToBytes(mid))
-			if err != nil {
-				return err
-			}
-			buff := new(bytes.Buffer)
-			buff.Write(binary.GZipUncompress(e.Value))
-			return gob.NewDecoder(buff).Decode(&m)
-		})
 		if err == nil {
-			return m
+			buff := new(bytes.Buffer)
+			buff.Write(binary.GZipUncompress(data))
+			err = gob.NewDecoder(buff).Decode(&m)
+			if err == nil {
+				return m
+			}
 		}
 		log.Warnf("获取信息时出现错误: %v id: %v", err, mid)
 	}
@@ -147,9 +146,79 @@ 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)
+			return 0
+		}
+		if i, ok := elem.(*QQMusicElement); ok {
+			var msgStyle uint32 = 4
+			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)
+				return -1
+			}
+			return bot.InsertGroupMessage(ret)
+		}
+		if i, ok := elem.(*CloudMusicElement); ok {
+			ret, err := bot.Client.SendGroupRichMessage(groupId, 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,
+			})
+			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)
 	}
+	if len(newElem) == 0 {
+		log.Warnf("群消息发送失败: 消息为空.")
+		return -1
+	}
 	m.Elements = newElem
+	bot.checkMedia(newElem)
 	ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
@@ -170,30 +239,97 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 			newElem = append(newElem, fm)
 			continue
 		}
+		if i, ok := elem.(*PokeElement); ok {
+			bot.Client.SendFriendPoke(i.Target)
+			return 0
+		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
+			if err != nil {
+				log.Warnf("警告: 好友 %v 消息语音上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, fv)
+			continue
+		}
+		if i, ok := elem.(*QQMusicElement); ok {
+			var msgStyle uint32 = 4
+			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)
 	}
+	if len(newElem) == 0 {
+		log.Warnf("好友消息发送失败: 消息为空.")
+		return -1
+	}
 	m.Elements = newElem
+	bot.checkMedia(newElem)
 	var id int32 = -1
-	if bot.Client.FindFriend(target) != nil {
+	if bot.Client.FindFriend(target) != nil { // 双向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
-			id = msg.Id
+			id = bot.InsertPrivateMessage(msg)
 		}
-	} else if code, ok := bot.tempMsgCache.Load(target); ok {
+	} else if code, ok := bot.tempMsgCache.Load(target); ok { // 临时会话
 		msg := bot.Client.SendTempMessage(code.(int64), target, m)
 		if msg != nil {
 			id = msg.Id
 		}
-	} else if _, ok := bot.oneWayMsgCache.Load(target); ok {
+	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
-			id = msg.Id
+			id = bot.InsertPrivateMessage(msg)
 		}
 	}
 	if id == -1 {
 		return -1
 	}
-	return ToGlobalId(target, id)
+	return id
 }
 
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
@@ -208,14 +344,36 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	}
 	id := ToGlobalId(m.GroupCode, m.Id)
 	if bot.db != nil {
-		err := bot.db.Update(func(tx *nutsdb.Tx) error {
+		buf := new(bytes.Buffer)
-			buf := new(bytes.Buffer)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
-			if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
-				return err
+			return -1
-			}
+		}
-			return tx.Put("group-messages", binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), 0)
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
-		})
+			log.Warnf("记录聊天数据时出现错误: %v", err)
-		if err != nil {
+			return -1
+		}
+	}
+	return id
+}
+
+func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
+	val := MSG{
+		"message-id":  m.Id,
+		"internal-id": m.InternalId,
+		"target":      m.Target,
+		"sender":      m.Sender,
+		"time":        m.Time,
+		"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
 		}

coolq/cqcode.go

@@ -1,28 +1,34 @@
 package coolq
 
 import (
+	"bufio"
+	"bytes"
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
+	xml2 "encoding/xml"
 	"errors"
 	"fmt"
+	"io/ioutil"
+	"math"
+	"net/url"
+	"path"
+	"runtime"
+	"strconv"
+	"strings"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-	"io/ioutil"
-	"net/url"
-	"path"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
 )
 
+/*
 var matchReg = regexp.MustCompile(`\[CQ:\w+?.*?]`)
 var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
+*/
 
 var IgnoreInvalidCQCode = false
 
@@ -30,6 +36,56 @@ type PokeElement struct {
 	Target int64
 }
 
+type GiftElement struct {
+	Target int64
+	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
+}
+
+func (e *GiftElement) Type() message.ElementType {
+	return message.At
+}
+
+func (e *MusicElement) Type() message.ElementType {
+	return message.Service
+}
+
+var GiftId = [...]message.GroupGift{
+	message.SweetWink,
+	message.HappyCola,
+	message.LuckyBracelet,
+	message.Cappuccino,
+	message.CatWatch,
+	message.FleeceGloves,
+	message.RainbowCandy,
+	message.Stronger,
+	message.LoveMicrophone,
+	message.HoldingYourHand,
+	message.CuteCat,
+	message.MysteryMask,
+	message.ImBusy,
+	message.LoveMask,
+}
+
 func (e *PokeElement) Type() message.ElementType {
 	return message.At
 }
@@ -58,8 +114,6 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 				"type": "text",
 				"data": map[string]string{"text": o.Content},
 			}
-		case *message.ReplyElement:
-			continue
 		case *message.LightAppElement:
 			//m = MSG{
 			//	"type": "text",
@@ -132,6 +186,40 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 					"data": map[string]string{"file": o.Filename, "url": o.Url},
 				}
 			}
+		case *message.GroupImageElement:
+			if ur {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image"},
+				}
+			} else {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+				}
+			}
+		case *message.FriendImageElement:
+			if ur {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image"},
+				}
+			} else {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": CQCodeEscapeText(o.Url)},
+				}
+			}
+		case *message.GroupFlashImgElement:
+			return []MSG{{
+				"type": "image",
+				"data": map[string]string{"file": o.Filename, "type": "flash"},
+			}}
+		case *message.FriendFlashImgElement:
+			return []MSG{{
+				"type": "image",
+				"data": map[string]string{"file": o.Filename, "type": "flash"},
+			}}
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				m = MSG{
@@ -144,6 +232,8 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 					"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
 				}
 			}
+		default:
+			continue
 		}
 		r = append(r, m)
 	}
@@ -198,6 +288,22 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 			} else {
 				r += fmt.Sprintf(`[CQ:image,file=%s,url=%s]`, o.Filename, CQCodeEscapeValue(o.Url))
 			}
+		case *message.GroupImageElement:
+			if ur {
+				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
+			} else {
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+			}
+		case *message.FriendImageElement:
+			if ur {
+				r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
+			} else {
+				r += fmt.Sprintf("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeText(o.Url))
+			}
+		case *message.GroupFlashImgElement:
+			return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
+		case *message.FriendFlashImgElement:
+			return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				r += fmt.Sprintf(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
@@ -212,32 +318,72 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 	return
 }
 
-func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessageElement) {
+func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMessageElement) {
-	i := matchReg.FindAllStringSubmatchIndex(m, -1)
+	index := 0
-	si := 0
+	stat := 0
-	for _, idx := range i {
+	rMsg := []rune(msg)
-		if idx[0] > si {
+	var tempText, cqCode []rune
-			text := m[si:idx[0]]
+	hasNext := func() bool {
-			r = append(r, message.NewText(CQCodeUnescapeText(text)))
+		return index < len(rMsg)
+	}
+	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 {
+			r = append(r, message.NewText(CQCodeUnescapeValue(string(tempText))))
 		}
-		code := m[idx[0]:idx[1]]
+		tempText = []rune{}
-		si = idx[1]
+		cqCode = []rune{}
-		t := typeReg.FindAllStringSubmatch(code, -1)[0][1]
+	}
-		ps := paramReg.FindAllStringSubmatch(code, -1)
+	saveCQCode := func() {
-		d := make(map[string]string)
+		defer func() {
-		for _, p := range ps {
+			cqCode = []rune{}
-			d[p[1]] = CQCodeUnescapeValue(p[2])
+			tempText = []rune{}
+		}()
+		reader := strings.NewReader(string(cqCode))
+		buf := bufio.NewReader(reader)
+		t, _ := buf.ReadString(',')
+		t = t[0 : len(t)-1]
+		params := make(map[string]string)
+		for buf.Buffered() > 0 {
+			p, _ := buf.ReadString(',')
+			if strings.HasSuffix(p, ",") {
+				p = p[0 : len(p)-1]
+			}
+			p = strings.TrimSpace(p)
+			if p == "" {
+				continue
+			}
+			data := strings.SplitN(p, "=", 2)
+			if len(data) == 2 {
+				params[data[0]] = data[1]
+			} else {
+				params[p] = ""
+			}
 		}
-		if t == "reply" && group {
+		if t == "reply" { // reply 特殊处理
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
 					log.Warnf("警告: 一条信息只能包含一个 Reply 元素.")
-					continue
+					return
 				}
 			}
-			mid, err := strconv.Atoi(d["id"])
+			mid, err := strconv.Atoi(params["id"])
 			if err == nil {
-				org := bot.GetGroupMessage(int32(mid))
+				org := bot.GetMessage(int32(mid))
 				if org != nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
@@ -247,25 +393,54 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 							Elements: bot.ConvertStringMessage(org["message"].(string), group),
 						},
 					}, r...)
-					continue
+					return
 				}
 			}
 		}
-		elem, err := bot.ToElement(t, d, group)
+		elem, err := bot.ToElement(t, params, group)
 		if err != nil {
+			org := "[" + string(cqCode) + "]"
 			if !IgnoreInvalidCQCode {
-				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将原样发送.", code, err)
+				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
-				r = append(r, message.NewText(code))
+				r = append(r, message.NewText(org))
 			} else {
-				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将忽略.", code, err)
+				log.Warnf("转换CQ码 %v 时出现错误: %v 将忽略.", org, err)
 			}
-			continue
+			return
+		}
+		switch i := elem.(type) {
+		case message.IMessageElement:
+			r = append(r, i)
+		case []message.IMessageElement:
+			r = append(r, i...)
 		}
-		r = append(r, elem)
 	}
-	if si != len(m) {
+	for hasNext() {
-		r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
+		ch := next()
+		switch stat {
+		case 0:
+			if isCQCodeBegin(ch) {
+				saveTempText()
+				tempText = append(tempText, []rune("[CQ:")...)
+				move(3)
+				stat = 1
+			} else {
+				tempText = append(tempText, ch)
+			}
+		case 1:
+			if isCQCodeBegin(ch) {
+				move(-1)
+				stat = 0
+			} else if ch == ']' {
+				saveCQCode()
+				stat = 0
+			} else {
+				cqCode = append(cqCode, ch)
+				tempText = append(tempText, ch)
+			}
+		}
 	}
+	saveTempText()
 	return
 }
 
@@ -279,9 +454,9 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 					return
 				}
 			}
-			mid, err := strconv.Atoi(e.Get("data").Get("id").Str)
+			mid, err := strconv.Atoi(e.Get("data").Get("id").String())
 			if err == nil {
-				org := bot.GetGroupMessage(int32(mid))
+				org := bot.GetMessage(int32(mid))
 				if org != nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
@@ -297,7 +472,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 		}
 		d := make(map[string]string)
 		e.Get("data").ForEach(func(key, value gjson.Result) bool {
-			d[key.Str] = value.Str
+			d[key.Str] = value.String()
 			return true
 		})
 		elem, err := bot.ToElement(t, d, group)
@@ -305,7 +480,13 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
 			return
 		}
-		r = append(r, elem)
+		switch i := elem.(type) {
+		case message.IMessageElement:
+			r = append(r, i)
+		case []message.IMessageElement:
+			r = append(r, i...)
+		}
+
 	}
 	if m.Type == gjson.String {
 		return bot.ConvertStringMessage(m.Str, group)
@@ -321,61 +502,88 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 	return
 }
 
-func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.IMessageElement, error) {
+// 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) {
 	switch t {
 	case "text":
 		return message.NewText(d["text"]), nil
 	case "image":
-		return bot.makeImageElem(t, d, group)
+		img, err := bot.makeImageElem(d, group)
-	case "poke":
+		if err != nil {
-		if !group {
+			return nil, err
-			return nil, errors.New("todo") // TODO: private poke
 		}
+		tp := d["type"]
+		if tp != "show" && tp != "flash" {
+			return img, nil
+		}
+		if i, ok := img.(*message.ImageElement); ok { // 秀图，闪照什么的就直接传了吧
+			if group {
+				img, err = bot.Client.UploadGroupImage(1, i.Data)
+			} else {
+				img, err = bot.Client.UploadPrivateImage(1, i.Data)
+			}
+			if err != nil {
+				return nil, err
+			}
+		}
+		switch tp {
+		case "flash":
+			if i, ok := img.(*message.GroupImageElement); ok {
+				return &message.GroupFlashPicElement{GroupImageElement: *i}, nil
+			}
+			if i, ok := img.(*message.FriendImageElement); ok {
+				return &message.FriendFlashPicElement{FriendImageElement: *i}, nil
+			}
+		case "show":
+			id, _ := strconv.ParseInt(d["id"], 10, 64)
+			if id < 40000 || id >= 40006 {
+				id = 40000
+			}
+			if i, ok := img.(*message.GroupImageElement); ok {
+				return &message.GroupShowPicElement{GroupImageElement: *i, EffectId: int32(id)}, nil
+			}
+			return img, nil // 私聊还没做
+		}
+
+	case "poke":
 		t, _ := strconv.ParseInt(d["qq"], 10, 64)
 		return &PokeElement{Target: t}, nil
-	case "record":
+	case "gift":
 		if !group {
-			return nil, errors.New("private voice unsupported now")
+			return nil, errors.New("private gift unsupported") // no free private gift
 		}
+		t, _ := strconv.ParseInt(d["qq"], 10, 64)
+		id, _ := strconv.Atoi(d["id"])
+		if id < 0 || id >= 14 {
+			return nil, errors.New("invalid gift id")
+		}
+		return &GiftElement{Target: t, GiftId: GiftId[id]}, nil
+	case "tts":
+		defer func() {
+			if r := recover(); r != nil {
+				m = nil
+				err = errors.New("tts 转换失败")
+			}
+		}()
+		data, err := bot.Client.GetTts(d["text"])
+		ioutil.WriteFile("tts.silk", data, 777)
+		if err != nil {
+			return nil, err
+		}
+		return &message.VoiceElement{Data: data}, nil
+	case "record":
 		f := d["file"]
-		var data []byte
+		data, err := global.FindFile(f, d["cache"], global.VOICE_PATH)
-		if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
+		if err != nil {
-			b, err := global.GetBytes(f)
+			return nil, err
-			if err != nil {
-				return nil, err
-			}
-			data = b
-		}
-		if strings.HasPrefix(f, "base64") {
-			b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
-			if err != nil {
-				return nil, err
-			}
-			data = b
-		}
-		if strings.HasPrefix(f, "file") {
-			fu, err := url.Parse(f)
-			if err != nil {
-				return nil, err
-			}
-			if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
-				fu.Path = fu.Path[1:]
-			}
-			b, err := ioutil.ReadFile(fu.Path)
-			if err != nil {
-				return nil, err
-			}
-			data = b
-		}
-		if global.PathExists(path.Join(global.VOICE_PATH, f)) {
-			b, err := ioutil.ReadFile(path.Join(global.VOICE_PATH, f))
-			if err != nil {
-				return nil, err
-			}
-			data = b
 		}
 		if !global.IsAMRorSILK(data) {
-			return nil, errors.New("unsupported voice file format (please use AMR file for now)")
+			data, err = global.Encoder(data)
+			if err != nil {
+				return nil, err
+			}
 		}
 		return &message.VoiceElement{Data: data}, nil
 	case "face":
@@ -417,8 +625,13 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 			if d["content"] != "" {
 				content = d["content"]
 			}
-			json := fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\": \"音乐\",\"meta\": {\"music\": {\"desc\": \"%s\",\"jumpUrl\": \"%s\",\"musicUrl\": \"%s\",\"preview\": \"%s\",\"tag\": \"QQ音乐\",\"title\": \"%s\"}},\"prompt\": \"[分享]%s\",\"ver\": \"0.0.0.1\",\"view\": \"music\"}", content, jumpUrl, purl, preview, name, name)
+			return &QQMusicElement{MusicElement: MusicElement{
-			return message.NewLightApp(json), nil
+				Title:      name,
+				Summary:    content,
+				Url:        jumpUrl,
+				PictureUrl: preview,
+				MusicUrl:   purl,
+			}}, nil
 		}
 		if d["type"] == "163" {
 			info, err := global.NeteaseMusicSongInfo(d["id"])
@@ -436,12 +649,44 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 			if info.Get("artists.0").Exists() {
 				artistName = info.Get("artists.0.name").Str
 			}
-			json := fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\":\"音乐\",\"view\":\"music\",\"prompt\":\"[分享]%s\",\"ver\":\"0.0.0.1\",\"meta\":{ \"music\": { \"desc\": \"%s\", \"jumpUrl\": \"%s\", \"musicUrl\": \"%s\", \"preview\": \"%s\", \"tag\": \"网易云音乐\", \"title\":\"%s\"}}}", name, artistName, jumpUrl, musicUrl, picUrl, name)
+			return &CloudMusicElement{MusicElement{
-			return message.NewLightApp(json), nil
+				Title:      name,
+				Summary:    artistName,
+				Url:        jumpUrl,
+				PictureUrl: picUrl,
+				MusicUrl:   musicUrl,
+			}}, nil
 		}
 		if d["type"] == "custom" {
+			if d["subtype"] == "qq" {
+				return &QQMusicElement{MusicElement{
+					Title:      d["title"],
+					Summary:    d["content"],
+					Url:        d["url"],
+					PictureUrl: d["image"],
+					MusicUrl:   d["purl"],
+				}}, nil
+			}
+			if d["subtype"] == "163" {
+				return &CloudMusicElement{MusicElement{
+					Title:      d["title"],
+					Summary:    d["content"],
+					Url:        d["url"],
+					PictureUrl: d["image"],
+					MusicUrl:   d["purl"],
+				}}, nil
+			}
+			if d["subtype"] == "migu" {
+				return &MiguMusicElement{MusicElement{
+					Title:      d["title"],
+					Summary:    d["content"],
+					Url:        d["url"],
+					PictureUrl: d["image"],
+					MusicUrl:   d["purl"],
+				}}, 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>`,
-				d["title"], d["url"], d["image"], d["audio"], d["title"], d["content"])
+				XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"]))
 			return &message.ServiceElement{
 				Id:      60,
 				Content: xml,
@@ -452,14 +697,12 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 	case "xml":
 		resId := d["resid"]
 		template := CQCodeEscapeValue(d["data"])
-		//println(template)
 		i, _ := strconv.ParseInt(resId, 10, 64)
 		msg := message.NewRichXml(template, i)
 		return msg, nil
 	case "json":
 		resId := d["resid"]
 		i, _ := strconv.ParseInt(resId, 10, 64)
-		log.Warnf("json msg=%s", d["data"])
 		if i == 0 {
 			//默认情况下走小程序通道
 			msg := message.NewLightApp(CQCodeUnescapeValue(d["data"]))
@@ -471,30 +714,37 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 	case "cardimage":
 		source := d["source"]
 		icon := d["icon"]
-		minwidth, _ := strconv.ParseInt(d["minwidth"], 10, 64)
+		minWidth, _ := strconv.ParseInt(d["minwidth"], 10, 64)
-		if minwidth == 0 {
+		if minWidth == 0 {
-			minwidth = 200
+			minWidth = 200
 		}
-		minheight, _ := strconv.ParseInt(d["minheight"], 10, 64)
+		minHeight, _ := strconv.ParseInt(d["minheight"], 10, 64)
-		if minheight == 0 {
+		if minHeight == 0 {
-			minheight = 200
+			minHeight = 200
 		}
-		maxwidth, _ := strconv.ParseInt(d["maxwidth"], 10, 64)
+		maxWidth, _ := strconv.ParseInt(d["maxwidth"], 10, 64)
-		if maxwidth == 0 {
+		if maxWidth == 0 {
-			maxwidth = 500
+			maxWidth = 500
 		}
-		maxheight, _ := strconv.ParseInt(d["maxheight"], 10, 64)
+		maxHeight, _ := strconv.ParseInt(d["maxheight"], 10, 64)
-		if maxheight == 0 {
+		if maxHeight == 0 {
-			maxheight = 1000
+			maxHeight = 1000
 		}
-		img, err := bot.makeImageElem(t, d, group)
+		img, err := bot.makeImageElem(d, group)
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
-		return bot.SendNewPic(img, source, icon, minwidth, minheight, maxwidth, maxheight, group)
+		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
 	default:
 		return nil, errors.New("unsupported cq code: " + t)
 	}
+	return nil, nil
+}
+
+func XmlEscape(c string) string {
+	buf := new(bytes.Buffer)
+	_ = xml2.EscapeText(buf, []byte(c))
+	return buf.String()
 }
 
 func CQCodeEscapeText(raw string) string {
@@ -526,7 +776,7 @@ func CQCodeUnescapeValue(content string) string {
 }
 
 // 图片 elem 生成器，单独拎出来，用于公用
-func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (message.IMessageElement, error) {
+func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessageElement, error) {
 	f := d["file"]
 	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
 		cache := d["cache"]
@@ -574,7 +824,7 @@ func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (mess
 		rawPath += ".cqimg"
 	}
 	if !global.PathExists(rawPath) && d["url"] != "" {
-		return bot.ToElement(t, map[string]string{"file": d["url"]}, group)
+		return bot.makeImageElem(map[string]string{"file": d["url"]}, group)
 	}
 	if global.PathExists(rawPath) {
 		b, err := ioutil.ReadFile(rawPath)
@@ -610,7 +860,7 @@ func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (mess
 		}
 		if size == 0 {
 			if url != "" {
-				return bot.ToElement(t, map[string]string{"file": url}, group)
+				return bot.makeImageElem(map[string]string{"file": url}, group)
 			}
 			return nil, errors.New("img size is 0")
 		}
@@ -621,7 +871,7 @@ func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (mess
 			rsp, err := bot.Client.QueryGroupImage(1, hash, size)
 			if err != nil {
 				if url != "" {
-					return bot.ToElement(t, map[string]string{"file": url}, group)
+					return bot.makeImageElem(map[string]string{"file": url}, group)
 				}
 				return nil, err
 			}
@@ -630,7 +880,7 @@ func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (mess
 		rsp, err := bot.Client.QueryFriendImage(1, hash, size)
 		if err != nil {
 			if url != "" {
-				return bot.ToElement(t, map[string]string{"file": url}, group)
+				return bot.makeImageElem(map[string]string{"file": url}, group)
 			}
 			return nil, err
 		}
@@ -639,10 +889,10 @@ func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (mess
 	return nil, errors.New("invalid image")
 }
 
-//SendNewPic 一种xml 方式发送的群消息图片
+//makeShowPic 一种xml 方式发送的群消息图片
-func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon string, minwidth int64, minheigt int64, maxwidth int64, maxheight int64, group bool) (*message.ServiceElement, error) {
+func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
-	var xml string
+	xml := ""
-	xml = ""
+	var suf message.IMessageElement
 	if i, ok := elem.(*message.ImageElement); ok {
 		if group == false {
 			gm, err := bot.Client.UploadPrivateImage(1, i.Data)
@@ -650,27 +900,32 @@ func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon s
 				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
 			}
-			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, minheigt, maxwidth, maxheight, source, icon)
+			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)
 		} else {
 			gm, err := bot.Client.UploadGroupImage(1, i.Data)
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
 			}
-			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, minheigt, maxwidth, maxheight, source, icon)
+			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)
 		}
 	}
+
 	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, minheigt, maxwidth, maxheight, source, icon)
+		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)
+		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, minheigt, maxwidth, maxheight, source, icon)
+		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)
+		suf = i
 	}
 	if xml != "" {
-		log.Warn(xml)
+		//log.Warn(xml)
-		XmlMsg := message.NewRichXml(xml, 5)
+		ret := []message.IMessageElement{suf}
-		return XmlMsg, nil
+		ret = append(ret, message.NewRichXml(xml, 5))
+		return ret, nil
 	}
-	return nil, errors.New("发送xml图片消息失败")
+	return nil, errors.New("生成xml图片消息失败")
 }

coolq/event.go

@@ -2,16 +2,17 @@ package coolq
 
 import (
 	"encoding/hex"
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
-	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"path"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/go-cqhttp/global"
+	log "github.com/sirupsen/logrus"
 )
 
 var format = "string"
@@ -31,18 +32,22 @@ func ToFormattedMessage(e []message.IMessageElement, code int64, raw ...bool) (r
 
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
 	if !m.Sender.IsFriend {
 		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
 	}
-	log.Infof("收到好友 %v(%v) 的消息: %v", m.Sender.DisplayName(), m.Sender.Uin, cqm)
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertPrivateMessage(m)
+	}
+	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	fm := MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "friend",
-		"message_id":   ToGlobalId(m.Sender.Uin, 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,
@@ -163,13 +168,24 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 
 func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
 	g := c.FindGroup(e.GroupCode)
-	if e.Time > 0 {
+	if e.TargetUin == 0 {
-		log.Infof("群 %v 内 %v 被 %v 禁言了 %v秒.",
+		if e.Time != 0 {
-			formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
+			log.Infof("群 %v 被 %v 开启全员禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+		} else {
+			log.Infof("群 %v 被 %v 解除全员禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+		}
 	} else {
-		log.Infof("群 %v 内 %v 被 %v 解除禁言.",
+		if e.Time > 0 {
-			formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
+			log.Infof("群 %v 内 %v 被 %v 禁言了 %v 秒.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
+		} else {
+			log.Infof("群 %v 内 %v 被 %v 解除禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
+		}
 	}
+
 	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"duration":    e.Time,
@@ -180,10 +196,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 		"user_id":     e.TargetUin,
 		"time":        time.Now().Unix(),
 		"sub_type": func() string {
-			if e.Time > 0 {
+			if e.Time == 0 {
-				return "ban"
+				return "lift_ban"
 			}
-			return "lift_ban"
+			return "ban"
 		}(),
 	})
 }
@@ -205,7 +221,7 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
 	})
 }
 
-func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEvent) {
+func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	group := c.FindGroup(e.From())
 	switch notify := e.(type) {
 	case *client.GroupPokeNotifyEvent:
@@ -264,20 +280,62 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEven
 	}
 }
 
+func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
+	friend := c.FindFriend(e.From())
+	switch notify := e.(type) {
+	case *client.FriendPokeNotifyEvent:
+		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
+		bot.dispatchEventMessage(MSG{
+			"post_type":   "notice",
+			"notice_type": "notify",
+			"sub_type":    "poke",
+			"self_id":     c.Uin,
+			"user_id":     notify.Sender,
+			"sender_id":   notify.Sender,
+			"target_id":   notify.Receiver,
+			"time":        time.Now().Unix(),
+		})
+	}
+}
+
 func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
 	f := c.FindFriend(e.FriendUin)
 	gid := ToGlobalId(e.FriendUin, e.MessageId)
-	log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
+	if f != nil {
+		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
+	} else {
+		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
+	}
 	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_recall",
 		"self_id":     c.Uin,
-		"user_id":     f.Uin,
+		"user_id":     e.FriendUin,
 		"time":        e.Time,
 		"message_id":  gid,
 	})
 }
 
+func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
+	f := c.FindFriend(e.Sender)
+	if f == nil {
+		return
+	}
+	log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"notice_type": "offline_file",
+		"user_id":     e.Sender,
+		"file": MSG{
+			"name": e.FileName,
+			"size": e.FileSize,
+			"url":  e.DownloadUrl,
+		},
+		"self_id": c.Uin,
+		"time":    time.Now().Unix(),
+	})
+}
+
 func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
 	log.Infof("Bot进入了群 %v.", formatGroupName(group))
 	bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin))
@@ -310,6 +368,20 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 	})
 }
 
+func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
+	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"notice_type": "group_card",
+		"group_id":    e.Group.Code,
+		"user_id":     e.Member.Uin,
+		"card_new":    e.Member.CardName,
+		"card_old":    e.OldCard,
+		"time":        time.Now().Unix(),
+		"self_id":     c.Uin,
+	})
+}
+
 func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *client.MemberJoinGroupEvent) {
 	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
 	bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
@@ -354,7 +426,6 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.invitedReqCache.Store(flag, e)
 	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
@@ -371,7 +442,6 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.joinReqCache.Store(flag, e)
 	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
@@ -438,6 +508,48 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 				}), 0644)
 			}
 			i.Filename = filename
+		case *message.GroupImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+		case *message.FriendImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+		case *message.GroupFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString("")
+				}), 0644)
+			}
+			i.Filename = filename
+		case *message.FriendFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString("")
+				}), 0644)
+			}
+			i.Filename = filename
 		case *message.VoiceElement:
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")

docs/EventFilter.md

@@ -110,16 +110,16 @@
 
 下面列出所有运算符（「要求的参数类型」是指运算符的键所对应的值的类型，「可作用于的类型」是指在过滤时事件对象相应值的类型）：
 
-| 运算符 | 要求的参数类型 | 可作用于的类型 |
+| 运算符      | 要求的参数类型             | 可作用于的类型                                        |
-| ----- | ------------ | ----------- |
+| ----------- | -------------------------- | ----------------------------------------------------- |
-| `.not` | object | 任何 |
+| `.not`      | object                     | 任何                                                  |
-| `.and` | object | 若参数中全为运算符，则任何；若不全为运算符，则 object |
+| `.and`      | object                     | 若参数中全为运算符，则任何；若不全为运算符，则 object |
-| `.or` | array（数组元素为 object） | 任何 |
+| `.or`       | array（数组元素为 object） | 任何                                                  |
-| `.eq` | 任何 | 任何 |
+| `.eq`       | 任何                       | 任何                                                  |
-| `.neq` | 任何 | 任何 |
+| `.neq`      | 任何                       | 任何                                                  |
-| `.in` | string/array | 若参数为 string，则 string；若参数为 array，则任何 |
+| `.in`       | string/array               | 若参数为 string，则 string；若参数为 array，则任何    |
-| `.contains` | string | string |
+| `.contains` | string                     | string                                                |
-| `.regex` | string | string |
+| `.regex`    | string                     | string                                                |
 
 
 ## 过滤时的事件数据对象

docs/QA.md

@@ -0,0 +1,5 @@
+# 常见问题
+
+### Q: 为什么挂一段时间后就会出现 `消息发送失败，账号可能被风控`?
+
+### A: 如果你刚开始使用 go-cqhttp 建议挂机3-7天，即可解除风控

docs/adminApi.md

@@ -0,0 +1,251 @@
+# 管理 API
+
+> 支持跨域
+
+## 公共参数
+
+参数:
+
+| 参数名       | 类型   | 说明                        |
+| ------------ | ------ | --------------------------- |
+| access_token | string | 校验口令，config.hjson中配置 |
+
+
+
+## admin/do_restart
+
+### 热重启
+
+> 热重启
+
+> ps: 目前不支持ws部分的修改生效
+
+method：`POST/GET`
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+
+### admin/get_web_write
+
+> 拉取验证码/设备锁
+
+method: `GET`
+
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
+
+返回：
+
+```json
+{"data": {"ispic": true,"picbase64":"xxxxx"}, "retcode": 0, "status": "ok"}
+```
+| 参数名   | 类型   | 说明                                                |
+| -------- | ------ | --------------------------------------------------- |
+| ispic    | bool   | 是否是验证码类型 true是，false为不是（比如设备锁    |
+| picbas64 | string | 验证码的base64编码内容，加上头，放入img标签即可显示 |
+
+### admin/do_web_write
+
+> web输入验证码/设备锁确认
+
+method: `POST` formdata
+
+
+参数:
+
+| 参数名 | 类型   | 说明       |
+| ------ | ------ | ---------- |
+| input  | string | 输入的内容 |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+
+### admin/do_restart_docker
+
+> 冷重启
+
+> 注意：此api 会直接结束掉进程，需要依赖docker/supervisor等进程管理工具来自动拉起
+
+method: `POST`
+
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/do_process_restart
+
+> 冷重启
+
+method: `POST`
+
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/do_config_base
+
+> 基础配置
+
+method: `POST` formdata
+
+
+参数:
+
+| 参数名       | 类型   | 说明                                  |
+| ------------ | ------ | ------------------------------------- |
+| uin          | string | qq号                                  |
+| password     | string | qq密码                                |
+| enable_db    | string | 是否启动数据库,填 'true' 或者 'false' |
+| access_token | string | 授权 token                            |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+
+### admin/do_config_http
+
+> http服务配置
+
+method: `POST` formdata
+
+参数:
+
+| 参数名      | 类型   | 说明                                          |
+| ----------- | ------ | --------------------------------------------- |
+| port        | string | 服务端口                                      |
+| host        | string | 服务监听地址                                  |
+| enable      | string | 是否启用 ,填 'true' 或者 'false'              |
+| timeout     | string | http请求超时时间                              |
+| post_url    | string | post上报地址 不需要就填空字符串，或者不填     |
+| post_secret | string | post上报的secret 不需要就填空字符串，或者不填 |
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+
+### admin/do_config_ws
+
+> 正向ws设置
+
+method: `POST` formdata
+
+参数:
+
+| 参数名 | 类型   | 说明                             |
+| ------ | ------ | -------------------------------- |
+| port   | string | 服务端口                         |
+| host   | string | 服务监听地址                     |
+| enable | string | 是否启用 ,填 'true' 或者 'false' |
+
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/do_config_reverse
+
+> 反向ws配置
+
+method: `POST` formdata
+
+参数:
+
+| 参数名 | 类型   | 说明                             |
+| ------ | ------ | -------------------------------- |
+| port   | string | 服务端口                         |
+| host   | string | 服务监听地址                     |
+| enable | string | 是否启用 ,填 'true' 或者 'false' |
+
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/do_config_json
+
+> 直接修改 config.hjson配置
+
+method: `POST` formdata
+
+参数:
+
+| 参数名 | 类型   | 说明                                |
+| ------ | ------ | ----------------------------------- |
+| json   | string | 完整的config.hjson的配合，json字符串 |
+
+
+返回：
+
+```json
+{"data": {}, "retcode": 0, "status": "ok"}
+```
+
+### admin/get_config_json
+
+> 获取当前 config.hjson配置
+
+method: `GET`
+
+参数:
+
+| 参数名 | 类型 | 说明 |
+| ------ | ---- | ---- |
+| 无     |      |      |
+
+
+返回：
+
+```json
+{"data": {"config":"xxxx"}, "retcode": 0, "status": "ok"}
+```
+
+| 参数名 | 类型   | 说明                                |
+| ------ | ------ | ----------------------------------- |
+| config | string | 完整的config.hjson的配合，json字符串 |
+

docs/config.md

@@ -1,6 +1,6 @@
 # 配置
 
-go-cqhttp 包含 `config.json` 和 `device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息.
+go-cqhttp 包含 `config.hjson` 和 `device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息.
 
 ## 从原CQHTTP导入配置
 
@@ -36,6 +36,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 	"ignore_invalid_cqcode": false,
 	"force_fragmented": true,
 	"heartbeat_interval": 5,
+    "use_sso_address": false,
 	"http_config": {
 		"enabled": true,
 		"host": "0.0.0.0",
@@ -60,28 +61,29 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 }
 ````
 
-| 字段               | 类型     | 说明                                                                |
+| 字段                  | 类型     | 说明                                                                                     |
-| ------------------ | -------- | ------------------------------------------------------------------- |
+| --------------------- | -------- | ---------------------------------------------------------------------------------------- |
-| uin                  | int64    | 登录用QQ号                                                          |
+| uin                   | int64    | 登录用QQ号                                                                               |
-| password             | string   | 登录用密码                                                          |
+| password              | string   | 登录用密码                                                                               |
-| encrypt_password     | bool     | 是否对密码进行加密.                                                   |
+| encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
-| password_encrypted   | string   | 加密后的密码(请勿修改)                                                |
+| password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
-| enable_db            | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口          |
+| enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
-| access_token         | string   | 同CQHTTP的 `access_token`  用于身份验证                              |
+| access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
-| relogin              | bool     | 是否自动重新登录                                                     |
+| relogin               | bool     | 是否自动重新登录                                                                         |
-| relogin_delay        | int      | 重登录延时（秒）                                                     |
+| relogin_delay         | int      | 重登录延时（秒）                                                                         |
-| max_relogin_times    | uint     | 最大重登录次数，若0则不设置上限                                        |
+| max_relogin_times     | uint     | 最大重登录次数，若0则不设置上限                                                          |
-| _rate_limit          | bool     | 是否启用API调用限速                                                  |
+| _rate_limit           | bool     | 是否启用API调用限速                                                                      |
-| frequency            | float64  | 1s内能调用API的次数                                                  |
+| frequency             | float64  | 1s内能调用API的次数                                                                      |
-| bucket_size          | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                 |
+| bucket_size           | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                               |
-| post_message_format  | string   | 上报信息类型                                                        |
+| post_message_format   | string   | 上报信息类型                                                                             |
-| ignore_invalid_cqcode| bool     | 是否忽略错误的CQ码                                                   |
+| ignore_invalid_cqcode | bool     | 是否忽略错误的CQ码                                                                       |
-| force_fragmented     | bool     | 是否强制分片发送群长消息                                              |
+| force_fragmented      | bool     | 是否强制分片发送群长消息                                                                 |
-| heartbeat_interval   | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)        |
+| use_sso_address       | bool     | 是否使用服务器下发的地址                                                                 |
-| http_config          | object   | HTTP API配置                                                       |
+| heartbeat_interval    | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)                              |
-| ws_config            | object   | Websocket API 配置                                                 |
+| http_config           | object   | HTTP API配置                                                                             |
-| ws_reverse_servers   | object[] | 反向 Websocket API 配置                                             |
+| ws_config             | object   | Websocket API 配置                                                                       |
-| log_level            | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error|
+| ws_reverse_servers    | object[] | 反向 Websocket API 配置                                                                  |
+| log_level             | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error |
 
 > 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
 > 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
@@ -108,10 +110,23 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 
 在大部分情况下 我们只需要关心 `protocol` 字段: 
 
-| 值   | 类型          | 限制                                                  |
+| 值  | 类型          | 限制                                                             |
-| ---- | ------------- | ----------------------------------------------------- |
+| --- | ------------- | ---------------------------------------------------------------- |
-| 0    | Android Pad   | 无法接收 `group_notify` 事件、无法接收口令红包        |
+| 0   | iPad          | 无                                                                        |
-| 1    | Android Phone | 无                                                    |
+| 1   | Android Phone | 无法接收新版表情如 `/吃瓜 /汪汪`, 会自动转换为字符串                            |
-| 2    | Android Watch | 除了 `Android Pad` 有的限制外还包括: 无法接收撤回消息 |
+| 2   | Android Watch | 除`Android Phone`的限制外, 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息 |
+| 3   | MacOS         | 无                                                                             |
 
-> 注意, 根据协议的不同, 各类消息有所限制
+> 注意, 根据协议的不同, 各类消息有所限制
+
+## 自定义服务器IP
+
+> 某些海外服务器使用默认地址可能会存在链路问题，此功能可以指定 go-cqhttp 连接哪些地址以达到最优化.
+
+将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
+
+示例:
+````
+1.1.1.1:53
+1.1.2.2:8899
+````

docs/cqhttp.md

@@ -4,6 +4,28 @@
 
 ## CQCode
 
+### 图片
+
+| 参数名  | 可能的值        | 说明                                                            |
+| ------- | --------------- | --------------------------------------------------------------- |
+| `file`  | -               | 图片文件名                                                      |
+| `type`  | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片       |
+| `url`   | -               | 图片 URL                                                        |
+| `cache` | `0` `1`         | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
+| `id`    | -               | 发送秀图时的特效id，默认为40000                                 |
+
+可用的特效ID:
+
+| id    | 类型 |
+| ----- | ---- |
+| 40000 | 普通 |
+| 40001 | 幻影 |
+| 40002 | 抖动 |
+| 40003 | 生日 |
+| 40004 | 爱你 |
+| 40005 | 征友 |
+
+
 ### 回复
 
 Type : `reply`
@@ -42,12 +64,50 @@ Type: `poke`
 
 参数:
 
-| 参数名 | 类型   | 说明        |
+| 参数名 | 类型  | 说明         |
-| ------ | ------ | ----------- |
+| ------ | ----- | ------------ |
-| qq     | int64  | 需要戳的成员 |
+| qq     | int64 | 需要戳的成员 |
 
 示例: `[CQ:poke,qq=123456]`
 
+### 礼物
+
+> 注意：仅支持免费礼物,发送群礼物消息无法撤回,返回的 `message id`  恒定为 `0`
+
+Type: `gift`
+
+范围: **发送(仅群聊,接收的时候不是CQ码)**
+
+参数:
+
+| 参数名 | 类型  | 说明           |
+| ------ | ----- | -------------- |
+| qq     | int64 | 接收礼物的成员 |
+| id     | int   | 礼物的类型     |
+
+目前支持的礼物ID:
+
+| id  | 类型       |
+| --- | ---------- |
+| 0   | 甜Wink     |
+| 1   | 快乐肥宅水 |
+| 2   | 幸运手链   |
+| 3   | 卡布奇诺   |
+| 4   | 猫咪手表   |
+| 5   | 绒绒手套   |
+| 6   | 彩虹糖果   |
+| 7   | 坚强       |
+| 8   | 告白话筒   |
+| 9   | 牵你的手   |
+| 10  | 可爱猫咪   |
+| 11  | 神秘面具   |
+| 12  | 我超忙的   |
+| 13  | 爱心口罩   |
+
+
+
+示例: `[CQ:gift,qq=123456,id=8]`
+
  ### 合并转发
 
 Type: `forward`
@@ -56,8 +116,8 @@ Type: `forward`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                                                          |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ------------------------------------------------------------- |
 | id     | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
 
 示例: `[CQ:forward,id=xxxx]`
@@ -70,12 +130,12 @@ Type: `node`
 
 参数:
 
-| 参数名  | 类型    | 说明           | 特殊说明                                                     |
+| 参数名  | 类型    | 说明           | 特殊说明                                                                               |
-| ------- | ------- | -------------- | ------------------------------------------------------------ |
+| ------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
 | id      | int32   | 转发消息id     | 直接引用他人的消息合并转发,  实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
-| name    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) |
+| name    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序)                  |
-| uin     | int64   | 发送者QQ号     | 用于自定义消息                                               |
+| uin     | int64   | 发送者QQ号     | 用于自定义消息                                                                         |
-| content | message | 具体消息       | 用于自定义消息 **不支持转发套娃，不支持引用回复**            |
+| content | message | 具体消息       | 用于自定义消息 **不支持转发套娃，不支持引用回复**                                      |
 
 特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.  另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
@@ -157,16 +217,16 @@ Type: `xml`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                                      |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ----------------------------------------- |
-| data     | string | xml内容，xml中的value部分，记得实体化处理|
+| data   | string | xml内容，xml中的value部分，记得实体化处理 |
-| resid     | int32 | 可以不填|
+| resid  | int32  | 可以不填                                  |
 
 示例: `[CQ:xml,data=xxxx]`
 
-####一些xml样例
+#### 一些xml样例
 
-####ps:重要：xml中的value部分，记得html实体化处理后，再打加入到cq码中
+#### ps:重要：xml中的value部分，记得html实体化处理后，再打加入到cq码中
 
 #### qq音乐
 
@@ -206,10 +266,10 @@ Type: `json`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名 | 类型   | 说明                                            |
-| ------ | ------ | ------------------------------------------------------------ |
+| ------ | ------ | ----------------------------------------------- |
-| data     | string | json内容，json的所有字符串记得实体化处理|
+| data   | string | json内容，json的所有字符串记得实体化处理        |
-| resid     | int32 | 默认不填为0，走小程序通道，填了走富文本通道发送|
+| resid  | int32  | 默认不填为0，走小程序通道，填了走富文本通道发送 |
 
 json中的字符串需要进行转义：
 
@@ -239,15 +299,15 @@ Type: `cardimage`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                         |
+| 参数名    | 类型   | 说明                                  |
-| ------ | ------ | ------------------------------------------------------------ |
+| --------- | ------ | ------------------------------------- |
-| file     | string | 和image的file字段对齐，支持也是一样的|
+| file      | string | 和image的file字段对齐，支持也是一样的 |
-| minwidth     | int64 | 默认不填为400，最小width|
+| minwidth  | int64  | 默认不填为400，最小width              |
-| minheight     | int64 | 默认不填为400，最小height|
+| minheight | int64  | 默认不填为400，最小height             |
-| maxwidth     | int64 | 默认不填为500，最大width|
+| maxwidth  | int64  | 默认不填为500，最大width              |
-| maxheight     | int64 | 默认不填为1000，最大height|
+| maxheight | int64  | 默认不填为1000，最大height            |
-| source     | string | 分享来源的名称，可以留空|
+| source    | string | 分享来源的名称，可以留空              |
-| icon     | string | 分享来源的icon图标url，可以留空|
+| icon      | string | 分享来源的icon图标url，可以留空       |
 
 
 示例cardimage 的cq码：
@@ -255,6 +315,22 @@ Type: `cardimage`
 [CQ:cardimage,file=https://i.pixiv.cat/img-master/img/2020/03/25/00/00/08/80334602_p0_master1200.jpg]
 ```
 
+### 文本转语音
+
+> 注意：通过TX的TTS接口，采用的音源与登录账号的性别有关
+
+Type: `tts`
+
+范围: **发送(仅群聊)**
+
+参数:
+
+| 参数名 | 类型   | 说明 |
+| ------ | ------ | ---- |
+| text   | string | 内容 |
+
+示例: `[CQ:tts,text=这是一条测试消息]`
+
 ## API
 
 ### 设置群名
@@ -263,10 +339,32 @@ Type: `cardimage`
 
 **参数** 
 
-| 字段     | 类型   | 说明 |
+| 字段       | 类型   | 说明 |
-| -------- | ------ | ---- |
+| ---------- | ------ | ---- |
-| group_id | int64  | 群号 |
+| group_id   | int64  | 群号 |
-| group_name     | string | 新名 |
+| group_name | string | 新名 |
+
+### 设置群头像
+
+终结点: `/set_group_portrait`  
+
+**参数** 
+
+| 字段     | 类型   | 说明                     |
+| -------- | ------ | ------------------------ |
+| group_id | int64  | 群号                     |
+| file     | string | 图片文件名               |
+| cache    | int    | 表示是否使用已缓存的文件 |
+
+[1]`file` 参数支持以下几种格式：
+
+- 绝对路径，例如 `file:///C:\\Users\Richard\Pictures\1.png`，格式使用 [`file` URI](https://tools.ietf.org/html/rfc8089)
+- 网络 URL，例如 `http://i1.piimg.com/567571/fdd6e7b6d93f1ef0.jpg`
+- Base64 编码，例如 `base64://iVBORw0KGgoAAAANSUhEUgAAABQAAAAVCAIAAADJt1n/AAAAKElEQVQ4EWPk5+RmIBcwkasRpG9UM4mhNxpgowFGMARGEwnBIEJVAAAdBgBNAZf+QAAAAABJRU5ErkJggg==`
+
+[2]`cache`参数: 通过网络 URL 发送时有效，`1`表示使用缓存，`0`关闭关闭缓存，默认 为`1`
+
+[3] 目前这个API在登录一段时间后因cookie失效而失效，请考虑后使用
 
 ### 获取图片信息
 
@@ -288,9 +386,9 @@ Type: `cardimage`
 | `filename` | string | 图片文件原名   |
 | `url`      | string | 图片下载地址   |
 
-### 获取群消息
+### 获取消息
 
-终结点: `/get_group_msg` 
+终结点: `/get_msg` 
 
 参数
 
@@ -306,7 +404,7 @@ Type: `cardimage`
 | `real_id`    | int32   | 消息真实id |
 | `sender`     | object  | 发送者     |
 | `time`       | int32   | 发送时间   |
-| `content`    | message | 消息内容   |
+| `message`    | message | 消息内容   |
 
 ### 获取合并转发内容
 
@@ -364,7 +462,222 @@ Type: `cardimage`
 | `group_id` | int64          | 群号                         |
 | `messages` | forward node[] | 自定义转发消息, 具体看CQCode |
 
-### 
+### 获取中文分词
+
+终结点: `/.get_word_slices`  
+
+**参数** 
+
+| 字段      | 类型   | 说明 |
+| --------- | ------ | ---- |
+| `content` | string | 内容 |
+
+**响应数据**
+
+| 字段     | 类型     | 说明 |
+| -------- | -------- | ---- |
+| `slices` | string[] | 词组 |
+
+### 图片OCR
+
+> 注意: 目前图片OCR接口仅支持接受的图片
+
+终结点: `/.ocr_image` 
+
+**参数** 
+
+| 字段    | 类型   | 说明   |
+| ------- | ------ | ------ |
+| `image` | string | 图片ID |
+
+**响应数据**
+
+| 字段       | 类型            | 说明    |
+| ---------- | --------------- | ------- |
+| `texts`    | TextDetection[] | OCR结果 |
+| `language` | string          | 语言    |
+
+**TextDetection**
+
+| 字段          | 类型    | 说明   |
+| ------------- | ------- | ------ |
+| `text`        | string  | 文本   |
+| `confidence`  | int32   | 置信度 |
+| `coordinates` | vector2 | 坐标   |
+
+
+### 获取群系统消息
+
+终结点: `/get_group_system_msg`
+
+**响应数据**
+
+| 字段               | 类型             | 说明         |
+| ------------------ | ---------------- | ------------ |
+| `invited_requests` | InvitedRequest[] | 邀请消息列表 |
+| `join_requests`    | JoinRequest[]    | 进群消息列表 |
+
+ > 注意: 如果列表不存在任何消息, 将返回 `null`
+
+ **InvitedRequest**
+
+| 字段           | 类型   | 说明              |
+| -------------- | ------ | ----------------- |
+| `request_id`   | int64  | 请求ID            |
+| `invitor_uin`  | int64  | 邀请者            |
+| `invitor_nick` | string | 邀请者昵称        |
+| `group_id`     | int64  | 群号              |
+| `group_name`   | string | 群名              |
+| `checked`      | bool   | 是否已被处理      |
+| `actor`        | int64  | 处理者, 未处理为0 |
+
+  **JoinRequest**
+
+| 字段             | 类型   | 说明              |
+| ---------------- | ------ | ----------------- |
+| `request_id`     | int64  | 请求ID            |
+| `requester_uin`  | int64  | 请求者ID          |
+| `requester_nick` | string | 请求者昵称        |
+| `message`        | string | 验证消息          |
+| `group_id`       | int64  | 群号              |
+| `group_name`     | string | 群名              |
+| `checked`        | bool   | 是否已被处理      |
+| `actor`          | int64  | 处理者, 未处理为0 |
+
+### 获取群文件系统信息
+
+终结点: `/get_group_file_system_info`
+
+**参数** 
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `group_id` | int64 | 群号 |
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `file_count`  | int32 | 文件总数   |
+| `limit_count` | int32 | 文件上限   |
+| `used_space`  | int64 | 已使用空间 |
+| `total_space` | int64 | 空间上限   |
+
+### 获取群根目录文件列表
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_root_files`
+
+**参数** 
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `group_id` | int64 | 群号 |
+
+**响应数据**
+
+| 字段      | 类型     | 说明       |
+| --------- | -------- | ---------- |
+| `files`   | File[]   | 文件列表   |
+| `folders` | Folder[] | 文件夹列表 |
+
+### 获取群子目录文件列表
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_files_by_folder`
+
+**参数** 
+
+| 字段        | 类型   | 说明                        |
+| ----------- | ------ | --------------------------- |
+| `group_id`  | int64  | 群号                        |
+| `folder_id` | string | 文件夹ID 参考 `Folder` 对象 |
+
+**响应数据**
+
+| 字段      | 类型     | 说明       |
+| --------- | -------- | ---------- |
+| `files`   | File[]   | 文件列表   |
+| `folders` | Folder[] | 文件夹列表 |
+
+### 获取群文件资源链接
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_file_url`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `group_id` | int64  | 群号                      |
+| `file_id`  | string | 文件ID 参考 `File` 对象   |
+| `busid`    | int32  | 文件类型 参考 `File` 对象 |
+
+**响应数据**
+
+| 字段  | 类型   | 说明         |
+| ----- | ------ | ------------ |
+| `url` | string | 文件下载链接 |
+
+ **File**
+
+| 字段             | 类型   | 说明                   |
+| ---------------- | ------ | ---------------------- |
+| `file_id`        | string | 文件ID                 |
+| `file_name`      | string | 文件名                 |
+| `busid`          | int32  | 文件类型               |
+| `file_size`      | int64  | 文件大小               |
+| `upload_time`    | int64  | 上传时间               |
+| `dead_time`      | int64  | 过期时间,永久文件恒为0 |
+| `modify_time`    | int64  | 最后修改时间           |
+| `download_times` | int32  | 下载次数               |
+| `uploader`       | int64  | 上传者ID               |
+| `uploader_name`  | string | 上传者名字             |
+
+ **Folder**
+
+| 字段               | 类型   | 说明       |
+| ------------------ | ------ | ---------- |
+| `folder_id`        | string | 文件夹ID   |
+| `folder_name`      | string | 文件名     |
+| `create_time`      | int64  | 创建时间   |
+| `creator`          | int64  | 创建者     |
+| `creator_name`     | string | 创建者名字 |
+| `total_file_count` | int32  | 子文件数量 |
+
+### 获取状态
+
+终结点: `/get_status`
+
+**响应数据**
+
+| 字段            | 类型       | 说明                            |
+| --------------- | ---------- | ------------------------------- |
+| app_initialized | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| app_enabled     | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| plugins_good    | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| app_good        | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| online          | bool       | 表示BOT是否在线                 |
+| goold           | bool       | 同 `online`                     |
+| stat            | Statistics | 运行统计                        |
+
+**Statistics**
+
+
+| 字段             | 类型   | 说明             |
+| ---------------- | ------ | ---------------- |
+| packet_received  | uint64 | 收到的数据包总数 |
+| packet_sent      | uint64 | 发送的数据包总数 |
+| packet_lost      | uint32 | 数据包丢失总数   |
+| message_received | uint64 | 接受信息总数     |
+| message_sent     | uint64 | 发送信息总数     |
+| disconnect_times | uint32 | TCP链接断开次数  |
+| lost_times       | uint32 | 账号掉线次数     |
+
+> 注意: 所有统计信息都将在重启后重制
 
 ## 事件
 
@@ -385,12 +698,12 @@ Type: `cardimage`
 
 **上报数据**
 
-| 字段          | 类型   | 可能的值       | 说明           |
+| 字段          | 类型   | 可能的值        | 说明           |
-| ------------- | ------ | -------------- | -------------- |
+| ------------- | ------ | --------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
+| `post_type`   | string | `notice`        | 上报类型       |
-| `notice_type` | string | `friend_recall`| 消息类型       |
+| `notice_type` | string | `friend_recall` | 消息类型       |
-| `user_id`     | int64  |                | 好友id        |
+| `user_id`     | int64  |                 | 好友id         |
-| `message_id`  | int64  |                | 被撤回的消息id |
+| `message_id`  | int64  |                 | 被撤回的消息id |
 
 #### 群内戳一戳
 
@@ -398,14 +711,14 @@ Type: `cardimage`
 
 **上报数据**
 
-| 字段          | 类型   | 可能的值       | 说明           |
+| 字段          | 类型   | 可能的值 | 说明     |
-| ------------- | ------ | -------------- | -------------- |
+| ------------- | ------ | -------- | -------- |
-| `post_type`   | string | `notice`       | 上报类型       |
+| `post_type`   | string | `notice` | 上报类型 |
-| `notice_type` | string | `notify` | 消息类型       |
+| `notice_type` | string | `notify` | 消息类型 |
-| `group_id` | int64 |  | 群号 |
+| `group_id`    | int64  |          | 群号     |
-| `sub_type` | string | `poke` | 提示类型 |
+| `sub_type`    | string | `poke`   | 提示类型 |
-| `user_id`     | int64  |                | 发送者id    |
+| `user_id`     | int64  |          | 发送者id |
-| `target_id` | int64 | | 被戳者id |
+| `target_id`   | int64  |          | 被戳者id |
 
 #### 群红包运气王提示
 
@@ -413,14 +726,14 @@ Type: `cardimage`
 
 **上报数据**
 
-| 字段          | 类型   | 可能的值       | 说明           |
+| 字段          | 类型   | 可能的值     | 说明         |
-| ------------- | ------ | -------------- | -------------- |
+| ------------- | ------ | ------------ | ------------ |
-| `post_type`   | string | `notice`       | 上报类型       |
+| `post_type`   | string | `notice`     | 上报类型     |
-| `notice_type` | string | `notify` | 消息类型       |
+| `notice_type` | string | `notify`     | 消息类型     |
-| `group_id` | int64 |  | 群号 |
+| `group_id`    | int64  |              | 群号         |
-| `sub_type` | string | `lucky_king` | 提示类型 |
+| `sub_type`    | string | `lucky_king` | 提示类型     |
-| `user_id`     | int64  |                | 红包发送者id |
+| `user_id`     | int64  |              | 红包发送者id |
-| `target_id` | int64 | | 运气王id |
+| `target_id`   | int64  |              | 运气王id     |
 
 #### 群成员荣誉变更提示
 
@@ -428,11 +741,47 @@ Type: `cardimage`
 
 **上报数据**
 
-| 字段          | 类型   | 可能的值       | 说明           |
+| 字段          | 类型   | 可能的值                                                 | 说明     |
-| ------------- | ------ | -------------- | -------------- |
+| ------------- | ------ | -------------------------------------------------------- | -------- |
-| `post_type`   | string | `notice`       | 上报类型       |
+| `post_type`   | string | `notice`                                                 | 上报类型 |
-| `notice_type` | string | `notify` | 消息类型       |
+| `notice_type` | string | `notify`                                                 | 消息类型 |
-| `group_id` | int64 |  | 群号 |
+| `group_id`    | int64  |                                                          | 群号     |
-| `sub_type` | string | `honor` | 提示类型 |
+| `sub_type`    | string | `honor`                                                  | 提示类型 |
-| `user_id`     | int64  |                | 成员id |
+| `user_id`     | int64  |                                                          | 成员id   |
-| `honor_type` | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
+| `honor_type`  | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
+
+#### 群成员名片更新
+
+> 注意: 此事件不保证时效性，仅在收到消息时校验卡片
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值     | 说明     |
+| ------------- | ------ | ------------ | -------- |
+| `post_type`   | string | `notice`     | 上报类型 |
+| `notice_type` | string | `group_card` | 消息类型 |
+| `group_id`    | int64  |              | 群号     |
+| `user_id`     | int64  |              | 成员id   |
+| `card_new`    | int64  |              | 新名片   |
+| `card_old`    | int64  |              | 旧名片   |
+
+> PS: 当名片为空时 `card_xx` 字段为空字符串, 并不是昵称
+
+#### 接收到离线文件
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明     |
+| ------------- | ------ | -------------- | -------- |
+| `post_type`   | string | `notice`       | 上报类型 |
+| `notice_type` | string | `offline_file` | 消息类型 |
+| `user_id`     | int64  |                | 发送者id |
+| `file`        | object |                | 文件数据 |
+
+**file object**
+
+| 字段   | 类型   | 可能的值 | 说明     |
+| ------ | ------ | -------- | -------- |
+| `name` | string |          | 文件名   |
+| `size` | int64  |          | 文件大小 |
+| `url`  | string |          | 下载链接 |

docs/file.md

@@ -5,9 +5,8 @@ go-cqhttp 默认生成的文件树如下所示:
 ````
 .
 ├── go-cqhttp
-├── config.json
+├── config.hjson
 ├── device.json
-├── servers.bin
 ├── logs
 │   └── xx-xx-xx.log
 └── data
@@ -19,9 +18,8 @@ go-cqhttp 默认生成的文件树如下所示:
 | 文件        | 用途                |
 | ----------- | ------------------- |
 | go-cqhttp   | go-cqhttp可执行文件 |
-| config.json | 运行配置文件        |
+| config.hjson | 运行配置文件        |
 | device.json | 虚拟设备配置文件    |
-| servers.bin | 储存QQ服务器地址    |
 | logs        | 日志存放目录        |
 | data        | 数据目录            |
 | data/images | 图片缓存目录        |

docs/quick_start.md

@@ -1,3 +1,147 @@
 #  开始
 
-欢迎来到 go-cqhttp 文档
+欢迎来到 go-cqhttp 文档 目前还在咕
+
+# 基础教程
+## 下载
+从[release](https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
+
+- Windows下32位文件为  `go-cqhttp-v*-windows-386.zip`
+- Windows下64位文件为 `go-cqhttp-v*-windows-amd64.zip`
+- Windows下arm用(如使用高通CPU的笔记本)文件为 `go-cqhttp-v*-windows-arm.zip`
+- Linux下32位文件为 `go-cqhttp-v*-linux-386.tar.gz`
+- Linux下64位文件为 `go-cqhttp-v*-linux-amd64.tar.gz`
+- Linux下arm用(如树莓派)文件为 `go-cqhttp-v*-linux-arm.tar.gz`
+- MD5文件为 `*.md5` ，用于校验文件完整性
+- 如果没有你所使用的系统版本或者希望自己构建，请移步[进阶指南-如何自己构建](#如何自己构建)
+
+## 解压
+
+- Windows下请使用自己熟悉的解压软件自行解压
+- Linux下在命令行中输入 `tar -xzvf [文件名]` 
+
+## 使用
+
+### Windows
+
+#### 标准方法
+
+1.  双击`go-cqhttp.exe`此时将提示
+```
+[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
+[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
+```
+2. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
+3. 再次双击`go-cqhttp.exe`
+```
+[INFO]: 登录成功 欢迎使用: balabala
+```
+
+如出现需要认证的信息，请自行认证设备。
+
+此时，基础配置完成
+
+#### 懒人法
+
+1. [下载包含Windows.bat的zip](https://github.com/fkx4-p/go-cqhttp-lazy/archive/master.zip)
+2. 解压
+3. 将`Windows.bat`复制/剪切到**go-cqhttp**文件夹
+4. 双击运行
+
+效果如下
+
+```
+QQ account:
+[QQ账号]
+QQ password:
+[QQ密码]
+enable http?(Y/n)
+[是否开启http(y/n),默认开启]
+enable ws?(Y/n)
+[是否开启websocket(y/n),默认开启]
+请按任意键继续. . .
+```
+
+5. 双击`go-cqhttp.exe`
+```
+[INFO]: 登录成功 欢迎使用: balabala
+```
+
+如出现需要认证的信息，请自行认证设备。
+
+此时，基础配置完成
+
+### Linux
+
+#### 标准方法
+
+1. 打开一个命令行/ssh
+2. `cd`到解压目录
+3. 输入 `./go-cqhttp`，`Enter`运行 ，此时将提示
+```
+[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
+[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
+```
+
+4. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
+5. 再次输入 `./go-cqhttp`，`Enter`运行
+```
+[INFO]: 登录成功 欢迎使用: balabala
+```
+
+如出现需要认证的信息，请自行认证设备。
+
+此时，基础配置完成
+
+#### 懒人法
+
+暂时咕咕咕了
+
+## 验证http是否成功配置
+
+此时，如果在本地开启的服务器，可以在浏览器输入`http://127.0.0.1:5700/send_private_msg?user_id=[接收者qq号]&message=[发送的信息]`来发送一条测试信息
+
+如果出现`{"data":{"message_id":balabala},"retcode":0,"status":"ok"}`则证明已经成功配置HTTP
+
+*注：请 连 中括号 也替换掉，就像这样：*`http://127.0.0.1:5700/send_private_msg?user_id=10001&message=ffeecoishp`
+
+# 进阶指南
+
+## 如何自己构建
+
+1. [下载源码](https://github.com/Mrs4s/go-cqhttp/archive/master.zip)并解压 || 使用`git clone https://github.com/Mrs4s/go-cqhttp.git`来拉取
+
+2. [下载golang binary release](https://golang.google.cn/dl/)并安装或者[自己构建golang](https://golang.google.cn/doc/install/source)
+
+3. 在`cmd`或Linux命令行中，`cd`到目录中
+
+4. 输入`go build -ldflags "-s -w -extldflags '-static'"`，`Enter`运行
+
+*注：可以使用*`go env -w GOPROXY=https://goproxy.cn,direct`*来加速国内依赖安装速度*
+
+## 更新
+
+### 方法一
+
+从[release](https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
+并替换之前的版本
+
+### 方法二
+
+使用更新参数，在命令行中打开go-cqhttp所在目录
+#### windows
+输入指令
+`go-cqhttp.exe update`
+
+如果在国内连接github下载速度可能很慢，可以使用镜像源下载
+
+`go-cqhttp.exe update https://github.rc1844.workers.dev`
+
+几个可用的镜像源
+- `https://hub.fastgit.org`
+- `https://github.com.cnpmjs.org`
+- `https://github.bajins.com`
+- `https://github.rc1844.workers.dev`
+
+#### linux
+方法与windows基本一致，将 `go-cqhttp.exe` 替换为 `./go-cqhttp`即可

global/codec.go

@@ -0,0 +1,45 @@
+package global
+
+import (
+	"crypto/md5"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"path"
+	"sync"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/wdvxdr1123/go-silk/silk"
+)
+
+var codec silk.Encoder
+var useCodec = true
+var once sync.Once
+
+func InitCodec() {
+	once.Do(func() {
+		log.Info("正在加载silk编码器...")
+		err := codec.Init("data/cache", "codec")
+		if err != nil {
+			log.Error(err)
+			useCodec = false
+		}
+	})
+}
+
+func Encoder(data []byte) ([]byte, error) {
+	if useCodec == false {
+		return nil, errors.New("no silk encoder")
+	}
+	h := md5.New()
+	h.Write(data)
+	tempName := fmt.Sprintf("%x", h.Sum(nil))
+	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
+		return ioutil.ReadFile(silkPath)
+	}
+	slk, err := codec.EncodeToSilk(data, tempName, true)
+	if err != nil {
+		return nil, err
+	}
+	return slk, nil
+}

global/config.go

@@ -1,14 +1,139 @@
 package global
 
 import (
-	"encoding/json"
 	"os"
 	"strconv"
 	"time"
 
+	"github.com/hjson/hjson-go"
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
+var DefaultConfigWithComments = `
+/*
+    go-cqhttp 默认配置文件
+*/
+
+{
+    // QQ号
+    uin: 0
+    // QQ密码
+    password: ""
+    // 是否启用密码加密
+    encrypt_password: false
+    // 加密后的密码, 如未启用密码加密将为空, 请勿随意修改.
+    password_encrypted: ""
+    // 是否启用内置数据库
+    // 启用将会增加10-20MB的内存占用和一定的磁盘空间
+    // 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable_db: true
+    // 访问密钥, 强烈推荐在公网的服务器设置
+    access_token: ""
+    // 重连设置
+    relogin: {
+        // 是否启用自动重连
+        // 如不启用掉线后将不会自动重连
+        enabled: true
+        // 重连延迟, 单位秒
+        relogin_delay: 3
+        // 最大重连次数, 0为无限制
+        max_relogin_times: 0
+    }
+    // API限速设置
+    // 该设置为全局生效
+    // 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配
+    // 目前该限速设置为令牌桶算法, 请参考: 
+    // https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin
+    _rate_limit: {
+        // 是否启用限速
+        enabled: false
+        // 令牌回复频率, 单位秒
+        frequency: 1
+        // 令牌桶大小
+        bucket_size: 1
+    }
+    // 是否忽略无效的CQ码
+    // 如果为假将原样发送
+    ignore_invalid_cqcode: false
+    // 是否强制分片发送消息
+    // 分片发送将会带来更快的速度
+    // 但是兼容性会有些问题
+    force_fragmented: false
+    // 心跳频率, 单位秒
+    // -1 为关闭心跳
+    heartbeat_interval: 0
+    // HTTP设置
+    http_config: {
+        // 是否启用正向HTTP服务器
+        enabled: true
+        // 服务端监听地址
+        host: 0.0.0.0
+        // 服务端监听端口
+        port: 5700
+        // 反向HTTP超时时间, 单位秒
+        // 最小值为5，小于5将会忽略本项设置
+        timeout: 0
+        // 反向HTTP POST地址列表
+        // 格式: 
+        // {
+        //    地址: secret
+        // }
+        post_urls: {}
+    }
+    // 正向WS设置
+    ws_config: {
+        // 是否启用正向WS服务器
+        enabled: true
+        // 正向WS服务器监听地址
+        host: 0.0.0.0
+        // 正向WS服务器监听端口
+        port: 6700
+    }
+    // 反向WS设置
+    ws_reverse_servers: [
+        // 可以添加多个反向WS推送
+        {
+            // 是否启用该推送
+            enabled: false
+            // 反向WS Universal 地址
+            // 注意 设置了此项地址后下面两项将会被忽略
+            // 留空请使用 ""
+            reverse_url: ws://you_websocket_universal.server
+            // 反向WS API 地址
+            reverse_api_url: ws://you_websocket_api.server
+            // 反向WS Event 地址
+            reverse_event_url: ws://you_websocket_event.server
+            // 重连间隔 单位毫秒
+            reverse_reconnect_interval: 3000
+        }
+    ]
+    // 上报数据类型
+    // 可选: string array
+    post_message_format: string
+    // 是否使用服务器下发的新地址进行重连
+    // 注意, 此设置可能导致在海外服务器上连接情况更差
+    use_sso_address: false
+    // 是否启用 DEBUG
+    debug: false
+    // 日志等级
+    log_level: ""
+    // WebUi 设置
+    web_ui: {
+        // 是否启用 WebUi
+        enabled: true
+        // 监听地址
+        host: 127.0.0.1
+        // 监听端口
+        web_ui_port: 9999
+        // 是否接收来自web的输入
+        web_input: false
+    }
+}
+`
+
 type JsonConfig struct {
 	Uin               int64  `json:"uin"`
 	Password          string `json:"password"`
@@ -28,13 +153,16 @@ type JsonConfig struct {
 	} `json:"_rate_limit"`
 	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
 	ForceFragmented     bool                          `json:"force_fragmented"`
+	ProxyRewrite        string                        `json:"proxy_rewrite"`
 	HeartbeatInterval   time.Duration                 `json:"heartbeat_interval"`
 	HttpConfig          *GoCQHttpConfig               `json:"http_config"`
 	WSConfig            *GoCQWebsocketConfig          `json:"ws_config"`
 	ReverseServers      []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
 	PostMessageFormat   string                        `json:"post_message_format"`
+	UseSSOAddress       bool                          `json:"use_sso_address"`
 	Debug               bool                          `json:"debug"`
 	LogLevel            string                        `json:"log_level"`
+	WebUi               *GoCqWebUi                    `json:"web_ui"`
 }
 
 type CQHttpApiConfig struct {
@@ -78,6 +206,13 @@ type GoCQReverseWebsocketConfig struct {
 	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
 }
 
+type GoCqWebUi struct {
+	Enabled   bool   `json:"enabled"`
+	Host      string `json:"host"`
+	WebUiPort uint64 `json:"web_ui_port"`
+	WebInput  bool   `json:"web_input"`
+}
+
 func DefaultConfig() *JsonConfig {
 	return &JsonConfig{
 		EnableDB: true,
@@ -100,7 +235,7 @@ func DefaultConfig() *JsonConfig {
 			BucketSize: 1,
 		},
 		PostMessageFormat: "string",
-		ForceFragmented:   true,
+		ForceFragmented:   false,
 		HttpConfig: &GoCQHttpConfig{
 			Enabled:  true,
 			Host:     "0.0.0.0",
@@ -121,6 +256,12 @@ func DefaultConfig() *JsonConfig {
 				ReverseReconnectInterval: 3000,
 			},
 		},
+		WebUi: &GoCqWebUi{
+			Enabled:   true,
+			Host:      "127.0.0.1",
+			WebInput:  false,
+			WebUiPort: 9999,
+		},
 	}
 }
 
@@ -129,22 +270,30 @@ func Load(p string) *JsonConfig {
 		log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
 		return nil
 	}
-	c := JsonConfig{}
+	var dat map[string]interface{}
-	err := json.Unmarshal([]byte(ReadAllText(p)), &c)
+	var c = JsonConfig{}
+	err := hjson.Unmarshal([]byte(ReadAllText(p)), &dat)
+	if err == nil {
+		b, _ := json.Marshal(dat)
+		err = json.Unmarshal(b, &c)
+	}
 	if err != nil {
 		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
 		log.Infoln("原文件已备份")
-		os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
+		_ = os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
 		return nil
 	}
 	return &c
 }
 
 func (c *JsonConfig) Save(p string) error {
-	data, err := json.MarshalIndent(c, "", "\t")
+	data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
+		Eol:            "\n",
+		BracesSameLine: true,
+		IndentBy:       "    ",
+	})
 	if err != nil {
 		return err
 	}
-	WriteAllText(p, string(data))
+	return WriteAllText(p, string(data))
-	return nil
 }

global/filter.go

@@ -1,11 +1,12 @@
 package global
 
 import (
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 	"io/ioutil"
 	"regexp"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
 type Filter interface {

global/fs.go

@@ -2,10 +2,21 @@ package global
 
 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"fmt"
 	"io/ioutil"
+	"net"
+	"net/url"
 	"os"
 	"path"
+	"runtime"
+	"strconv"
+	"strings"
 
+	"github.com/dustin/go-humanize"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -32,8 +43,8 @@ func ReadAllText(path string) string {
 	return string(b)
 }
 
-func WriteAllText(path, text string) {
+func WriteAllText(path, text string) error {
-	_ = ioutil.WriteFile(path, []byte(text), 0644)
+	return ioutil.WriteFile(path, []byte(text), 0644)
 }
 
 func Check(err error) {
@@ -45,3 +56,93 @@ func Check(err error) {
 func IsAMRorSILK(b []byte) bool {
 	return bytes.HasPrefix(b, HEADER_AMR) || bytes.HasPrefix(b, HEADER_SILK)
 }
+
+func FindFile(f, cache, PATH string) (data []byte, err error) {
+	data, err = nil, errors.New("syntax error")
+	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
+		if cache == "" {
+			cache = "1"
+		}
+		hash := md5.Sum([]byte(f))
+		cacheFile := path.Join(CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		if PathExists(cacheFile) && cache == "1" {
+			return ioutil.ReadFile(cacheFile)
+		}
+		data, err = GetBytes(f)
+		_ = ioutil.WriteFile(cacheFile, data, 0644)
+		if err != nil {
+			return nil, err
+		}
+	} else if strings.HasPrefix(f, "base64") {
+		data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
+		if err != nil {
+			return nil, err
+		}
+	} else if strings.HasPrefix(f, "file") {
+		var fu *url.URL
+		fu, err = url.Parse(f)
+		if err != nil {
+			return nil, err
+		}
+		if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
+			fu.Path = fu.Path[1:]
+		}
+		data, err = ioutil.ReadFile(fu.Path)
+		if err != nil {
+			return nil, err
+		}
+	} else if PathExists(path.Join(PATH, f)) {
+		data, err = ioutil.ReadFile(path.Join(PATH, f))
+		if err != nil {
+			return nil, err
+		}
+	}
+	return
+}
+
+func DelFile(path string) bool {
+	err := os.Remove(path)
+	if err != nil {
+		// 删除失败
+		log.Error(err)
+		return false
+	} else {
+		// 删除成功
+		log.Info(path + "删除成功")
+		return true
+	}
+}
+
+func ReadAddrFile(path string) []*net.TCPAddr {
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil
+	}
+	str := string(d)
+	lines := strings.Split(str, "\n")
+	var ret []*net.TCPAddr
+	for _, l := range lines {
+		ip := strings.Split(strings.TrimSpace(l), ":")
+		if len(ip) == 2 {
+			port, _ := strconv.Atoi(ip[1])
+			ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
+		}
+	}
+	return ret
+}
+
+type WriteCounter struct {
+	Total uint64
+}
+
+func (wc *WriteCounter) Write(p []byte) (int, error) {
+	n := len(p)
+	wc.Total += uint64(n)
+	wc.PrintProgress()
+	return n, nil
+}
+
+func (wc WriteCounter) PrintProgress() {
+	fmt.Printf("\r%s", strings.Repeat(" ", 35))
+	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
+}

global/net.go

@@ -4,19 +4,47 @@ import (
 	"bytes"
 	"compress/gzip"
 	"fmt"
-	"github.com/tidwall/gjson"
 	"io/ioutil"
+	"net"
 	"net/http"
+	"net/url"
 	"strings"
+	"time"
+
+	"github.com/tidwall/gjson"
 )
 
+var client = &http.Client{
+	Timeout: time.Second * 15,
+	Transport: &http.Transport{
+		Proxy: func(request *http.Request) (u *url.URL, e error) {
+			if Proxy == "" {
+				return http.ProxyFromEnvironment(request)
+			}
+			return url.Parse(Proxy)
+		},
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+			DualStack: true,
+		}).DialContext,
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	},
+}
+
+var Proxy string
+
 func GetBytes(url string) ([]byte, error) {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
 	req.Header["User-Agent"] = []string{"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36 Edg/83.0.478.61"}
-	resp, err := http.DefaultClient.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -50,4 +78,3 @@ func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
 	}
 	return gjson.ParseBytes(d).Get("songs.0"), nil
 }
-

global/param.go

@@ -1,8 +1,12 @@
 package global
 
 import (
-	"github.com/tidwall/gjson"
+	"math"
+	"regexp"
+	"strconv"
 	"strings"
+
+	"github.com/tidwall/gjson"
 )
 
 var trueSet = map[string]struct{}{
@@ -48,3 +52,22 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 	}
 	return defaultVal
 }
+
+// VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
+// 例: v0.9.29-fix2 == v0.9.29-fix2 -> false
+// v0.9.29-fix1 < v0.9.29-fix2 -> true
+// v0.9.29-fix2 > v0.9.29-fix1 -> false
+// v0.9.29-fix2 < v0.9.30 -> true
+func VersionNameCompare(current, remote string) bool {
+	sp := regexp.MustCompile(`[0-9]\d*`)
+	cur := sp.FindAllStringSubmatch(current, -1)
+	re := sp.FindAllStringSubmatch(remote, -1)
+	for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
+		curSub, _ := strconv.Atoi(cur[i][0])
+		reSub, _ := strconv.Atoi(re[i][0])
+		if curSub < reSub {
+			return true
+		}
+	}
+	return len(cur) < len(re)
+}

global/ratelimit.go

@@ -2,6 +2,7 @@ package global
 
 import (
 	"context"
+
 	"golang.org/x/time/rate"
 )
 

go.mod

@@ -1,31 +1,28 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.14
+go 1.15
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d
+	github.com/Mrs4s/MiraiGo v0.0.0-20201202140458-0eb4eb738d31
-	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
+	github.com/dustin/go-humanize v1.0.0
+	github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c
+	github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-playground/validator/v10 v10.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.2
+	github.com/guonaihong/gout v0.1.3
-	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/hjson/hjson-go v3.1.0+incompatible
-	github.com/jonboulle/clockwork v0.2.0 // indirect
+	github.com/json-iterator/go v1.1.10
-	github.com/json-iterator/go v1.1.10 // indirect
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
+	github.com/kr/binarydist v0.1.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
-	github.com/sirupsen/logrus v1.6.0
+	github.com/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/tebeka/strftime v0.1.5 // indirect
+	github.com/tidwall/gjson v1.6.3
-	github.com/tidwall/gjson v1.6.1
+	github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6
-	github.com/xujiajun/nutsdb v0.5.0
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
-	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
-	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -1,18 +1,30 @@
 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-20200919083021-4013c077186d h1:LZ1pjJJ7sD/AOL8tvkTB9bPc0DiOErCNN+wWXUMyvX0=
+github.com/Mrs4s/MiraiGo v0.0.0-20201202140458-0eb4eb738d31 h1:jClElKWovoOzDYmVd16UQc8638d0FvyKCtVj7qF+ej4=
-github.com/Mrs4s/MiraiGo v0.0.0-20200919083021-4013c077186d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20201202140458-0eb4eb738d31/go.mod h1:J1zaJWyeX7hQIPpOobqb8opxTNPbguotudPPrHJMoDM=
-github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d h1:nGJSE9xQBeDiugBKKX0vUOq51MqlUEm/y2FMfZFH/w4=
-github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
-github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
+github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c h1:mP9bsvdddRSMwqO+lmNuSrsH7nD2nBIz7af+e/4je4c=
+github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c/go.mod h1:goroSTghTcnjKaR2C8ovKWy1lEvRNfqHrW/kRJNMek0=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 h1:8MYJU90rB1bsavemKSAuDKBjtAKo5xq95bEPOnzV7CE=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
@@ -25,9 +37,10 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -39,8 +52,10 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -50,16 +65,20 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
+github.com/guonaihong/gout v0.1.3 h1:BIiV6nnsA+R6dIB1P33uhCM8+TVAG3zHrXGZad7hDc8=
-github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
+github.com/guonaihong/gout v0.1.3/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
-github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
+github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
-github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/binarydist v0.1.0/go.mod h1:DY7S//GCoz1BCd0B0EVrinCKAZN3pXe+MDaIZbXQVgM=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
@@ -71,12 +90,17 @@ github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR7
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -85,18 +109,19 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 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/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/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
+github.com/tidwall/gjson v1.6.3 h1:aHoiiem0dr7GHkW001T1SMTJ7X5PvyekH5WX0whWGnI=
-github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
+github.com/tidwall/gjson v1.6.3/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
-github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
@@ -105,43 +130,34 @@ 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/xujiajun/gorouter v1.2.0/go.mod h1:yJrIta+bTNpBM/2UT8hLOaEAFckO+m/qmR3luMIQygM=
+github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6 h1:lX18MCdNzT2zIi7K02x4C5cPkDXpL+wCb1YTAMXjLWQ=
-github.com/xujiajun/mmap-go v1.0.1 h1:7Se7ss1fLPPRW+ePgqGpCkfGIZzJV6JPq9Wq9iv/WHc=
+github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6/go.mod h1:5q9LFlBr+yX/J8Jd/9wHdXwkkjFkNyQIS7kX2Lgx/Zs=
-github.com/xujiajun/mmap-go v1.0.1/go.mod h1:CNN6Sw4SL69Sui00p0zEzcZKbt+5HtEnYUsc6BKKRMg=
-github.com/xujiajun/nutsdb v0.5.0 h1:j/jM3Zw7Chg8WK7bAcKR0Xr7Mal47U1oJAMgySfDn9E=
-github.com/xujiajun/nutsdb v0.5.0/go.mod h1:owdwN0tW084RxEodABLbO7h4Z2s9WiAjZGZFhRh0/1Q=
-github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b h1:jKG9OiL4T4xQN3IUrhUpc1tG+HfDXppkgVcrAiiaI/0=
-github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJlUzl82Yab2kTjx1EyXSQCAfZDhpTo1SQC4k=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-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-20190813064441-fde4db37ae7a/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 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
-golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
@@ -171,11 +187,13 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+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.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -2,35 +2,40 @@ package main
 
 import (
 	"bufio"
-	"bytes"
 	"crypto/md5"
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
-	"image"
 	"io"
 	"io/ioutil"
-	"net"
+	"net/http"
 	"os"
+	"os/exec"
 	"os/signal"
 	"path"
+	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/server"
+	"github.com/guonaihong/gout"
+	"github.com/tidwall/gjson"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/server"
+	"github.com/getlantern/go-update"
-
+	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"
-	asciiart "github.com/yinghau76/go-ascii-art"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func init() {
 	log.SetFormatter(&easy.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05",
@@ -62,7 +67,7 @@ func init() {
 	}
 	if global.PathExists("cqhttp.json") {
 		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
-		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.json 文件.")
+		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
 		time.Sleep(time.Second * 5)
 		conf := global.CQHttpApiConfig{}
 		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
@@ -84,8 +89,8 @@ func init() {
 			goConf.ReverseServers[0].ReverseEventUrl = conf.WSReverseEventUrl
 			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
 		}
-		if err := goConf.Save("config.json"); err != nil {
+		if err := goConf.Save("config.hjson"); err != nil {
-			log.Fatalf("保存 config.json 时出现错误: %v", err)
+			log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		}
 		_ = os.Remove("cqhttp.json")
 	}
@@ -93,9 +98,35 @@ func init() {
 
 func main() {
 	console := bufio.NewReader(os.Stdin)
+	var strKey string
+	var isFastStart bool = false
+	arg := os.Args
+	if len(arg) > 1 {
+		for i := range arg {
+			switch arg[i] {
+			case "update":
+				if len(arg) > i+1 {
+					selfUpdate(arg[i+1])
+				} else {
+					selfUpdate("")
+				}
+			case "key":
+				if len(arg) > i+1 {
+					b := []byte(arg[i+1])
+					b = append(b, 13, 10)
+					strKey = string(b[:])
+				}
+			case "faststart":
+				isFastStart = true
+			}
+		}
+	}
+
 	var conf *global.JsonConfig
-	if global.PathExists("config.json") || os.Getenv("UIN") == "" {
+	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)
@@ -121,19 +152,21 @@ func main() {
 		if post != "" {
 			conf.HttpConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
 		}
+	} else {
+		conf = global.Load("config.hjson")
 	}
 	if conf == nil {
-		err := global.DefaultConfig().Save("config.json")
+		err := global.WriteAllText("config.hjson", global.DefaultConfigWithComments)
 		if err != nil {
 			log.Fatalf("创建默认配置文件时出现错误: %v", err)
 			return
 		}
-		log.Infof("默认配置文件已生成, 请编辑 config.json 后重启程序.")
+		log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
 		time.Sleep(time.Second * 5)
 		return
 	}
 	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
-		log.Warnf("请修改 config.json 以添加账号密码.")
+		log.Warnf("请修改 config.hjson 以添加账号密码.")
 		time.Sleep(time.Second * 5)
 		return
 	}
@@ -200,28 +233,48 @@ func main() {
 		if encrypted := EncryptPwd(conf.Password, key[:]); encrypted != "" {
 			conf.Password = ""
 			conf.PasswordEncrypted = encrypted
-			_ = conf.Save("config.json")
+			_ = conf.Save("config.hjson")
 		} else {
 			log.Warnf("加密时出现问题.")
 		}
 	}
 	if conf.PasswordEncrypted != "" {
-		log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+		if strKey == "" {
-		strKey, _ := console.ReadString('\n')
+			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+			cancel := make(chan struct{}, 1)
+			go func() {
+				select {
+				case <-cancel:
+					return
+				case <-time.After(time.Second * 45):
+					log.Infof("解密key输入超时")
+					time.Sleep(3 * time.Second)
+					os.Exit(0)
+				}
+			}()
+			strKey, _ = console.ReadString('\n')
+			cancel <- struct{}{}
+		} else {
+			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+		}
 		key := md5.Sum([]byte(strKey))
 		conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
 	}
-	log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
+	if !isFastStart {
-	time.Sleep(time.Second * 5)
+		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
+		time.Sleep(time.Second * 5)
+	}
 	log.Info("开始尝试登录并同步消息...")
 	log.Infof("使用协议: %v", func() string {
 		switch client.SystemDeviceInfo.Protocol {
-		case client.AndroidPad:
+		case client.IPad:
-			return "Android Pad"
+			return "iPad"
 		case client.AndroidPhone:
 			return "Android Phone"
 		case client.AndroidWatch:
 			return "Android Watch"
+		case client.MacOS:
+			return "MacOS"
 		}
 		return "未知"
 	}())
@@ -236,150 +289,50 @@ func main() {
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
-	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
+	if global.PathExists("address.txt") {
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. 地址信息已储存到 servers.bin 文件")
+		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
-		_ = ioutil.WriteFile("servers.bin", binary.NewWriterF(func(w *binary.Writer) {
+		addr := global.ReadAddrFile("address.txt")
-			w.WriteUInt16(func() (c uint16) {
+		if len(addr) > 0 {
-				for _, s := range e.Servers {
+			cli.SetCustomServer(addr)
-					if !strings.Contains(s.Server, "com") {
+		}
-						c++
+		log.Infof("读取到 %v 个自定义地址.", len(addr))
-					}
+	}
-				}
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-				return
+		if !conf.UseSSOAddress {
-			}())
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			for _, s := range e.Servers {
+			return false
-				if !strings.Contains(s.Server, "com") {
+		}
-					w.WriteString(s.Server)
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-					w.WriteUInt16(uint16(s.Port))
+		return true
-				}
-			}
-		}), 0644)
 	})
-	if global.PathExists("servers.bin") {
+	if conf.WebUi == nil {
-		if data, err := ioutil.ReadFile("servers.bin"); err == nil {
+		conf.WebUi = &global.GoCqWebUi{
-			func() {
+			Enabled:   true,
-				defer func() {
+			WebInput:  false,
-					if pan := recover(); pan != nil {
+			Host:      "0.0.0.0",
-						log.Error("读取服务器地址时出现错误: %v", pan)
+			WebUiPort: 9999,
-					}
-				}()
-				r := binary.NewReader(data)
-				var addr []*net.TCPAddr
-				l := r.ReadUInt16()
-				for i := 0; i < int(l); i++ {
-					addr = append(addr, &net.TCPAddr{
-						IP:   net.ParseIP(r.ReadString()),
-						Port: int(r.ReadUInt16()),
-					})
-				}
-				if len(addr) > 0 {
-					cli.SetCustomServer(addr)
-				}
-			}()
 		}
 	}
-	rsp, err := cli.Login()
+	if conf.WebUi.WebUiPort <= 0 {
-	for {
+		conf.WebUi.WebUiPort = 9999
-		global.Check(err)
-		if !rsp.Success {
-			switch rsp.Error {
-			case client.NeedCaptcha:
-				_ = ioutil.WriteFile("captcha.jpg", rsp.CaptchaImage, 0644)
-				img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
-				fmt.Println(asciiart.New("image", img).Art)
-				log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
-				text, _ := console.ReadString('\n')
-				rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign)
-				continue
-			case client.UnsafeDeviceError:
-				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
-				log.Infof(" 按 Enter 继续....")
-				_, _ = console.ReadString('\n')
-				return
-			case client.OtherLoginError, client.UnknownLoginError:
-				log.Fatalf("登录失败: %v", rsp.ErrorMessage)
-			}
-		}
-		break
 	}
-	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
+	if conf.WebUi.Host == "" {
-	time.Sleep(time.Second)
+		conf.WebUi.Host = "127.0.0.1"
-	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList())
-	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
-	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList())
-	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	b := coolq.NewQQBot(cli, conf)
-	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
-		log.Warnf("post_message_format 配置错误, 将自动使用 string")
-		coolq.SetMessageFormat("string")
-	} else {
-		coolq.SetMessageFormat(conf.PostMessageFormat)
 	}
-	if conf.RateLimit.Enabled {
+	global.Proxy = conf.ProxyRewrite
-		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
-	}
+	c := server.Console
-	log.Info("正在加载事件过滤器.")
+	r := server.Restart
-	global.BootFilter()
+	go checkUpdate()
-	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
-	coolq.ForceFragmented = conf.ForceFragmented
-	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
-		server.HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, b)
-		for k, v := range conf.HttpConfig.PostUrls {
-			server.NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, b)
-		}
-	}
-	if conf.WSConfig != nil && conf.WSConfig.Enabled {
-		server.WebsocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, b)
-	}
-	for _, rc := range conf.ReverseServers {
-		server.NewWebsocketClient(rc, conf.AccessToken, b).Run()
-	}
-	log.Info("资源初始化完成, 开始处理信息.")
-	log.Info("アトリは、高性能ですから!")
-	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
-		if conf.ReLogin.Enabled {
-			var times uint = 1
-			for {
-
-				if conf.ReLogin.MaxReloginTimes == 0 {
-				} else if times > conf.ReLogin.MaxReloginTimes {
-					break
-				}
-				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
-					e.Message, conf.ReLogin.ReLoginDelay, times)
-				times++
-				time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
-				rsp, err := cli.Login()
-				if err != nil {
-					log.Errorf("重连失败: %v", err)
-					continue
-				}
-				if !rsp.Success {
-					switch rsp.Error {
-					case client.NeedCaptcha:
-						log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)")
-					case client.UnsafeDeviceError:
-						log.Fatalf("重连失败: 设备锁")
-					default:
-						log.Errorf("重连失败: %v", rsp.ErrorMessage)
-						continue
-					}
-				}
-				log.Info("重连成功")
-				return
-
-			}
-			log.Fatal("重连失败: 重连次数达到设置的上限值")
-		}
-		b.Release()
-		log.Fatalf("Bot已离线：%v", e.Message)
-	})
-	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, os.Kill)
-	<-c
+	select {
-	b.Release()
+	case <-c:
+		b.Release()
+	case <-r:
+		log.Info("正在重启中...")
+		defer b.Release()
+		restart(arg)
+	}
 }
 
 func EncryptPwd(pwd string, key []byte) string {
@@ -406,3 +359,126 @@ func DecryptPwd(ePwd string, key []byte) string {
 	}
 	return string(tea.Decrypt(encrypted))
 }
+
+func checkUpdate() {
+	log.Infof("正在检查更新.")
+	if coolq.Version == "unknown" {
+		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
+		return
+	}
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
+		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
+		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
+		return
+	}
+	log.Infof("检查更新完成. 当前已运行最新版本.")
+}
+
+func selfUpdate(imageUrl string) {
+	console := bufio.NewReader(os.Stdin)
+	readLine := func() (str string) {
+		str, _ = console.ReadString('\n')
+		return
+	}
+	log.Infof("正在检查更新.")
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	version := info.Get("tag_name").Str
+	if coolq.Version != version {
+		log.Info("当前最新版本为 ", version)
+		log.Warn("是否更新(y/N): ")
+		r := strings.TrimSpace(readLine())
+
+		doUpdate := func() {
+			log.Info("正在更新,请稍等...")
+			url := fmt.Sprintf(
+				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
+				func() string {
+					if imageUrl != "" {
+						return imageUrl
+					}
+					return "https://github.com"
+				}(),
+				version,
+				version,
+				runtime.GOOS,
+				runtime.GOARCH,
+			)
+			if runtime.GOOS == "windows" {
+				url = url + ".exe"
+			}
+			resp, err := http.Get(url)
+			if err != nil {
+				fmt.Println(err)
+				log.Error("更新失败!")
+				return
+			}
+			wc := global.WriteCounter{}
+			err, _ = update.New().FromStream(io.TeeReader(resp.Body, &wc))
+			fmt.Println()
+			if err != nil {
+				log.Error("更新失败!")
+				return
+			}
+			log.Info("更新完成！")
+		}
+
+		if r == "y" || r == "Y" {
+			doUpdate()
+		} else {
+			log.Warn("已取消更新！")
+		}
+	}
+	log.Info("按 Enter 继续....")
+	readLine()
+	os.Exit(0)
+}
+
+func restart(Args []string) {
+	cmd := &exec.Cmd{}
+	if runtime.GOOS == "windows" {
+		file, err := exec.LookPath(Args[0])
+		if err != nil {
+			log.Errorf("重启失败:%s", err.Error())
+			return
+		}
+		path, err := filepath.Abs(file)
+		if err != nil {
+			log.Errorf("重启失败:%s", err.Error())
+		}
+		Args = append([]string{"/c", "start ", path, "faststart"}, Args[1:]...)
+		cmd = &exec.Cmd{
+			Path:   "cmd.exe",
+			Args:   Args,
+			Stderr: os.Stderr,
+			Stdout: os.Stdout,
+		}
+	} else {
+		Args = append(Args, "faststart")
+		cmd = &exec.Cmd{
+			Path:   Args[0],
+			Args:   Args,
+			Stderr: os.Stderr,
+			Stdout: os.Stdout,
+		}
+	}
+	cmd.Start()
+}

server/apiAdmin.go

@@ -0,0 +1,587 @@
+package server
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/base64"
+	"fmt"
+	"image"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"os/signal"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/gin-gonic/gin"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	asciiart "github.com/yinghau76/go-ascii-art"
+)
+
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
+var WebInput = make(chan string, 1) //长度1，用于阻塞
+
+var Console = make(chan os.Signal, 1)
+
+var Restart = make(chan struct{}, 1)
+
+var JsonConfig *global.JsonConfig
+
+type webServer struct {
+	engine  *gin.Engine
+	bot     *coolq.CQBot
+	Cli     *client.QQClient
+	Conf    *global.JsonConfig //old config
+	Console *bufio.Reader
+}
+
+var WebServer = &webServer{}
+
+// admin 子站的 路由映射
+var HttpuriAdmin = map[string]func(s *webServer, c *gin.Context){
+	"do_restart":         AdminDoRestart,       //热重启
+	"do_process_restart": AdminProcessRestart,  //进程重启
+	"get_web_write":      AdminWebWrite,        //获取是否验证码输入
+	"do_web_write":       AdminDoWebWrite,      //web上进行输入操作
+	"do_restart_docker":  AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起
+	"do_config_base":     AdminDoConfigBase,    //修改config.json中的基础部分
+	"do_config_http":     AdminDoConfigHttp,    //修改config.json的http部分
+	"do_config_ws":       AdminDoConfigWs,      //修改config.json的正向ws部分
+	"do_config_reverse":  AdminDoConfigReverse, //修改config.json 中的反向ws部分
+	"do_config_json":     AdminDoConfigJson,    //直接修改 config.json配置
+	"get_config_json":    AdminGetConfigJson,   //拉取 当前的config.json配置
+}
+
+func Failed(code int, msg string) coolq.MSG {
+	return coolq.MSG{"data": nil, "retcode": code, "status": "failed", "msg": msg}
+}
+
+func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
+	s.Cli = cli
+	s.Conf = GetConf()
+	JsonConfig = s.Conf
+	gin.SetMode(gin.ReleaseMode)
+	s.engine = gin.New()
+
+	s.engine.Use(AuthMiddleWare())
+
+	//通用路由
+	s.engine.Any("/admin/:action", s.admin)
+
+	go func() {
+		//开启端口监听
+		if s.Conf.WebUi != nil && s.Conf.WebUi.Enabled {
+			log.Infof("Admin API 服务器已启动: %v", addr)
+			err := s.engine.Run(addr)
+			if err != nil {
+				log.Error(err)
+				log.Infof("请检查端口是否被占用.")
+				c := make(chan os.Signal, 1)
+				signal.Notify(c, os.Interrupt, os.Kill)
+				<-c
+				os.Exit(1)
+			}
+		} else {
+			//关闭端口监听
+			c := make(chan os.Signal, 1)
+			signal.Notify(c, os.Interrupt, os.Kill)
+			<-c
+			os.Exit(1)
+		}
+	}()
+	s.Dologin()
+	s.UpServer()
+	b := s.bot //外部引入 bot对象，用于操作bot
+	return b
+}
+
+func (s *webServer) Dologin() {
+	s.Console = bufio.NewReader(os.Stdin)
+	readLine := func() (str string) {
+		str, _ = s.Console.ReadString('\n')
+		return
+	}
+	conf := GetConf()
+	cli := s.Cli
+	cli.AllowSlider = true
+	rsp, err := cli.Login()
+	count := 0
+	for {
+		global.Check(err)
+		var text string
+		if !rsp.Success {
+			switch rsp.Error {
+			case client.SliderNeededError:
+				if client.SystemDeviceInfo.Protocol == client.AndroidPhone {
+					log.Warnf("警告: Android Phone 强制要求暂不支持的滑条验证码, 请开启设备锁或切换到Watch协议验证通过后再使用.")
+					log.Infof("按 Enter 继续....")
+					readLine()
+					os.Exit(0)
+				}
+				cli.AllowSlider = false
+				cli.Disconnect()
+				rsp, err = cli.Login()
+				continue
+			case client.NeedCaptcha:
+				_ = ioutil.WriteFile("captcha.jpg", rsp.CaptchaImage, 0644)
+				img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
+				fmt.Println(asciiart.New("image", img).Art)
+				if conf.WebUi != nil && conf.WebUi.WebInput {
+					log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", conf.WebUi.Host, 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
+			case client.SMSNeededError:
+				log.Warnf("账号已开启设备锁, 按下 Enter 向手机 %v 发送短信验证码.", rsp.SMSPhone)
+				readLine()
+				if !cli.RequestSMS() {
+					log.Warnf("发送验证码失败，可能是请求过于频繁.")
+					time.Sleep(time.Second * 5)
+					os.Exit(0)
+				}
+				log.Warn("请输入短信验证码： (Enter 提交)")
+				text = readLine()
+				rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
+				continue
+			case client.SMSOrVerifyNeededError:
+				log.Warnf("账号已开启设备锁，请选择验证方式:")
+				log.Warnf("1. 向手机 %v 发送短信验证码", rsp.SMSPhone)
+				log.Warnf("2. 使用手机QQ扫码验证.")
+				log.Warn("请输入(1 - 2): ")
+				text = readLine()
+				if strings.Contains(text, "1") {
+					if !cli.RequestSMS() {
+						log.Warnf("发送验证码失败，可能是请求过于频繁.")
+						time.Sleep(time.Second * 5)
+						os.Exit(0)
+					}
+					log.Warn("请输入短信验证码： (Enter 提交)")
+					text = readLine()
+					rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
+					continue
+				}
+				log.Warnf("请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
+				log.Infof("按 Enter 继续....")
+				readLine()
+				os.Exit(0)
+				return
+			case client.UnsafeDeviceError:
+				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
+				if conf.WebUi != nil && conf.WebUi.WebInput {
+					log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", conf.WebUi.Host, conf.WebUi.WebUiPort)
+					text = <-WebInput
+				} else {
+					log.Infof("按 Enter 继续....")
+					readLine()
+				}
+				log.Info(text)
+				os.Exit(0)
+				return
+			case client.OtherLoginError, client.UnknownLoginError:
+				msg := rsp.ErrorMessage
+				if strings.Contains(msg, "版本") {
+					msg = "密码错误或账号被冻结"
+				}
+				if strings.Contains(msg, "上网环境") && count < 5 {
+					cli.Disconnect()
+					rsp, err = cli.Login()
+					count++
+					continue
+				}
+				log.Warnf("登录失败: %v", msg)
+				log.Infof("按 Enter 继续....")
+				readLine()
+				os.Exit(0)
+				return
+			}
+		}
+		break
+	}
+	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
+	time.Sleep(time.Second)
+	log.Info("开始加载好友列表...")
+	global.Check(cli.ReloadFriendList())
+	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
+	log.Infof("开始加载群列表...")
+	global.Check(cli.ReloadGroupList())
+	log.Infof("共加载 %v 个群.", len(cli.GroupList))
+	s.bot = coolq.NewQQBot(cli, conf)
+	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
+		log.Warnf("post_message_format 配置错误, 将自动使用 string")
+		coolq.SetMessageFormat("string")
+	} else {
+		coolq.SetMessageFormat(conf.PostMessageFormat)
+	}
+	if conf.RateLimit.Enabled {
+		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+	}
+	log.Info("正在加载事件过滤器.")
+	global.BootFilter()
+	global.InitCodec()
+	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
+	coolq.ForceFragmented = conf.ForceFragmented
+	log.Info("资源初始化完成, 开始处理信息.")
+	log.Info("アトリは、高性能ですから!")
+	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
+		if conf.ReLogin.Enabled {
+			var times uint = 1
+			for {
+				if cli.Online {
+					log.Warn("Bot已登录")
+					return
+				}
+				if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
+					break
+				}
+				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
+					e.Message, conf.ReLogin.ReLoginDelay, times)
+				times++
+				time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
+				rsp, err := cli.Login()
+				if err != nil {
+					log.Errorf("重连失败: %v", err)
+					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)
+						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 {
+		f(s, c)
+	} else {
+		c.JSON(200, coolq.Failed(404))
+	}
+}
+
+// 获取当前配置文件信息
+func GetConf() *global.JsonConfig {
+	if JsonConfig != nil {
+		return JsonConfig
+	}
+	conf := global.Load("config.hjson")
+	return conf
+}
+
+// admin 控制器 登录验证
+func AuthMiddleWare() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		conf := GetConf()
+		//处理跨域问题
+		c.Header("Access-Control-Allow-Origin", "*")
+		c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
+		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE")
+		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
+		c.Header("Access-Control-Allow-Credentials", "true")
+		// 放行所有OPTIONS方法，因为有的模板是要请求两次的
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusNoContent)
+		}
+		// 处理请求
+		if c.Request.Method != "GET" && c.Request.Method != "POST" {
+			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
+			c.Status(404)
+			c.Abort()
+		}
+		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
+			d, err := c.GetRawData()
+			if err != nil {
+				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
+				c.Status(400)
+				c.Abort()
+			}
+			if !gjson.ValidBytes(d) {
+				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
+				c.Status(400)
+				c.Abort()
+			}
+			c.Set("json_body", gjson.ParseBytes(d))
+		}
+		authToken := conf.AccessToken
+		if auth := c.Request.Header.Get("Authorization"); auth != "" {
+			if strings.SplitN(auth, " ", 2)[1] != authToken {
+				c.AbortWithStatus(401)
+				return
+			}
+		} else if c.Query("access_token") != authToken {
+			c.AbortWithStatus(401)
+			return
+		} else {
+			c.Next()
+		}
+	}
+}
+
+func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
+	JsonConfig = nil
+	conf := GetConf()
+	OldConf := s.Conf
+	cli := client.NewClient(conf.Uin, conf.Password)
+	log.Info("开始尝试登录并同步消息...")
+	log.Infof("使用协议: %v", func() string {
+		switch client.SystemDeviceInfo.Protocol {
+		case client.IPad:
+			return "iPad"
+		case client.AndroidPhone:
+			return "Android Phone"
+		case client.AndroidWatch:
+			return "Android Watch"
+		case client.MacOS:
+			return "MacOS"
+		}
+		return "未知"
+	}())
+	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
+		switch e.Type {
+		case "INFO":
+			log.Info("Protocol -> " + e.Message)
+		case "ERROR":
+			log.Error("Protocol -> " + e.Message)
+		case "DEBUG":
+			log.Debug("Protocol -> " + e.Message)
+		}
+	})
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+		if !conf.UseSSOAddress {
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+			return false
+		}
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+		return true
+	})
+	s.Cli = cli
+	s.Dologin()
+	//关闭之前的 server
+	if OldConf.HttpConfig != nil && OldConf.HttpConfig.Enabled {
+		HttpServer.ShutDown()
+	}
+	//if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
+	//	server.WsShutdown()
+	//}
+	//s.UpServer()
+	s.ReloadServer()
+	s.Conf = conf
+}
+
+func (s *webServer) UpServer() {
+	conf := GetConf()
+	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
+		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, s.bot)
+		for k, v := range conf.HttpConfig.PostUrls {
+			NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, s.bot)
+		}
+	}
+	if conf.WSConfig != nil && conf.WSConfig.Enabled {
+		go WebsocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, s.bot)
+	}
+	for _, rc := range conf.ReverseServers {
+		go NewWebsocketClient(rc, conf.AccessToken, s.bot).Run()
+	}
+}
+
+// 暂不支持ws服务的重启
+func (s *webServer) ReloadServer() {
+	conf := GetConf()
+	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
+		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, s.bot)
+		for k, v := range conf.HttpConfig.PostUrls {
+			NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, s.bot)
+		}
+	}
+	for _, rc := range conf.ReverseServers {
+		go NewWebsocketClient(rc, conf.AccessToken, s.bot).Run()
+	}
+}
+
+// 热重启
+func AdminDoRestart(s *webServer, c *gin.Context) {
+	s.bot.Release()
+	s.bot = nil
+	s.Cli = nil
+	s.DoReLogin()
+	c.JSON(200, coolq.OK(coolq.MSG{}))
+	return
+}
+
+// 进程重启
+func AdminProcessRestart(s *webServer, c *gin.Context) {
+	Restart <- struct{}{}
+	c.JSON(200, coolq.OK(coolq.MSG{}))
+}
+
+// 冷重启
+func AdminDoRestartDocker(s *webServer, c *gin.Context) {
+	Console <- os.Kill
+	c.JSON(200, coolq.OK(coolq.MSG{}))
+	return
+}
+
+// web输入 html 页面
+func AdminWebWrite(s *webServer, c *gin.Context) {
+	pic := global.ReadAllText("captcha.jpg")
+	var picbase64 string
+	var ispic = false
+	if pic != "" {
+		input := []byte(pic)
+		// base64编码
+		picbase64 = base64.StdEncoding.EncodeToString(input)
+		ispic = true
+	}
+	c.JSON(200, coolq.OK(coolq.MSG{
+		"ispic":     ispic,     //为空则为 设备锁 或者没有需要输入
+		"picbase64": picbase64, //web上显示图片
+	}))
+}
+
+// web输入 处理
+func AdminDoWebWrite(s *webServer, c *gin.Context) {
+	input := c.PostForm("input")
+	WebInput <- input
+	c.JSON(200, coolq.OK(coolq.MSG{}))
+}
+
+// 普通配置修改
+func AdminDoConfigBase(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	conf.Uin, _ = strconv.ParseInt(c.PostForm("uin"), 10, 64)
+	conf.Password = c.PostForm("password")
+	if c.PostForm("enable_db") == "true" {
+		conf.EnableDB = true
+	} else {
+		conf.EnableDB = false
+	}
+	conf.AccessToken = c.PostForm("access_token")
+	if err := conf.Save("config.hjson"); err != nil {
+		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+	} else {
+		JsonConfig = nil
+		c.JSON(200, coolq.OK(coolq.MSG{}))
+	}
+}
+
+// http配置修改
+func AdminDoConfigHttp(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
+	conf.HttpConfig.Port = uint16(p)
+	conf.HttpConfig.Host = c.PostForm("host")
+	if c.PostForm("enable") == "true" {
+		conf.HttpConfig.Enabled = true
+	} else {
+		conf.HttpConfig.Enabled = false
+	}
+	t, _ := strconv.ParseInt(c.PostForm("timeout"), 10, 32)
+	conf.HttpConfig.Timeout = int32(t)
+	if c.PostForm("post_url") != "" {
+		conf.HttpConfig.PostUrls[c.PostForm("post_url")] = c.PostForm("post_secret")
+	}
+	if err := conf.Save("config.hjson"); err != nil {
+		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+	} else {
+		JsonConfig = nil
+		c.JSON(200, coolq.OK(coolq.MSG{}))
+	}
+}
+
+// ws配置修改
+func AdminDoConfigWs(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
+	conf.WSConfig.Port = uint16(p)
+	conf.WSConfig.Host = c.PostForm("host")
+	if c.PostForm("enable") == "true" {
+		conf.WSConfig.Enabled = true
+	} else {
+		conf.WSConfig.Enabled = false
+	}
+	if err := conf.Save("config.hjson"); err != nil {
+		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+	} else {
+		JsonConfig = nil
+		c.JSON(200, coolq.OK(coolq.MSG{}))
+	}
+}
+
+// 反向ws配置修改
+func AdminDoConfigReverse(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	conf.ReverseServers[0].ReverseApiUrl = c.PostForm("reverse_api_url")
+	conf.ReverseServers[0].ReverseUrl = c.PostForm("reverse_url")
+	conf.ReverseServers[0].ReverseEventUrl = c.PostForm("reverse_event_url")
+	t, _ := strconv.ParseUint(c.PostForm("reverse_reconnect_interval"), 10, 16)
+	conf.ReverseServers[0].ReverseReconnectInterval = uint16(t)
+	if c.PostForm("enable") == "true" {
+		conf.ReverseServers[0].Enabled = true
+	} else {
+		conf.ReverseServers[0].Enabled = false
+	}
+	if err := conf.Save("config.hjson"); err != nil {
+		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+	} else {
+		JsonConfig = nil
+		c.JSON(200, coolq.OK(coolq.MSG{}))
+	}
+}
+
+// config.json配置修改
+func AdminDoConfigJson(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	Json := c.PostForm("json")
+	err := json.Unmarshal([]byte(Json), &conf)
+	if err != nil {
+		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", "config.hjson", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+		return
+	}
+	if err := conf.Save("config.hjson"); err != nil {
+		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
+		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
+	} else {
+		JsonConfig = nil
+		c.JSON(200, coolq.OK(coolq.MSG{}))
+	}
+}
+
+// 拉取config.json配置
+func AdminGetConfigJson(s *webServer, c *gin.Context) {
+	conf := GetConf()
+	c.JSON(200, coolq.OK(coolq.MSG{"config": conf}))
+
+}

server/http.go

@@ -5,11 +5,14 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"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"
@@ -21,6 +24,7 @@ import (
 type httpServer struct {
 	engine *gin.Engine
 	bot    *coolq.CQBot
+	Http   *http.Server
 }
 
 type httpClient struct {
@@ -79,13 +83,23 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		err := s.engine.Run(addr)
+		s.Http = &http.Server{
-		if err != nil {
+			Addr:    addr,
+			Handler: s.engine,
+		}
+		if err := s.Http.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
 			log.Infof("请检查端口是否被占用.")
 			time.Sleep(time.Second * 5)
 			os.Exit(1)
 		}
+		//err := s.engine.Run(addr)
+		//if err != nil {
+		//	log.Error(err)
+		//	log.Infof("请检查端口是否被占用.")
+		//	time.Sleep(time.Second * 5)
+		//	os.Exit(1)
+		//}
 	}()
 }
 
@@ -118,11 +132,20 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
 		}
 		return h
-	}()).SetTimeout(time.Second * time.Duration(c.timeout)).Do()
+	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
+		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
+		Func(func(con *dataflow.Context) error {
+			if con.Error != nil {
+				log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
+				return con.Error
+			}
+			return nil
+		}).Do()
 	if err != nil {
 		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
 		return
 	}
+	log.Debugf("上报Event数据 %v 到 %v", m.ToJson(), c.addr)
 	if gjson.Valid(res) {
 		c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJson()), gjson.Parse(res))
 	}
@@ -139,55 +162,78 @@ func (s *httpServer) HandleActions(c *gin.Context) {
 	}
 }
 
-func (s *httpServer) GetLoginInfo(c *gin.Context) {
+func GetLoginInfo(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetLoginInfo())
 }
 
-func (s *httpServer) GetFriendList(c *gin.Context) {
+func GetFriendList(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetFriendList())
 }
 
-func (s *httpServer) GetGroupList(c *gin.Context) {
+func GetGroupList(s *httpServer, c *gin.Context) {
 	nc := getParamOrDefault(c, "no_cache", "false")
 	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
 }
 
-func (s *httpServer) GetGroupInfo(c *gin.Context) {
+func GetGroupInfo(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetGroupInfo(gid))
 }
 
-func (s *httpServer) GetGroupMemberList(c *gin.Context) {
+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 (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
+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 (s *httpServer) SendMessage(c *gin.Context) {
+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" {
-		s.SendPrivateMessage(c)
+		SendPrivateMessage(s, c)
 		return
 	}
 	if getParam(c, "message_type") == "group" {
-		s.SendGroupMessage(c)
+		SendGroupMessage(s, c)
 		return
 	}
 	if getParam(c, "group_id") != "" {
-		s.SendGroupMessage(c)
+		SendGroupMessage(s, c)
 		return
 	}
 	if getParam(c, "user_id") != "" {
-		s.SendPrivateMessage(c)
+		SendPrivateMessage(s, c)
 	}
 }
 
-func (s *httpServer) SendPrivateMessage(c *gin.Context) {
+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)
@@ -198,7 +244,7 @@ func (s *httpServer) SendPrivateMessage(c *gin.Context) {
 	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
 }
 
-func (s *httpServer) SendGroupMessage(c *gin.Context) {
+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)
@@ -209,34 +255,34 @@ func (s *httpServer) SendGroupMessage(c *gin.Context) {
 	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
 }
 
-func (s *httpServer) SendGroupForwardMessage(c *gin.Context) {
+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 (s *httpServer) GetImage(c *gin.Context) {
+func GetImage(s *httpServer, c *gin.Context) {
 	file := getParam(c, "file")
 	c.JSON(200, s.bot.CQGetImage(file))
 }
 
-func (s *httpServer) GetGroupMessage(c *gin.Context) {
+func GetMessage(s *httpServer, c *gin.Context) {
 	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQGetGroupMessage(int32(mid)))
+	c.JSON(200, s.bot.CQGetMessage(int32(mid)))
 }
 
-func (s *httpServer) GetGroupHonorInfo(c *gin.Context) {
+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 (s *httpServer) ProcessFriendRequest(c *gin.Context) {
+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 (s *httpServer) ProcessGroupRequest(c *gin.Context) {
+func ProcessGroupRequest(s *httpServer, c *gin.Context) {
 	flag := getParam(c, "flag")
 	subType := getParam(c, "sub_type")
 	if subType == "" {
@@ -246,99 +292,114 @@ func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
 	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
 }
 
-func (s *httpServer) SetGroupCard(c *gin.Context) {
+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 (s *httpServer) SetSpecialTitle(c *gin.Context) {
+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 (s *httpServer) SetGroupKick(c *gin.Context) {
+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")
-	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg))
+	block := getParamOrDefault(c, "reject_add_request", "false")
+	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg, block == "true"))
 }
 
-func (s *httpServer) SetGroupBan(c *gin.Context) {
+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 (s *httpServer) SetWholeBan(c *gin.Context) {
+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 (s *httpServer) SetGroupName(c *gin.Context) {
+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 (s *httpServer) SetGroupAdmin(c *gin.Context) {
+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 (s *httpServer) SendGroupNotice(c *gin.Context) {
+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 (s *httpServer) SetGroupLeave(c *gin.Context) {
+func SetGroupLeave(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupLeave(gid))
 }
 
-func (s *httpServer) GetForwardMessage(c *gin.Context) {
+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")
 	c.JSON(200, s.bot.CQGetForwardMessage(resId))
 }
 
-func (s *httpServer) DeleteMessage(c *gin.Context) {
+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 (s *httpServer) CanSendImage(c *gin.Context) {
+func CanSendImage(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQCanSendImage())
 }
 
-func (s *httpServer) CanSendRecord(c *gin.Context) {
+func CanSendRecord(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQCanSendRecord())
 }
 
-func (s *httpServer) GetStatus(c *gin.Context) {
+func GetStatus(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetStatus())
 }
 
-func (s *httpServer) GetVersionInfo(c *gin.Context) {
+func GetVersionInfo(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetVersionInfo())
 }
 
-func (s *httpServer) ReloadEventFilter(c *gin.Context) {
+func ReloadEventFilter(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQReloadEventFilter())
 }
 
-func (s *httpServer) GetVipInfo(c *gin.Context) {
+func GetVipInfo(s *httpServer, c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetVipInfo(uid))
 }
 
-func (s *httpServer) GetStrangerInfo(c *gin.Context) {
+func GetStrangerInfo(s *httpServer, c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
 }
 
-func (s *httpServer) HandleQuickOperation(c *gin.Context) {
+func HandleQuickOperation(s *httpServer, c *gin.Context) {
 	if c.Request.Method != "POST" {
 		c.AbortWithStatus(404)
 		return
@@ -349,6 +410,23 @@ func (s *httpServer) HandleQuickOperation(c *gin.Context) {
 	}
 }
 
+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 != "" {
@@ -398,106 +476,60 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 }
 
 var httpApi = map[string]func(s *httpServer, c *gin.Context){
-	"get_login_info": func(s *httpServer, c *gin.Context) {
+	"get_login_info":             GetLoginInfo,
-		s.GetLoginInfo(c)
+	"get_friend_list":            GetFriendList,
-	},
+	"get_group_list":             GetGroupList,
-	"get_friend_list": func(s *httpServer, c *gin.Context) {
+	"get_group_info":             GetGroupInfo,
-		s.GetFriendList(c)
+	"get_group_member_list":      GetGroupMemberList,
-	},
+	"get_group_member_info":      GetGroupMemberInfo,
-	"get_group_list": func(s *httpServer, c *gin.Context) {
+	"get_group_file_system_info": GetGroupFileSystemInfo,
-		s.GetGroupList(c)
+	"get_group_root_files":       GetGroupRootFiles,
-	},
+	"get_group_files_by_folder":  GetGroupFilesByFolderId,
-	"get_group_info": func(s *httpServer, c *gin.Context) {
+	"get_group_file_url":         GetGroupFileUrl,
-		s.GetGroupInfo(c)
+	"send_msg":                   SendMessage,
-	},
+	"send_group_msg":             SendGroupMessage,
-	"get_group_member_list": func(s *httpServer, c *gin.Context) {
+	"send_group_forward_msg":     SendGroupForwardMessage,
-		s.GetGroupMemberList(c)
+	"send_private_msg":           SendPrivateMessage,
-	},
+	"delete_msg":                 DeleteMessage,
-	"get_group_member_info": func(s *httpServer, c *gin.Context) {
+	"set_friend_add_request":     ProcessFriendRequest,
-		s.GetGroupMemberInfo(c)
+	"set_group_add_request":      ProcessGroupRequest,
-	},
+	"set_group_card":             SetGroupCard,
-	"send_msg": func(s *httpServer, c *gin.Context) {
+	"set_group_special_title":    SetSpecialTitle,
-		s.SendMessage(c)
+	"set_group_kick":             SetGroupKick,
-	},
+	"set_group_ban":              SetGroupBan,
-	"send_group_msg": func(s *httpServer, c *gin.Context) {
+	"set_group_whole_ban":        SetWholeBan,
-		s.SendGroupMessage(c)
+	"set_group_name":             SetGroupName,
-	},
+	"set_group_admin":            SetGroupAdmin,
-	"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
+	"set_restart":                SetRestart,
-		s.SendGroupForwardMessage(c)
+	"_send_group_notice":         SendGroupNotice,
-	},
+	"set_group_leave":            SetGroupLeave,
-	"send_private_msg": func(s *httpServer, c *gin.Context) {
+	"get_image":                  GetImage,
-		s.SendPrivateMessage(c)
+	"get_forward_msg":            GetForwardMessage,
-	},
+	"get_msg":                    GetMessage,
-	"delete_msg": func(s *httpServer, c *gin.Context) {
+	"get_group_system_msg":       GetGroupSystemMessage,
-		s.DeleteMessage(c)
+	"get_group_honor_info":       GetGroupHonorInfo,
-	},
+	"can_send_image":             CanSendImage,
-	"set_friend_add_request": func(s *httpServer, c *gin.Context) {
+	"can_send_record":            CanSendRecord,
-		s.ProcessFriendRequest(c)
+	"get_status":                 GetStatus,
-	},
+	"get_version_info":           GetVersionInfo,
-	"set_group_add_request": func(s *httpServer, c *gin.Context) {
+	"_get_vip_info":              GetVipInfo,
-		s.ProcessGroupRequest(c)
+	"get_stranger_info":          GetStrangerInfo,
-	},
+	"reload_event_filter":        ReloadEventFilter,
-	"set_group_card": func(s *httpServer, c *gin.Context) {
+	"set_group_portrait":         SetGroupPortrait,
-		s.SetGroupCard(c)
+	".handle_quick_operation":    HandleQuickOperation,
-	},
+	".ocr_image":                 OcrImage,
-	"set_group_special_title": func(s *httpServer, c *gin.Context) {
+	".get_word_slices":           GetWordSlices,
-		s.SetSpecialTitle(c)
+}
-	},
+
-	"set_group_kick": func(s *httpServer, c *gin.Context) {
+func (s *httpServer) ShutDown() {
-		s.SetGroupKick(c)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	},
+	defer cancel()
-	"set_group_ban": func(s *httpServer, c *gin.Context) {
+	if err := s.Http.Shutdown(ctx); err != nil {
-		s.SetGroupBan(c)
+		log.Fatal("http Server Shutdown:", err)
-	},
+	}
-	"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
+	select {
-		s.SetWholeBan(c)
+	case <-ctx.Done():
-	},
+		log.Println("timeout of 5 seconds.")
-	"set_group_name": func(s *httpServer, c *gin.Context) {
+	}
-		s.SetGroupName(c)
+	log.Println("http Server exiting")
-	},
-	"set_group_admin": func(s *httpServer, c *gin.Context) {
-		s.SetGroupAdmin(c)
-	},
-	"_send_group_notice": func(s *httpServer, c *gin.Context) {
-		s.SendGroupNotice(c)
-	},
-	"set_group_leave": func(s *httpServer, c *gin.Context) {
-		s.SetGroupLeave(c)
-	},
-	"get_image": func(s *httpServer, c *gin.Context) {
-		s.GetImage(c)
-	},
-	"get_forward_msg": func(s *httpServer, c *gin.Context) {
-		s.GetForwardMessage(c)
-	},
-	"get_group_msg": func(s *httpServer, c *gin.Context) {
-		s.GetGroupMessage(c)
-	},
-	"get_group_honor_info": func(s *httpServer, c *gin.Context) {
-		s.GetGroupHonorInfo(c)
-	},
-	"can_send_image": func(s *httpServer, c *gin.Context) {
-		s.CanSendImage(c)
-	},
-	"can_send_record": func(s *httpServer, c *gin.Context) {
-		s.CanSendRecord(c)
-	},
-	"get_status": func(s *httpServer, c *gin.Context) {
-		s.GetStatus(c)
-	},
-	"get_version_info": func(s *httpServer, c *gin.Context) {
-		s.GetVersionInfo(c)
-	},
-	"_get_vip_info": func(s *httpServer, c *gin.Context) {
-		s.GetVipInfo(c)
-	},
-	"get_stranger_info": func(s *httpServer, c *gin.Context) {
-		s.GetStrangerInfo(c)
-	},
-	"reload_event_filter": func(s *httpServer, c *gin.Context) {
-		s.ReloadEventFilter(c)
-	},
-	".handle_quick_operation": func(s *httpServer, c *gin.Context) {
-		s.HandleQuickOperation(c)
-	},
 }

server/websocket.go

@@ -433,7 +433,7 @@ var wsApi = map[string]func(*coolq.CQBot, 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)
+		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 {
@@ -474,12 +474,25 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetForwardMessage(p.Get("message_id").Str)
 	},
-	"get_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+	"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMessage(int32(p.Get("message_id").Int()))
+		return bot.CQGetMessage(int32(p.Get("message_id").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 = 0
+		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()
 	},
@@ -495,12 +508,36 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"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_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)
+	},
+	".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())
+	},
 	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 	},