update doc.

fix: get gender of group member

.github/ISSUE_TEMPLATE/bug--.md

@@ -7,11 +7,20 @@ assignees: ''
 
 ---
 
+<!--
+在提出ISSUE前，希望您能花费一定的时间执行以下几个步骤以方便我们定位BUG.
+1: 确定没有相同问题的ISSUE已被提出.
+2: 准确填写环境信息.
+3: 最好能打开DEBUG模式并复现相关问题.
+4: 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+-->
+
 **环境信息**
 请根据实际使用环境修改以下信息
-go-cqhttp版本: v0.9.10
-运行环境: windows_amd64
-连接方式: 反向WS
+go-cqhttp版本: 
+运行环境: 
+连接方式: 
+使用协议: 
 
 **bug内容**
 请在这里详细描述bug的内容

.github/workflows/ci.yml

@@ -16,12 +16,16 @@ jobs:
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
+        goarch: ["386", amd64, arm, arm64]
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: arm64
           - goos: darwin
             goarch: "386"
+          - goos: windows
+            goarch: arm64
       fail-fast: true
 
     steps:

.github/workflows/release.yml

@@ -10,12 +10,16 @@ jobs:
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm]
+        goarch: ["386", amd64, arm, arm64]
         exclude: 
           - goos: darwin
             goarch: arm
+          - goos: darwin
+            goarch: arm64
           - goos: darwin
             goarch: "386"
+          - goos: windows
+            goarch: arm64
             
     steps:
       - uses: actions/checkout@v2
@@ -30,4 +34,4 @@ jobs:
           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 }}"
-          
+          

.gitignore

@@ -1,2 +1,7 @@
 vendor/
 .idea
+config.hjson
+device.json
+codec/
+data/
+logs/

Dockerfile

@@ -2,14 +2,15 @@ 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 \
-  && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
+RUN set -ex \
+    && cd /build \
+    && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
 
 FROM alpine:latest
 

README.md

@@ -1,113 +1,282 @@
+<p align="center">
+  <a href="https://ishkong.github.io/go-cqhttp-docs/"><img src="https://i.loli.net/2020/12/20/qSLMDWxiocRQgu6.jpg" width="200" height="200" alt="go-cqhttp"></a>
+</p>
+
+<div align="center">
+
 # go-cqhttp
-使用 [mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 开发的cqhttp golang原生实现, 并在[cqhttp原版](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
-文档暂时可查看 `docs` 目录， 目前还在撰写中.
 
-测试版可前往 Release 下载
+_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [cqhttp](https://github.com/howmanybots/onebot/blob/master/README.md) golang 原生实现 ✨_
 
-# 兼容性
+</div>
+
+<p align="center">
+  <a href="https://raw.githubusercontent.com/Mrs4s/go-cqhttp/master/LICENSE">
+    <img src="https://img.shields.io/github/license/Mrs4s/go-cqhttp" alt="license">
+  </a>
+  <a href="https://github.com/Mrs4s/go-cqhttp/releases">
+    <img src="https://img.shields.io/github/v/release/Mrs4s/go-cqhttp?color=blueviolet&include_prereleases" alt="release">
+  </a>
+  <a href="https://github.com/howmanybots/onebot/blob/master/README.md">
+    <img src="https://img.shields.io/badge/OneBot-v11-blue?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAAIVBMVEUAAAAAAAADAwMHBwceHh4UFBQNDQ0ZGRkoKCgvLy8iIiLWSdWYAAAAAXRSTlMAQObYZgAAAQVJREFUSMftlM0RgjAQhV+0ATYK6i1Xb+iMd0qgBEqgBEuwBOxU2QDKsjvojQPvkJ/ZL5sXkgWrFirK4MibYUdE3OR2nEpuKz1/q8CdNxNQgthZCXYVLjyoDQftaKuniHHWRnPh2GCUetR2/9HsMAXyUT4/3UHwtQT2AggSCGKeSAsFnxBIOuAggdh3AKTL7pDuCyABcMb0aQP7aM4AnAbc/wHwA5D2wDHTTe56gIIOUA/4YYV2e1sg713PXdZJAuncdZMAGkAukU9OAn40O849+0ornPwT93rphWF0mgAbauUrEOthlX8Zu7P5A6kZyKCJy75hhw1Mgr9RAUvX7A3csGqZegEdniCx30c3agAAAABJRU5ErkJggg==" alt="cqhttp">
+  </a>
+  <a href="https://github.com/Mrs4s/go-cqhttp/actions">
+    <img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action">
+  </a>
+</p>
+
+<p align="center">
+  <a href="http://ishkong.github.io/go-cqhttp-docs">文档</a>
+  ·
+  <a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
+  ·
+  <a href="https://ishkong.github.io/go-cqhttp-docs/guide/quick_start.html">开始使用</a>
+</p>
+
+---
+
+go-cqhttp 在[原版 cqhttp](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
+
+---
+
+## 兼容性
+
+### 接口
 
-#### 接口
 - [x] HTTP API
-- [x] 反向HTTP POST
-- [x] 正向Websocket
-- [x] 反向Websocket
+- [x] 反向 HTTP POST
+- [x] 正向 Websocket
+- [x] 反向 Websocket
 
-#### 拓展支持
-> 拓展API可前往 [文档](docs/cqhttp.md) 查看
-- [x] HTTP POST多点上报
-- [x] 反向WS多点连接 
+### 拓展支持
+
+> 拓展 API 可前往 [文档](docs/cqhttp.md) 查看
+
+- [x] HTTP POST 多点上报
+- [x] 反向 WS 多点连接
 - [x] 修改群名
 - [x] 消息撤回事件
 - [x] 解析/发送 回复消息
 - [x] 解析/发送 合并转发
-- [ ] 使用代理请求网络图片
+- [x] 使用代理请求网络图片
+
+### 实现
 
-#### 实现
 <details>
 <summary>已实现CQ码</summary>
 
-- [CQ:image]
-- [CQ:record]
-- [CQ:video]
-- [CQ:face]
-- [CQ:at]
-- [CQ:share]
-- [CQ:reply]
-- [CQ:forward]
-- [CQ:node]
-- [CQ:gift]
-- [CQ:redbag]
-- [CQ:tts]
-- [CQ:music]
+#### 符合 Onebot 标准的 CQ 码
+
+| CQ 码        | 功能                        |
+| ------------ | --------------------------- |
+| [CQ:face]    | [QQ 表情]                   |
+| [CQ:record]  | [语音]                      |
+| [CQ:video]   | [短视频]                    |
+| [CQ:at]      | [@某人]                     |
+| [CQ:share]   | [链接分享]                  |
+| [CQ:music]   | [音乐分享] [音乐自定义分享] |
+| [CQ:reply]   | [回复]                      |
+| [CQ:forward] | [合并转发]                  |
+| [CQ:node]    | [合并转发节点]              |
+| [CQ:xml]     | [XML 消息]                  |
+| [CQ:json]    | [JSON 消息]                 |
+
+[qq 表情]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#qq-%E8%A1%A8%E6%83%85
+[语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E8%AF%AD%E9%9F%B3
+[短视频]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
+[@某人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E6%9F%90%E4%BA%BA
+[链接分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
+[音乐分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
+[音乐自定义分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
+[回复]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%9B%9E%E5%A4%8D
+[合并转发]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
+[合并转发节点]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
+[xml 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#xml-%E6%B6%88%E6%81%AF
+[json 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#json-%E6%B6%88%E6%81%AF
+
+#### 拓展 CQ 码及与 Onebot 标准有略微差异的 CQ 码
+
+| 拓展 CQ 码     | 功能                              |
+| -------------- | --------------------------------- |
+| [CQ:image]     | [图片]                            |
+| [CQ:redbag]    | [红包]                            |
+| [CQ:poke]      | [戳一戳]                          |
+| [CQ:gift]      | [礼物]                            |
+| [CQ:node]      | [合并转发消息节点]                |
+| [CQ:cardimage] | [一种 xml 的图片消息（装逼大图）] |
+| [CQ:tts]       | [文本转语音]                      |
+
+[图片]: docs/cqhttp.md#%E5%9B%BE%E7%89%87
+[红包]: docs/cqhttp.md#%E7%BA%A2%E5%8C%85
+[戳一戳]: docs/cqhttp.md#%E6%88%B3%E4%B8%80%E6%88%B3
+[礼物]: docs/cqhttp.md#%E7%A4%BC%E7%89%A9
+[合并转发消息节点]: docs/cqhttp.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9
+[一种 xml 的图片消息（装逼大图）]: docs/cqhttp.md#cardimage-%E4%B8%80%E7%A7%8Dxml%E7%9A%84%E5%9B%BE%E7%89%87%E6%B6%88%E6%81%AF%E8%A3%85%E9%80%BC%E5%A4%A7%E5%9B%BE
+[文本转语音]: docs/cqhttp.md#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3
 
 </details>
 
 <details>
 <summary>已实现API</summary>
 
-##### 注意: 部分API实现与CQHTTP原版略有差异，请参考文档
-| API                      | 功能                                                                                                                                                                                                         |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| /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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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://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          | [设置群组名](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)                                                                  |
-| /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_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)                                                                     |
-| /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_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)  |
-| /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_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)                        |
+#### 符合 Onebot 标准的 API
+
+| API                      | 功能                   |
+| ------------------------ | ---------------------- |
+| /send_private_msg        | [发送私聊消息]         |
+| /send_group_msg          | [发送群消息]           |
+| /send_msg                | [发送消息]             |
+| /delete_msg              | [撤回信息]             |
+| /set_group_kick          | [群组踢人]             |
+| /set_group_ban           | [群组单人禁言]         |
+| /set_group_whole_ban     | [群组全员禁言]         |
+| /set_group_admin         | [群组设置管理员]       |
+| /set_group_card          | [设置群名片（群备注）] |
+| /set_group_name          | [设置群名]             |
+| /set_group_leave         | [退出群组]             |
+| /set_group_special_title | [设置群组专属头衔]     |
+| /set_friend_add_request  | [处理加好友请求]       |
+| /set_group_add_request   | [处理加群请求/邀请]    |
+| /get_login_info          | [获取登录号信息]       |
+| /get_stranger_info       | [获取陌生人信息]       |
+| /get_friend_list         | [获取好友列表]         |
+| /get_group_info          | [获取群信息]           |
+| /get_group_list          | [获取群列表]           |
+| /get_group_member_info   | [获取群成员信息]       |
+| /get_group_member_list   | [获取群成员列表]       |
+| /get_group_honor_info    | [获取群荣誉信息]       |
+| /can_send_image          | [检查是否可以发送图片] |
+| /can_send_record         | [检查是否可以发送语音] |
+| /get_version_info        | [获取版本信息]         |
+| /set_restart             | [重启 go-cqhttp]       |
+| /.handle_quick_operation | [对事件执行快速操作]   |
+
+[发送私聊消息]: 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
+[发送群消息]: 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
+[发送消息]: 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
+[撤回信息]: 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
+[群组踢人]: 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
+[群组单人禁言]: 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
+[群组全员禁言]: 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
+[群组设置管理员]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+[设置群名片（群备注）]: 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
+[设置群名]: 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
+[退出群组]: 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
+[设置群组专属头衔]: 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
+[处理加好友请求]: 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
+[处理加群请求/邀请]: 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
+[获取登录号信息]: 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
+[获取陌生人信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
+[获取好友列表]: 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
+[获取群信息]: 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
+[获取群列表]: 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
+[获取群成员信息]: 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
+[获取群成员列表]: 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
+[获取群荣誉信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+[检查是否可以发送图片]: 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
+[检查是否可以发送语音]: 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
+[获取版本信息]: 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
+[重启 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
+[对事件执行快速操作]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
+
+#### 拓展 API 及与 Onebot 标准有略微差异的 API
+
+| 拓展 API                    | 功能                   |
+| --------------------------- | ---------------------- |
+| /set_group_portrait         | [设置群头像]           |
+| /get_image                  | [获取图片信息]         |
+| /get_msg                    | [获取消息]             |
+| /get_forward_msg            | [获取合并转发内容]     |
+| /send_group_forward_msg     | [发送合并转发(群)]     |
+| /.get_word_slices           | [获取中文分词]         |
+| /.ocr_image                 | [图片 OCR]             |
+| /get_group_system_msg       | [获取群系统消息]       |
+| /get_group_file_system_info | [获取群文件系统信息]   |
+| /get_group_root_files       | [获取群根目录文件列表] |
+| /get_group_files_by_folder  | [获取群子目录文件列表] |
+| /get_group_file_url         | [获取群文件资源链接]   |
+| /get_status                 | [获取状态]             |
+
+[设置群头像]: docs/cqhttp.md#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
+[获取图片信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
+[获取消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
+[获取合并转发内容]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E5%86%85%E5%AE%B9
+[发送合并转发(群)]: docs/cqhttp.md#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E7%BE%A4
+[获取中文分词]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D
+[图片 ocr]: docs/cqhttp.md#%E5%9B%BE%E7%89%87ocr
+[获取群系统消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
+[获取群文件系统信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
+[获取群根目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群子目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群文件资源链接]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
+[获取状态]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%8A%B6%E6%80%81
 
 </details>
 
 <details>
 <summary>已实现Event</summary>
 
-##### 注意: 部分Event数据与CQHTTP原版略有差异，请参考文档
-| Event                                                                                                                                                |
-| ---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [私聊信息](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://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#群内戳一戳)                                                                                     |
-| [群管理员变动](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://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://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://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80)                                    |
-| [群文件上传](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://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://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) |
+#### 符合 Onebot 标准的 Event（部分 Event 比 Onebot 标准多上报几个字段，不影响使用）
+
+| 事件类型 | Event            |
+| -------- | ---------------- |
+| 消息事件 | [私聊信息]       |
+| 消息事件 | [群消息]         |
+| 通知事件 | [群文件上传]     |
+| 通知事件 | [群管理员变动]   |
+| 通知事件 | [群成员减少]     |
+| 通知事件 | [群成员增加]     |
+| 通知事件 | [群禁言]         |
+| 通知事件 | [好友添加]       |
+| 通知事件 | [群消息撤回]     |
+| 通知事件 | [好友消息撤回]   |
+| 通知事件 | [群内戳一戳]     |
+| 通知事件 | [群红包运气王]   |
+| 通知事件 | [群成员荣誉变更] |
+| 请求事件 | [加好友请求]     |
+| 请求事件 | [加群请求/邀请]  |
+
+[私聊信息]: 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://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
+[群文件上传]: 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://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://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://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://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
+[好友添加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
+[群消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[好友消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[群内戳一戳]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
+[群红包运气王]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
+[群成员荣誉变更]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
+[加好友请求]: 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://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
+
+#### 拓展 Event
+
+| 事件类型 | 拓展 Event       |
+| -------- | ---------------- |
+| 通知事件 | [好友戳一戳]     |
+| 通知事件 | [群成员名片更新] |
+| 通知事件 | [接收到离线文件] |
+
+[好友戳一戳]: docs/cqhttp.md#%E5%A5%BD%E5%8F%8B%E6%88%B3%E4%B8%80%E6%88%B3
+[群成员名片更新]: docs/cqhttp.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%90%8D%E7%89%87%E6%9B%B4%E6%96%B0
+[接收到离线文件]: docs/cqhttp.md#%E6%8E%A5%E6%94%B6%E5%88%B0%E7%A6%BB%E7%BA%BF%E6%96%87%E4%BB%B6
 
 </details>
 
-# 关于ISSUE
+## 关于 ISSUE
 
-以下ISSUE会被直接关闭
-- 提交BUG不使用Template
+以下 ISSUE 会被直接关闭
+
+- 提交 BUG 不使用 Template
 - 询问已知问题
 - 提问找不到重点
 - 重复提问
 
 > 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。
 
-# 性能
+## 性能
 
-在关闭数据库的情况下, 加载25个好友128个群运行24小时后内存使用为10MB左右. 开启数据库后内存使用将根据消息量增加10-20MB, 如果系统内存小于128M建议关闭数据库使用. 
+在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 10MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

coolq/api.go

@@ -1,9 +1,13 @@
 package coolq
 
 import (
+	"crypto/md5"
+	"encoding/hex"
 	"io/ioutil"
+	"math"
 	"os"
 	"path"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -55,10 +59,17 @@ func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
-func (bot *CQBot) CQGetGroupInfo(groupId int64) MSG {
+func (bot *CQBot) CQGetGroupInfo(groupId int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
-		return Failed(100)
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+	}
+	if noCache {
+		var err error
+		group, err = bot.Client.GetGroupInfo(groupId)
+		if err != nil {
+			return Failed(100, "GET_GROUP_INFO_API_ERROR", err.Error())
+		}
 	}
 	return OK(MSG{
 		"group_id":         group.Code,
@@ -72,13 +83,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
 	}
@@ -93,11 +104,11 @@ 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))
 }
@@ -106,7 +117,7 @@ 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)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
 	}
 	return OK(fs)
 }
@@ -115,12 +126,12 @@ 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)
+		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)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
 	}
 	return OK(MSG{
 		"files":   files,
@@ -132,12 +143,12 @@ 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)
+		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)
+		return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
 	}
 	return OK(MSG{
 		"files":   files,
@@ -148,7 +159,7 @@ func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG
 func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) MSG {
 	url := bot.Client.GetGroupFileUrl(groupId, fileId, busId)
 	if url == "" {
-		return Failed(100)
+		return Failed(100, "FILE_SYSTEM_API_ERROR")
 	}
 	return OK(MSG{
 		"url": url,
@@ -158,7 +169,7 @@ func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) M
 func (bot *CQBot) CQGetWordSlices(content string) MSG {
 	slices, err := bot.Client.GetWordSegmentation(content)
 	if err != nil {
-		return Failed(100)
+		return Failed(100, "WORD_SEGMENTATION_API_ERROR", err.Error())
 	}
 	for i := 0; i < len(slices); i++ {
 		slices[i] = strings.ReplaceAll(slices[i], "\u0000", "")
@@ -188,7 +199,7 @@ 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})
@@ -204,7 +215,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 {
@@ -215,7 +226,7 @@ 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})
@@ -225,7 +236,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 	if m.Type != gjson.JSON {
 		return Failed(100)
 	}
-	var nodes []*message.ForwardNode
+	var sendNodes []*message.ForwardNode
 	ts := time.Now().Add(-time.Minute * 5)
 	hasCustom := func() bool {
 		for _, item := range m.Array() {
@@ -235,13 +246,14 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 		}
 		return false
 	}()
-	convert := func(e gjson.Result) {
+	var convert func(e gjson.Result) []*message.ForwardNode
+	convert = func(e gjson.Result) (nodes []*message.ForwardNode) {
 		if e.Get("type").Str != "node" {
-			return
+			return nil
 		}
 		ts.Add(time.Second)
 		if e.Get("data.id").Exists() {
-			i, _ := strconv.Atoi(e.Get("data.id").Str)
+			i, _ := strconv.Atoi(e.Get("data.id").String())
 			m := bot.GetMessage(int32(i))
 			if m != nil {
 				sender := m["sender"].(message.Sender)
@@ -249,10 +261,11 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 					SenderId:   sender.Uin,
 					SenderName: (&sender).DisplayName(),
 					Time: func() int32 {
-						if hasCustom {
+						msgTime := m["time"].(int32)
+						if hasCustom && msgTime == 0 {
 							return int32(ts.Unix())
 						}
-						return m["time"].(int32)
+						return msgTime
 					}(),
 					Message: bot.ConvertStringMessage(m["message"].(string), true),
 				})
@@ -262,13 +275,41 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 			return
 		}
 		uin, _ := strconv.ParseInt(e.Get("data.uin").Str, 10, 64)
+		msgTime, err := strconv.ParseInt(e.Get("data.time").Str, 10, 64)
+		if err != nil {
+			msgTime = ts.Unix()
+		}
 		name := e.Get("data.name").Str
+		c := e.Get("data.content")
+		if c.IsArray() {
+			flag := false
+			c.ForEach(func(_, value gjson.Result) bool {
+				if value.Get("type").String() == "node" {
+					flag = true
+					return false
+				}
+				return true
+			})
+			if flag {
+				var taowa []*message.ForwardNode
+				for _, item := range c.Array() {
+					taowa = append(taowa, convert(item)...)
+				}
+				nodes = append(nodes, &message.ForwardNode{
+					SenderId:   uin,
+					SenderName: name,
+					Time:       int32(msgTime),
+					Message:    []message.IMessageElement{bot.Client.UploadGroupForwardMessage(groupId, &message.ForwardMessage{Nodes: taowa})},
+				})
+				return
+			}
+		}
 		content := bot.ConvertObjectMessage(e.Get("data.content"), true)
 		if uin != 0 && name != "" && len(content) > 0 {
 			var newElem []message.IMessageElement
 			for _, elem := range content {
-				if img, ok := elem.(*message.ImageElement); ok {
-					gm, err := bot.Client.UploadGroupImage(groupId, img.Data)
+				if img, ok := elem.(*LocalImageElement); ok {
+					gm, err := bot.UploadLocalImageAsGroup(groupId, img)
 					if err != nil {
 						log.Warnf("警告：群 %v 图片上传失败: %v", groupId, err)
 						continue
@@ -276,29 +317,39 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 					newElem = append(newElem, gm)
 					continue
 				}
+				if video, ok := elem.(*LocalVideoElement); ok {
+					gm, err := bot.UploadLocalVideo(groupId, video)
+					if err != nil {
+						log.Warnf("警告：群 %v 视频上传失败: %v", groupId, err)
+						continue
+					}
+					newElem = append(newElem, gm)
+					continue
+				}
 				newElem = append(newElem, elem)
 			}
 			nodes = append(nodes, &message.ForwardNode{
 				SenderId:   uin,
 				SenderName: name,
-				Time:       int32(ts.Unix()),
+				Time:       int32(msgTime),
 				Message:    newElem,
 			})
 			return
 		}
 		log.Warnf("警告: 非法 Forward node 将跳过")
+		return
 	}
 	if m.IsArray() {
 		for _, item := range m.Array() {
-			convert(item)
+			sendNodes = append(sendNodes, convert(item)...)
 		}
 	} else {
-		convert(m)
+		sendNodes = convert(m)
 	}
-	if len(nodes) > 0 {
-		gm := bot.Client.SendGroupForwardMessage(groupId, &message.ForwardMessage{Nodes: nodes})
+	if len(sendNodes) > 0 {
+		gm := bot.Client.SendGroupForwardMessage(groupId, &message.ForwardMessage{Nodes: sendNodes})
 		return OK(MSG{
-			"message_id": ToGlobalId(groupId, gm.Id),
+			"message_id": bot.InsertGroupMessage(gm),
 		})
 	}
 	return Failed(100)
@@ -309,10 +360,10 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
-			elem := bot.ConvertObjectMessage(m, true)
+			elem := bot.ConvertObjectMessage(m, false)
 			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})
@@ -327,7 +378,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 {
@@ -337,7 +388,7 @@ 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})
@@ -351,7 +402,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
@@ -362,7 +413,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 {
@@ -370,7 +421,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 {
@@ -378,7 +429,7 @@ 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
@@ -389,7 +440,7 @@ func (bot *CQBot) CQSetGroupKick(groupId, userId int64, msg string, block bool)
 			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
@@ -400,7 +451,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
@@ -409,7 +460,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
@@ -418,14 +469,25 @@ func (bot *CQBot) CQSetGroupLeave(groupId int64) MSG {
 		g.Quit()
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+}
+
+func (bot *CQBot) CQGetAtAllRemain(groupId int64) MSG {
+	if g := bot.Client.FindGroup(groupId); g != nil {
+		i, err := bot.Client.GetAtAllRemain(groupId)
+		if err != nil {
+			return Failed(100, "GROUP_REMAIN_API_ERROR", err.Error())
+		}
+		return OK(i)
+	}
+	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()
@@ -440,14 +502,14 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bo
 	msgs, err := bot.Client.GetGroupSystemMessages()
 	if err != nil {
 		log.Errorf("获取群系统消息失败: %v", err)
-		return Failed(100)
+		return Failed(100, "SYSTEM_MSG_API_ERROR", err.Error())
 	}
 	if subType == "add" {
 		for _, req := range msgs.JoinRequests {
 			if strconv.FormatInt(req.RequestId, 10) == flag {
 				if req.Checked {
 					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
-					return Failed(100)
+					return Failed(100, "FLAG_HAS_BEEN_CHECKED", "消息已被处理")
 				}
 				if approve {
 					req.Accept()
@@ -462,7 +524,7 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bo
 			if strconv.FormatInt(req.RequestId, 10) == flag {
 				if req.Checked {
 					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
-					return Failed(100)
+					return Failed(100, "FLAG_HAS_BEEN_CHECKED", "消息已被处理")
 				}
 				if approve {
 					req.Accept()
@@ -474,28 +536,28 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bo
 		}
 	}
 	log.Errorf("处理群系统消息失败: 消息 %v 不存在.", flag)
-	return Failed(100)
+	return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在")
 }
 
 // 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.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)
+			return Failed(100, "RECALL_API_ERROR", err.Error())
 		}
 	} else {
 		if msg["sender"].(message.Sender).Uin != bot.Client.Uin {
-			log.Warnf("撤回 %v 失败: 好友会话无法撤回对方消息.")
-			return Failed(100)
+			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)
+			return Failed(100, "RECALL_API_ERROR", err.Error())
 		}
 	}
 	return OK(nil)
@@ -505,17 +567,17 @@ 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)
@@ -524,7 +586,7 @@ func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
 func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
 	vip, err := bot.Client.GetVipInfo(userId)
 	if err != nil {
-		return Failed(100)
+		return Failed(100, "VIP_API_ERROR", err.Error())
 	}
 	msg := MSG{
 		"user_id":          vip.Uin,
@@ -597,16 +659,20 @@ 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,
 		"nickname": info.Nickname,
+		"qid":      info.Qid,
 		"sex": func() string {
 			if info.Sex == 1 {
 				return "female"
+			} else if info.Sex == 0 {
+				return "male"
 			}
-			return "male"
+			// unknown = 0x2
+			return "unknown"
 		}(),
 		"age":        info.Age,
 		"level":      info.Level,
@@ -673,10 +739,10 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 }
 
 func (bot *CQBot) CQGetImage(file string) MSG {
-	if !global.PathExists(path.Join(global.IMAGE_PATH, file)) {
+	if !global.PathExists(path.Join(global.ImagePath, file)) {
 		return Failed(100)
 	}
-	if b, err := ioutil.ReadFile(path.Join(global.IMAGE_PATH, file)); err == nil {
+	if b, err := ioutil.ReadFile(path.Join(global.ImagePath, file)); err == nil {
 		r := binary.NewReader(b)
 		r.ReadBytes(16)
 		msg := MSG{
@@ -684,7 +750,7 @@ func (bot *CQBot) CQGetImage(file string) MSG {
 			"filename": r.ReadString(),
 			"url":      r.ReadString(),
 		}
-		local := path.Join(global.CACHE_PATH, file+"."+path.Ext(msg["filename"].(string)))
+		local := path.Join(global.CachePath, file+"."+path.Ext(msg["filename"].(string)))
 		if !global.PathExists(local) {
 			if data, err := global.GetBytes(msg["url"].(string)); err == nil {
 				_ = ioutil.WriteFile(local, data, 0644)
@@ -692,14 +758,34 @@ 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) CQDownloadFile(url string, headers map[string]string, threadCount int) MSG {
+	hash := md5.Sum([]byte(url))
+	file := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
+	if global.PathExists(file) {
+		if err := os.Remove(file); err != nil {
+			log.Warnf("删除缓存文件 %v 时出现错误: %v", file, err)
+			return Failed(100, "DELETE_FILE_ERROR", err.Error())
+		}
+	}
+	if err := global.DownloadFileMultiThreading(url, file, 0, threadCount, headers); err != nil {
+		log.Warnf("下载链接 %v 时出现错误: %v", url, err)
+		return Failed(100, "DOWNLOAD_FILE_ERROR", err.Error())
+	}
+	abs, _ := filepath.Abs(file)
+	return OK(MSG{
+		"file": abs,
+	})
 }
 
 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 {
@@ -721,21 +807,29 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
 func (bot *CQBot) CQGetMessage(messageId int32) MSG {
 	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,
+		"message_id":  messageId,
+		"real_id":     msg["message-id"],
+		"message_seq": msg["message-id"],
+		"group":       isGroup,
+		"group_id":    gid,
+		"message_type": func() string {
+			if isGroup {
+				return "group"
+			}
+			return "private"
+		}(),
 		"sender": MSG{
 			"user_id":  sender.Uin,
 			"nickname": sender.Nickname,
 		},
-		"time": msg["time"],
+		"time":        msg["time"],
+		"raw_message": raw,
 		"message": ToFormattedMessage(bot.ConvertStringMessage(raw, isGroup), func() int64 {
 			if isGroup {
 				return gid.(int64)
@@ -749,11 +843,62 @@ func (bot *CQBot) CQGetGroupSystemMessages() MSG {
 	msg, err := bot.Client.GetGroupSystemMessages()
 	if err != nil {
 		log.Warnf("获取群系统消息失败: %v", err)
-		return Failed(100)
+		return Failed(100, "SYSTEM_MSG_API_ERROR", err.Error())
 	}
 	return OK(msg)
 }
 
+func (bot *CQBot) CQGetGroupMessageHistory(groupId int64, seq int64) MSG {
+	if g := bot.Client.FindGroup(groupId); g == nil {
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+	}
+	if seq == 0 {
+		g, err := bot.Client.GetGroupInfo(groupId)
+		if err != nil {
+			return Failed(100, "GROUP_INFO_API_ERROR", err.Error())
+		}
+		seq = g.LastMsgSeq
+	}
+	msg, err := bot.Client.GetGroupMessages(groupId, int64(math.Max(float64(seq-19), 1)), seq)
+	if err != nil {
+		log.Warnf("获取群历史消息失败: %v", err)
+		return Failed(100, "MESSAGES_API_ERROR", err.Error())
+	}
+	var ms []MSG
+	for _, m := range msg {
+		id := m.Id
+		if bot.db != nil {
+			id = bot.InsertGroupMessage(m)
+		}
+		t := bot.formatGroupMessage(m)
+		t["message_id"] = id
+		ms = append(ms, t)
+	}
+	return OK(MSG{
+		"messages": ms,
+	})
+}
+
+func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
+	if noCache {
+		if err := bot.Client.RefreshStatus(); err != nil {
+			log.Warnf("刷新客户端状态时出现问题 %v", err)
+			return Failed(100, "REFRESH_STATUS_ERROR", err.Error())
+		}
+	}
+	var d []MSG
+	for _, oc := range bot.Client.OnlineClients {
+		d = append(d, MSG{
+			"app_id":      oc.AppId,
+			"device_name": oc.DeviceName,
+			"device_kind": oc.DeviceKind,
+		})
+	}
+	return OK(MSG{
+		"clients": d,
+	})
+}
+
 func (bot *CQBot) CQCanSendImage() MSG {
 	return OK(MSG{"yes": true})
 }
@@ -763,15 +908,15 @@ func (bot *CQBot) CQCanSendRecord() MSG {
 }
 
 func (bot *CQBot) CQOcrImage(imageId string) MSG {
-	img, err := bot.makeImageElem(map[string]string{"file": imageId}, true)
+	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageId}, false, true)
 	if err != nil {
 		log.Warnf("load image error: %v", err)
-		return Failed(100)
+		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)
+		return Failed(100, "OCR_API_ERROR", err.Error())
 	}
 	return OK(rsp)
 }
@@ -783,15 +928,35 @@ func (bot *CQBot) CQReloadEventFilter() MSG {
 
 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)
+		img, err := global.FindFile(file, cache, global.ImagePath)
 		if err != nil {
 			log.Warnf("set group portrait error: %v", err)
-			return Failed(100)
+			return Failed(100, "LOAD_FILE_ERROR", err.Error())
 		}
 		g.UpdateGroupHeadPortrait(img)
 		return OK(nil)
 	}
-	return Failed(100)
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+}
+
+func (bot *CQBot) CQSetGroupAnonymousBan(groupId int64, flag string, duration int32) MSG {
+	if flag == "" {
+		return Failed(100, "INVALID_FLAG", "无效的flag")
+	}
+	if g := bot.Client.FindGroup(groupId); g != nil {
+		s := strings.SplitN(flag, "|", 2)
+		if len(s) != 2 {
+			return Failed(100, "INVALID_FLAG", "无效的flag")
+		}
+		id := s[0]
+		nick := s[1]
+		if err := g.MuteAnonymous(id, nick, duration); err != nil {
+			log.Warnf("anonymous ban error: %v", err)
+			return Failed(100, "CALL_API_ERROR", err.Error())
+		}
+		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
@@ -827,6 +992,8 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 				return 1
 			case client.AndroidWatch:
 				return 2
+			case client.MacOS:
+				return 3
 			default:
 				return -1
 			}
@@ -838,17 +1005,33 @@ func OK(data interface{}) MSG {
 	return MSG{"data": data, "retcode": 0, "status": "ok"}
 }
 
-func Failed(code int) MSG {
-	return MSG{"data": nil, "retcode": code, "status": "failed"}
+func Failed(code int, msg ...string) MSG {
+	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 {
 	return MSG{
-		"group_id":       groupId,
-		"user_id":        m.Uin,
-		"nickname":       m.Nickname,
-		"card":           m.CardName,
-		"sex":            "unknown",
+		"group_id": groupId,
+		"user_id":  m.Uin,
+		"nickname": m.Nickname,
+		"card":     m.CardName,
+		"sex": func() string {
+			if m.Gender == 1 {
+				return "female"
+			} else if m.Gender == 0 {
+				return "male"
+			}
+			// unknown = 0xff
+			return "unknown"
+		}(),
 		"age":            0,
 		"area":           "",
 		"join_time":      m.JoinTime,

coolq/bot.go

@@ -3,12 +3,18 @@ package coolq
 import (
 	"bytes"
 	"encoding/gob"
+	"encoding/hex"
 	"fmt"
 	"hash/crc32"
+	"io"
+	"os"
 	"path"
+	"runtime/debug"
 	"sync"
 	"time"
 
+	"github.com/Mrs4s/MiraiGo/utils"
+
 	"github.com/syndtr/goleveldb/leveldb"
 
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -18,7 +24,6 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -37,7 +42,7 @@ type MSG map[string]interface{}
 
 var ForceFragmented = false
 
-func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
+func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
@@ -72,6 +77,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
 	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
 	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
+	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	go func() {
 		i := conf.HeartbeatInterval
 		if i < 0 {
@@ -88,7 +94,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 				"self_id":         bot.Client.Uin,
 				"post_type":       "meta_event",
 				"meta_event_type": "heartbeat",
-				"status":          nil,
+				"status":          bot.CQGetStatus()["data"],
 				"interval":        1000 * i,
 			})
 		}
@@ -117,11 +123,47 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
 	return nil
 }
 
+func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
+	if img.Stream != nil {
+		return bot.Client.UploadGroupImage(groupCode, img.Stream)
+	}
+	return bot.Client.UploadGroupImageByFile(groupCode, img.File)
+}
+
+func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
+	if v.File != "" {
+		video, err := os.Open(v.File)
+		if err != nil {
+			return nil, err
+		}
+		defer video.Close()
+		hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
+		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
+		_, _ = video.Seek(0, io.SeekStart)
+		_, _ = v.thumb.Seek(0, io.SeekStart)
+		return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+	}
+	return &v.ShortVideoElement, nil
+}
+
+func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement) (*message.FriendImageElement, error) {
+	if img.Stream != nil {
+		return bot.Client.UploadPrivateImage(userId, img.Stream)
+	}
+	// need update.
+	f, err := os.Open(img.File)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	return bot.Client.UploadPrivateImage(userId, f)
+}
+
 func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
 	for _, elem := range m.Elements {
-		if i, ok := elem.(*message.ImageElement); ok {
-			gm, err := bot.Client.UploadGroupImage(groupId, i.Data)
+		if i, ok := elem.(*LocalImageElement); ok {
+			gm, err := bot.UploadLocalImageAsGroup(groupId, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err)
 				continue
@@ -130,7 +172,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 			continue
 		}
 		if i, ok := elem.(*message.VoiceElement); ok {
-			gv, err := bot.Client.UploadGroupPtt(groupId, i.Data)
+			gv, err := bot.Client.UploadGroupPtt(groupId, bytes.NewReader(i.Data))
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
 				continue
@@ -138,6 +180,15 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 			newElem = append(newElem, gv)
 			continue
 		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(groupId, i)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupId, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
 		if i, ok := elem.(*PokeElement); ok {
 			if group := bot.Client.FindGroup(groupId); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
@@ -230,8 +281,8 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
 	for _, elem := range m.Elements {
-		if i, ok := elem.(*message.ImageElement); ok {
-			fm, err := bot.Client.UploadPrivateImage(target, i.Data)
+		if i, ok := elem.(*LocalImageElement); ok {
+			fm, err := bot.UploadLocalImageAsPrivate(target, i)
 			if err != nil {
 				log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
 				continue
@@ -246,12 +297,21 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		if i, ok := elem.(*message.VoiceElement); ok {
 			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
 			if err != nil {
-				log.Warnf("警告: 好友 %v 消息语音上传失败: %v", target, err)
+				log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
 				continue
 			}
 			newElem = append(newElem, fv)
 			continue
 		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(target, i)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
 		if i, ok := elem.(*QQMusicElement); ok {
 			var msgStyle uint32 = 4
 			if i.MusicUrl == "" {
@@ -392,25 +452,78 @@ func (bot *CQBot) Release() {
 }
 
 func (bot *CQBot) dispatchEventMessage(m MSG) {
-	payload := gjson.Parse(m.ToJson())
-	filter := global.EventFilter
-	if filter != nil && (*filter).Eval(payload) == false {
+	if global.EventFilter != nil && !global.EventFilter.Eval(global.MSG(m)) {
 		log.Debug("Event filtered!")
 		return
 	}
 	for _, f := range bot.events {
-		fn := f
-		go func() {
+		go func(fn func(MSG)) {
+			defer func() {
+				if pan := recover(); pan != nil {
+					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
+				}
+			}()
 			start := time.Now()
 			fn(m)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
 			}
-		}()
+		}(f)
 	}
 }
 
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
+	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
+	gm := MSG{
+		"anonymous":    nil,
+		"font":         0,
+		"group_id":     m.GroupCode,
+		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
+		"message_type": "group",
+		"message_seq":  m.Id,
+		"post_type":    "message",
+		"raw_message":  cqm,
+		"self_id":      bot.Client.Uin,
+		"sender": MSG{
+			"age":     0,
+			"area":    "",
+			"level":   "",
+			"sex":     "unknown",
+			"user_id": m.Sender.Uin,
+		},
+		"sub_type": "normal",
+		"time":     time.Now().Unix(),
+		"user_id":  m.Sender.Uin,
+	}
+	if m.Sender.IsAnonymous() {
+		gm["anonymous"] = MSG{
+			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
+			"id":   m.Sender.Uin,
+			"name": m.Sender.AnonymousInfo.AnonymousNick,
+		}
+		gm["sender"].(MSG)["nickname"] = "匿名消息"
+		gm["sub_type"] = "anonymous"
+	} else {
+		mem := bot.Client.FindGroup(m.GroupCode).FindMember(m.Sender.Uin)
+		ms := gm["sender"].(MSG)
+		ms["role"] = func() string {
+			switch mem.Permission {
+			case client.Owner:
+				return "owner"
+			case client.Administrator:
+				return "admin"
+			default:
+				return "member"
+			}
+		}()
+		ms["nickname"] = mem.Nickname
+		ms["card"] = mem.CardName
+		ms["title"] = mem.SpecialTitle
+	}
+	return gm
+}
+
 func formatGroupName(group *client.GroupInfo) string {
 	return fmt.Sprintf("%s(%d)", group.Name, group.Code)
 }

coolq/cqcode.go

@@ -8,26 +8,37 @@ import (
 	xml2 "encoding/xml"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
+	"math"
+	"math/rand"
 	"net/url"
+	"os"
 	"path"
-	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/Mrs4s/go-cqhttp/global"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
+/*
 var matchReg = regexp.MustCompile(`\[CQ:\w+?.*?]`)
 var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
+*/
 
 var IgnoreInvalidCQCode = false
+var SplitUrl = false
+
+const maxImageSize = 1024 * 1024 * 30  // 30MB
+const maxVideoSize = 1024 * 1024 * 100 // 100MB
 
 type PokeElement struct {
 	Target int64
@@ -58,6 +69,23 @@ type MiguMusicElement struct {
 	MusicElement
 }
 
+type LocalImageElement struct {
+	message.ImageElement
+	Stream io.ReadSeeker
+	File   string
+}
+
+type LocalVoiceElement struct {
+	message.VoiceElement
+	Stream io.ReadSeeker
+}
+
+type LocalVideoElement struct {
+	message.ShortVideoElement
+	File  string
+	thumb io.ReadSeeker
+}
+
 func (e *GiftElement) Type() message.ElementType {
 	return message.At
 }
@@ -88,6 +116,7 @@ func (e *PokeElement) Type() message.ElementType {
 }
 
 func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []MSG) {
+	r = []MSG{}
 	ur := false
 	if len(raw) != 0 {
 		ur = raw[0]
@@ -104,7 +133,7 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
 		})
 	}
 	for _, elem := range e {
-		m := MSG{}
+		var m MSG
 		switch o := elem.(type) {
 		case *message.TextElement:
 			m = MSG{
@@ -315,30 +344,75 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 	return
 }
 
-func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessageElement) {
-	i := matchReg.FindAllStringSubmatchIndex(m, -1)
-	si := 0
-	for _, idx := range i {
-		if idx[0] > si {
-			text := m[si:idx[0]]
-			r = append(r, message.NewText(CQCodeUnescapeText(text)))
+func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMessageElement) {
+	index := 0
+	stat := 0
+	rMsg := []rune(msg)
+	var tempText, cqCode []rune
+	hasNext := func() bool {
+		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 {
+			if SplitUrl {
+				for _, t := range global.SplitURL(CQCodeUnescapeValue(string(tempText))) {
+					r = append(r, message.NewText(t))
+				}
+			} else {
+				r = append(r, message.NewText(CQCodeUnescapeValue(string(tempText))))
+			}
 		}
-		code := m[idx[0]:idx[1]]
-		si = idx[1]
-		t := typeReg.FindAllStringSubmatch(code, -1)[0][1]
-		ps := paramReg.FindAllStringSubmatch(code, -1)
-		d := make(map[string]string)
-		for _, p := range ps {
-			d[p[1]] = CQCodeUnescapeValue(p[2])
+		tempText = []rune{}
+		cqCode = []rune{}
+	}
+	saveCQCode := func() {
+		defer func() {
+			cqCode = []rune{}
+			tempText = []rune{}
+		}()
+		s := strings.SplitN(string(cqCode), ",", -1)
+		if len(s) == 0 {
+			return
 		}
-		if t == "reply" {
+		t := s[0]
+		params := make(map[string]string)
+		for i := 1; i < len(s); i++ {
+			p := s[i]
+			p = strings.TrimSpace(p)
+			if p == "" {
+				continue
+			}
+			data := strings.SplitN(p, "=", 2)
+			if len(data) == 2 {
+				params[data[0]] = CQCodeUnescapeValue(data[1])
+			} else {
+				params[p] = ""
+			}
+		}
+		if t == "reply" { // reply 特殊处理
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
 					log.Warnf("警告: 一条信息只能包含一个 Reply 元素.")
-					continue
+					return
 				}
 			}
-			mid, err := strconv.Atoi(d["id"])
+			mid, err := strconv.Atoi(params["id"])
+			customText := params["text"]
 			if err == nil {
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
@@ -350,19 +424,45 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 							Elements: bot.ConvertStringMessage(org["message"].(string), group),
 						},
 					}, r...)
-					continue
+					return
 				}
+			} else if customText != "" {
+				sender, err := strconv.ParseInt(params["qq"], 10, 64)
+				if err != nil {
+					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					return
+				}
+				msgTime, err := strconv.ParseInt(params["time"], 10, 64)
+				if err != nil {
+					msgTime = time.Now().Unix()
+				}
+				r = append([]message.IMessageElement{
+					&message.ReplyElement{
+						ReplySeq: int32(0),
+						Sender:   sender,
+						Time:     int32(msgTime),
+						Elements: bot.ConvertStringMessage(customText, group),
+					},
+				}, r...)
+				return
 			}
 		}
-		elem, err := bot.ToElement(t, d, group)
-		if err != nil {
-			if !IgnoreInvalidCQCode {
-				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将原样发送.", code, err)
-				r = append(r, message.NewText(code))
-			} else {
-				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将忽略.", code, err)
+		if t == "forward" { // 单独处理转发
+			if id, ok := params["id"]; ok {
+				r = []message.IMessageElement{bot.Client.DownloadForwardMessage(id)}
+				return
 			}
-			continue
+		}
+		elem, err := bot.ToElement(t, params, group)
+		if err != nil {
+			org := "[CQ:" + string(cqCode) + "]"
+			if !IgnoreInvalidCQCode {
+				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
+				r = append(r, message.NewText(org))
+			} else {
+				log.Warnf("转换CQ码 %v 时出现错误: %v 将忽略.", org, err)
+			}
+			return
 		}
 		switch i := elem.(type) {
 		case message.IMessageElement:
@@ -371,9 +471,32 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 			r = append(r, i...)
 		}
 	}
-	if si != len(m) {
-		r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
+	for hasNext() {
+		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
 }
 
@@ -388,6 +511,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 				}
 			}
 			mid, err := strconv.Atoi(e.Get("data").Get("id").String())
+			customText := e.Get("data").Get("text").String()
 			if err == nil {
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
@@ -401,8 +525,31 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 					}, r...)
 					return
 				}
+			} else if customText != "" {
+				sender, err := strconv.ParseInt(e.Get("data").Get("qq").String(), 10, 64)
+				if err != nil {
+					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					return
+				}
+				msgTime, err := strconv.ParseInt(e.Get("data").Get("time").String(), 10, 64)
+				if err != nil {
+					msgTime = time.Now().Unix()
+				}
+				r = append([]message.IMessageElement{
+					&message.ReplyElement{
+						ReplySeq: int32(0),
+						Sender:   sender,
+						Time:     int32(msgTime),
+						Elements: bot.ConvertStringMessage(customText, group),
+					},
+				}, r...)
+				return
 			}
 		}
+		if t == "forward" {
+			r = []message.IMessageElement{bot.Client.DownloadForwardMessage(e.Get("data.id").String())}
+			return
+		}
 		d := make(map[string]string)
 		e.Get("data").ForEach(func(key, value gjson.Result) bool {
 			d[key.Str] = value.String()
@@ -419,7 +566,6 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 		case []message.IMessageElement:
 			r = append(r, i...)
 		}
-
 	}
 	if m.Type == gjson.String {
 		return bot.ConvertStringMessage(m.Str, group)
@@ -441,9 +587,16 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) {
 	switch t {
 	case "text":
+		if SplitUrl {
+			var ret []message.IMessageElement
+			for _, text := range global.SplitURL(d["text"]) {
+				ret = append(ret, message.NewText(text))
+			}
+			return ret, nil
+		}
 		return message.NewText(d["text"]), nil
 	case "image":
-		img, err := bot.makeImageElem(d, group)
+		img, err := bot.makeImageOrVideoElem(d, false, group)
 		if err != nil {
 			return nil, err
 		}
@@ -451,11 +604,11 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		if tp != "show" && tp != "flash" {
 			return img, nil
 		}
-		if i, ok := img.(*message.ImageElement); ok { // 秀图，闪照什么的就直接传了吧
+		if i, ok := img.(*LocalImageElement); ok { // 秀图，闪照什么的就直接传了吧
 			if group {
-				img, err = bot.Client.UploadGroupImage(1, i.Data)
+				img, err = bot.UploadLocalImageAsGroup(1, i)
 			} else {
-				img, err = bot.Client.UploadPrivateImage(1, i.Data)
+				img, err = bot.UploadLocalImageAsPrivate(1, i)
 			}
 			if err != nil {
 				return nil, err
@@ -501,19 +654,21 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 			}
 		}()
 		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"]
-		data, err := global.FindFile(f, d["cache"], global.VOICE_PATH)
+		data, err := global.FindFile(f, d["cache"], global.VoicePath)
+		if err == global.ErrSyntax {
+			data, err = global.FindFile(f, d["cache"], global.VoicePathOld)
+		}
 		if err != nil {
 			return nil, err
 		}
 		if !global.IsAMRorSILK(data) {
-			data, err = global.Encoder(data)
+			data, err = global.EncoderSilk(data)
 			if err != nil {
 				return nil, err
 			}
@@ -630,14 +785,12 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 	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"]))
@@ -665,11 +818,58 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
 		if maxHeight == 0 {
 			maxHeight = 1000
 		}
-		img, err := bot.makeImageElem(d, group)
+		img, err := bot.makeImageOrVideoElem(d, false, group)
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
 		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
+	case "video":
+		cache := d["cache"]
+		if cache == "" {
+			cache = "1"
+		}
+		file, err := bot.makeImageOrVideoElem(d, true, group)
+		if err != nil {
+			return nil, err
+		}
+		v := file.(*LocalVideoElement)
+		if v.File == "" {
+			return v, nil
+		}
+		var data []byte
+		if cover, ok := d["cover"]; ok {
+			data, _ = global.FindFile(cover, cache, global.ImagePath)
+		} else {
+			_ = global.ExtractCover(v.File, v.File+".jpg")
+			data, _ = ioutil.ReadFile(v.File + ".jpg")
+		}
+		v.thumb = bytes.NewReader(data)
+		video, _ := os.Open(v.File)
+		defer video.Close()
+		_, err = video.Seek(4, io.SeekStart)
+		if err != nil {
+			return nil, err
+		}
+		var header = make([]byte, 4)
+		_, err = video.Read(header)
+		if err != nil {
+			return nil, err
+		}
+		if !bytes.Equal(header, []byte{0x66, 0x74, 0x79, 0x70}) { // check file header ftyp
+			_, _ = video.Seek(0, io.SeekStart)
+			hash, _ := utils.ComputeMd5AndLength(video)
+			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".mp4")
+			if global.PathExists(cacheFile) && cache == "1" {
+				goto ok
+			}
+			err = global.EncodeMP4(v.File, cacheFile)
+			if err != nil {
+				return nil, err
+			}
+		ok:
+			v.File = cacheFile
+		}
+		return v, nil
 	default:
 		return nil, errors.New("unsupported cq code: " + t)
 	}
@@ -711,34 +911,37 @@ func CQCodeUnescapeValue(content string) string {
 }
 
 // 图片 elem 生成器，单独拎出来，用于公用
-func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessageElement, error) {
+func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
 	f := d["file"]
 	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
 		cache := d["cache"]
+		c := d["c"]
 		if cache == "" {
 			cache = "1"
 		}
 		hash := md5.Sum([]byte(f))
-		cacheFile := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
-		if global.PathExists(cacheFile) && cache == "1" {
-			b, err := ioutil.ReadFile(cacheFile)
-			if err == nil {
-				return message.NewImage(b), nil
+		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
+		var maxSize = func() int64 {
+			if video {
+				return maxVideoSize
 			}
+			return maxImageSize
+		}()
+		thread, _ := strconv.Atoi(c)
+		if global.PathExists(cacheFile) && cache == "1" {
+			goto hasCacheFile
 		}
-		b, err := global.GetBytes(f)
-		if err != nil {
+		if global.PathExists(cacheFile) {
+			_ = os.Remove(cacheFile)
+		}
+		if err := global.DownloadFileMultiThreading(f, cacheFile, maxSize, thread, nil); err != nil {
 			return nil, err
 		}
-		_ = ioutil.WriteFile(cacheFile, b, 0644)
-		return message.NewImage(b), nil
-	}
-	if strings.HasPrefix(f, "base64") {
-		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
-		if err != nil {
-			return nil, err
+	hasCacheFile:
+		if video {
+			return &LocalVideoElement{File: cacheFile}, nil
 		}
-		return message.NewImage(b), nil
+		return &LocalImageElement{File: cacheFile}, nil
 	}
 	if strings.HasPrefix(f, "file") {
 		fu, err := url.Parse(f)
@@ -748,33 +951,81 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
 			fu.Path = fu.Path[1:]
 		}
-		b, err := ioutil.ReadFile(fu.Path)
+		info, err := os.Stat(fu.Path)
+		if err != nil {
+			if !os.IsExist(err) {
+				return nil, errors.New("file not found")
+			}
+			return nil, err
+		}
+		if video {
+			if info.Size() == 0 || info.Size() >= maxVideoSize {
+				return nil, errors.New("invalid video size")
+			}
+			return &LocalVideoElement{File: fu.Path}, nil
+		}
+		if info.Size() == 0 || info.Size() >= maxImageSize {
+			return nil, errors.New("invalid image size")
+		}
+		return &LocalImageElement{File: fu.Path}, nil
+	}
+	rawPath := path.Join(global.ImagePath, f)
+	if video {
+		rawPath = path.Join(global.VideoPath, f)
+		if !global.PathExists(rawPath) {
+			return nil, errors.New("invalid video")
+		}
+		if path.Ext(rawPath) == ".video" {
+			b, _ := ioutil.ReadFile(rawPath)
+			r := binary.NewReader(b)
+			return &LocalVideoElement{ShortVideoElement: message.ShortVideoElement{ // todo 检查缓存是否有效
+				Md5:       r.ReadBytes(16),
+				ThumbMd5:  r.ReadBytes(16),
+				Size:      r.ReadInt32(),
+				ThumbSize: r.ReadInt32(),
+				Name:      r.ReadString(),
+				Uuid:      r.ReadAvailable(),
+			}}, nil
+		} else {
+			return &LocalVideoElement{File: rawPath}, nil
+		}
+	}
+	if strings.HasPrefix(f, "base64") {
+		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
 		if err != nil {
 			return nil, err
 		}
-		return message.NewImage(b), nil
+		return &LocalImageElement{Stream: bytes.NewReader(b)}, nil
+	}
+	if !global.PathExists(rawPath) && global.PathExists(path.Join(global.ImagePathOld, f)) {
+		rawPath = path.Join(global.ImagePathOld, f)
 	}
-	rawPath := path.Join(global.IMAGE_PATH, f)
 	if !global.PathExists(rawPath) && global.PathExists(rawPath+".cqimg") {
 		rawPath += ".cqimg"
 	}
 	if !global.PathExists(rawPath) && d["url"] != "" {
-		return bot.makeImageElem(map[string]string{"file": d["url"]}, group)
+		return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
 	}
 	if global.PathExists(rawPath) {
-		b, err := ioutil.ReadFile(rawPath)
+		file, err := os.Open(rawPath)
 		if err != nil {
 			return nil, err
 		}
 		if path.Ext(rawPath) != ".image" && path.Ext(rawPath) != ".cqimg" {
-			return message.NewImage(b), nil
+			return &LocalImageElement{Stream: file}, nil
+		}
+		b, err := ioutil.ReadAll(file)
+		if err != nil {
+			return nil, err
 		}
 		if len(b) < 20 {
 			return nil, errors.New("invalid local file")
 		}
-		var size int32
-		var hash []byte
-		var url string
+		var (
+			size int32
+			hash []byte
+			url  string
+		)
 		if path.Ext(rawPath) == ".cqimg" {
 			for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
 				kv := strings.SplitN(line, "=", 2)
@@ -795,27 +1046,23 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 		}
 		if size == 0 {
 			if url != "" {
-				return bot.makeImageElem(map[string]string{"file": url}, group)
+				return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group)
 			}
 			return nil, errors.New("img size is 0")
 		}
 		if len(hash) != 16 {
 			return nil, errors.New("invalid hash")
 		}
+		var rsp message.IMessageElement
 		if group {
-			rsp, err := bot.Client.QueryGroupImage(1, hash, size)
-			if err != nil {
-				if url != "" {
-					return bot.makeImageElem(map[string]string{"file": url}, group)
-				}
-				return nil, err
-			}
-			return rsp, nil
+			rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
+			goto ok
 		}
-		rsp, err := bot.Client.QueryFriendImage(1, hash, size)
+		rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
+	ok:
 		if err != nil {
 			if url != "" {
-				return bot.makeImageElem(map[string]string{"file": url}, group)
+				return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group)
 			}
 			return nil, err
 		}
@@ -828,9 +1075,9 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
 	xml := ""
 	var suf message.IMessageElement
-	if i, ok := elem.(*message.ImageElement); ok {
-		if group == false {
-			gm, err := bot.Client.UploadPrivateImage(1, i.Data)
+	if i, ok := elem.(*LocalImageElement); ok {
+		if !group {
+			gm, err := bot.UploadLocalImageAsPrivate(1, i)
 			if err != nil {
 				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
@@ -838,7 +1085,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, 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)
+			gm, err := bot.UploadLocalImageAsGroup(1, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
 				return nil, err

coolq/event.go

@@ -17,15 +17,17 @@ import (
 
 var format = "string"
 
+//SetMessageFormat 设置消息上报格式，默认为string
 func SetMessageFormat(f string) {
 	format = f
 }
 
-func ToFormattedMessage(e []message.IMessageElement, code int64, raw ...bool) (r interface{}) {
+//ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
+func ToFormattedMessage(e []message.IMessageElement, id int64, raw ...bool) (r interface{}) {
 	if format == "string" {
-		r = ToStringMessage(e, code, raw...)
+		r = ToStringMessage(e, id, raw...)
 	} else if format == "array" {
-		r = ToArrayMessage(e, code, raw...)
+		r = ToArrayMessage(e, id, raw...)
 	}
 	return
 }
@@ -91,52 +93,8 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 		id = bot.InsertGroupMessage(m)
 	}
 	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
-	gm := MSG{
-		"anonymous":    nil,
-		"font":         0,
-		"group_id":     m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
-		"message_id":   id,
-		"message_type": "group",
-		"post_type":    "message",
-		"raw_message":  cqm,
-		"self_id":      c.Uin,
-		"sender": MSG{
-			"age":     0,
-			"area":    "",
-			"level":   "",
-			"sex":     "unknown",
-			"user_id": m.Sender.Uin,
-		},
-		"sub_type": "normal",
-		"time":     time.Now().Unix(),
-		"user_id":  m.Sender.Uin,
-	}
-	if m.Sender.IsAnonymous() {
-		gm["anonymous"] = MSG{
-			"flag": "",
-			"id":   0,
-			"name": m.Sender.Nickname,
-		}
-		gm["sender"].(MSG)["nickname"] = "匿名消息"
-		gm["sub_type"] = "anonymous"
-	} else {
-		mem := c.FindGroup(m.GroupCode).FindMember(m.Sender.Uin)
-		ms := gm["sender"].(MSG)
-		ms["role"] = func() string {
-			switch mem.Permission {
-			case client.Owner:
-				return "owner"
-			case client.Administrator:
-				return "admin"
-			default:
-				return "member"
-			}
-		}()
-		ms["nickname"] = mem.Nickname
-		ms["card"] = mem.CardName
-		ms["title"] = mem.SpecialTitle
-	}
+	gm := bot.formatGroupMessage(m)
+	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
 }
 
@@ -455,6 +413,27 @@ func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupR
 	})
 }
 
+func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.OtherClientStatusChangedEvent) {
+	if e.Online {
+		log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
+	} else {
+		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
+	}
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"notice_type": "client_status",
+		"online":      e.Online,
+		"client": MSG{
+			"app_id":      e.Client.AppId,
+			"device_name": e.Client.DeviceName,
+			"device_kind": e.Client.DeviceKind,
+		},
+		"self_id": c.Uin,
+		"time":    time.Now().Unix(),
+	})
+
+}
+
 func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
 	return MSG{
 		"post_type":   "notice",
@@ -499,8 +478,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 		switch i := elem.(type) {
 		case *message.ImageElement:
 			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) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteString(i.Filename)
@@ -510,8 +489,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			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) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteString(filename)
@@ -520,8 +499,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			}
 		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) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
 					w.WriteString(filename)
@@ -530,8 +509,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			}
 		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) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteString(i.Filename)
@@ -541,8 +520,8 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			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) {
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteString(i.Filename)
@@ -553,20 +532,22 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 		case *message.VoiceElement:
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
-			if !global.PathExists(path.Join(global.VOICE_PATH, i.Name)) {
+			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
 				b, err := global.GetBytes(i.Url)
 				if err != nil {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = ioutil.WriteFile(path.Join(global.VOICE_PATH, i.Name), b, 0644)
+				_ = ioutil.WriteFile(path.Join(global.VoicePath, i.Name), b, 0644)
 			}
 		case *message.ShortVideoElement:
 			filename := hex.EncodeToString(i.Md5) + ".video"
-			if !global.PathExists(path.Join(global.VIDEO_PATH, filename)) {
-				_ = ioutil.WriteFile(path.Join(global.VIDEO_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+			if !global.PathExists(path.Join(global.VideoPath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
 					w.Write(i.Md5)
+					w.Write(i.ThumbMd5)
 					w.WriteUInt32(uint32(i.Size))
+					w.WriteUInt32(uint32(i.ThumbSize))
 					w.WriteString(i.Name)
 					w.Write(i.Uuid)
 				}), 0644)

docs/EventFilter.md

@@ -1,12 +1,22 @@
 # 事件过滤器
 
-在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则会暂停所有上报。
+在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则不会启用事件过滤器。
 事件过滤器会处理所有事件(包括心跳事件在内的元事件),请谨慎使用！！
 
+注意: 与客户端建立连接的握手事件**不会**经过事件过滤器
+
 ## 示例
 
 这节首先给出一些示例，演示过滤器的基本用法，下一节将给出具体语法说明。
 
+### 过滤所有事件
+
+```json
+{
+    ".not": {}
+}
+```
+
 ### 只上报以「!!」开头的消息
 
 ```json
@@ -128,5 +138,5 @@
 
 这里有几点需要注意：
 
-- `message` 字段在运行过滤器时是消息段数组的形式（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
+- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
 - `raw_message` 字段为未经**CQ码**处理的原始消息字符串，这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

docs/config.md

@@ -78,6 +78,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | post_message_format   | string   | 上报信息类型                                                                             |
 | ignore_invalid_cqcode | bool     | 是否忽略错误的CQ码                                                                       |
 | force_fragmented      | bool     | 是否强制分片发送群长消息                                                                 |
+| fix_url               | bool     | 是否对链接的发送进行预处理, 可缓解链接信息被风控导致无法发送的情况, 但可能影响客户端着色(不影响内容)|
 | use_sso_address       | bool     | 是否使用服务器下发的地址                                                                 |
 | heartbeat_interval    | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)                              |
 | http_config           | object   | HTTP API配置                                                                             |
@@ -112,10 +113,10 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 
 | 值  | 类型          | 限制                                                             |
 | --- | ------------- | ---------------------------------------------------------------- |
-| 0   | iPad          | 无                                                                        |
-| 1   | Android Phone | 无法接收新版表情如 `/吃瓜 /汪汪`, 会自动转换为字符串                            |
-| 2   | Android Watch | 除`Android Phone`的限制外, 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息 |
-| 3   | MacOS         | 无                                                                             |
+| 0   | iPad          | 无                                                               |
+| 1   | Android Phone | 无                                                               |
+| 2   | Android Watch | 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息            |
+| 3   | MacOS         | 无                                                               |
 
 > 注意, 根据协议的不同, 各类消息有所限制
 

docs/cqhttp.md

@@ -2,10 +2,68 @@
 
 由于部分 api 原版 CQHTTP 并未实现，go-cqhttp 修改并增加了一些拓展 api .
 
+<details>
+<summary>目录</summary>
+<p>
+
+##### CQCode
+- [图片](#图片)
+- [回复](#回复)
+- [红包](#红包)
+- [戳一戳](#戳一戳)
+- [礼物](#礼物)
+- [合并转发](#合并转发)
+- [合并转发消息节点](#合并转发消息节点)
+- [XML 消息](#xml-消息)
+- [JSON 消息](#json-消息)
+- [cardimage](#cardimage)
+- [文本转语音](#文本转语音)
+- [图片](#图片)
+
+##### API
+- [设置群名](#设置群名)
+- [设置群头像](#设置群头像)
+- [获取图片信息](#获取图片信息)
+- [获取消息](#获取消息)
+- [获取合并转发内容](#获取合并转发内容)
+- [发送合并转发(群)](#发送合并转发(群))
+- [获取中文分词](#获取中文分词)
+- [图片OCR](#图片OCR)
+- [获取中文分词](#获取中文分词)
+- [获取群系统消息](#获取群文件系统信息)
+- [获取群文件系统信息](#获取群文件系统信息)
+- [获取群根目录文件列表](#获取群根目录文件列表)
+- [获取群子目录文件列表](#获取群子目录文件列表)
+- [获取群文件资源链接](#获取群文件资源链接)
+- [获取状态](#获取状态)
+- [获取群子目录文件列表](#设置群名)
+- [获取用户VIP信息](#获取用户VIP信息)
+- [发送群公告](#发送群公告)
+- [重载事件过滤器](#重载事件过滤器)
+
+##### 事件
+- [群消息撤回](#群消息撤回)
+- [好友消息撤回](#好友消息撤回)
+- [好友戳一戳](#好友戳一戳)
+- [群内戳一戳](#群内戳一戳)
+- [群红包运气王提示](#群红包运气王提示)
+- [群成员荣誉变更提示](#群成员荣誉变更提示)
+- [群成员名片更新](#群成员名片更新)
+- [接收到离线文件](#接收到离线文件)
+
+</p>
+</details>
+
 ## CQCode
 
 ### 图片
 
+Type : `image`
+
+范围: **发送/接收**
+
+参数:
+
 | 参数名  | 可能的值        | 说明                                                            |
 | ------- | --------------- | --------------------------------------------------------------- |
 | `file`  | -               | 图片文件名                                                      |
@@ -13,6 +71,7 @@
 | `url`   | -               | 图片 URL                                                        |
 | `cache` | `0` `1`         | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
 | `id`    | -               | 发送秀图时的特效id，默认为40000                                 |
+| `c`     | `2` `3`         | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
 
 可用的特效ID:
 
@@ -25,6 +84,9 @@
 | 40004 | 爱你 |
 | 40005 | 征友 |
 
+示例: `[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]`
+
+> 注意：图片总大小不能超过30MB，gif总帧数不能超过300帧
 
 ### 回复
 
@@ -32,13 +94,23 @@ Type : `reply`
 
 范围: **发送/接收**
 
+> 注意: 如果id存在则优先处理id
+
 参数:
 
 | 参数名 | 类型 | 说明                                  |
 | ------ | ---- | ------------------------------------- |
-| id     | int  | 回复时所引用的消息id, 必须为本群消息. |
+| `id`   | int  | 回复时所引用的消息id, 必须为本群消息. |
+| `text`   | string  | 自定义回复的信息 |
+| `qq`   | int64  | 自定义回复时的自定义QQ, 如果使用自定义信息必须指定. |
+| `time`   | int64  | 自定义回复时的时间, 格式为Unix时间 |
+
+
+
+示例: `[CQ:reply,id=123456]` 
+\
+自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000]`
 
-示例: `[CQ:reply,id=123456]`
 
 ### 红包
 
@@ -48,9 +120,9 @@ Type: `redbag`
 
 参数:
 
-| 参数名 | 类型   | 说明        |
-| ------ | ------ | ----------- |
-| title  | string | 祝福语/口令 |
+| 参数名  | 类型   | 说明        |
+| ------- | ------ | ----------- |
+| `title` | string | 祝福语/口令 |
 
 示例: `[CQ:redbag,title=恭喜发财]`
 
@@ -66,7 +138,7 @@ Type: `poke`
 
 | 参数名 | 类型  | 说明         |
 | ------ | ----- | ------------ |
-| qq     | int64 | 需要戳的成员 |
+| `qq`   | int64 | 需要戳的成员 |
 
 示例: `[CQ:poke,qq=123456]`
 
@@ -82,8 +154,8 @@ Type: `gift`
 
 | 参数名 | 类型  | 说明           |
 | ------ | ----- | -------------- |
-| qq     | int64 | 接收礼物的成员 |
-| id     | int   | 礼物的类型     |
+| `qq`   | int64 | 接收礼物的成员 |
+| `id`   | int   | 礼物的类型     |
 
 目前支持的礼物ID:
 
@@ -116,9 +188,9 @@ Type: `forward`
 
 参数:
 
-| 参数名 | 类型   | 说明                                                          |
-| ------ | ------ | ------------------------------------------------------------- |
-| id     | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
+| 参数名 | 类型   | 说明                                                         |
+| ------ | ------ | ------------------------------------------------------------ |
+| `id`   | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
 
 示例: `[CQ:forward,id=xxxx]`
 
@@ -130,12 +202,12 @@ Type: `node`
 
 参数:
 
-| 参数名  | 类型    | 说明           | 特殊说明                                                                               |
-| ------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
-| id      | int32   | 转发消息id     | 直接引用他人的消息合并转发,  实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
-| name    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序)                  |
-| uin     | int64   | 发送者QQ号     | 用于自定义消息                                                                         |
-| content | message | 具体消息       | 用于自定义消息 **不支持转发套娃，不支持引用回复**                                      |
+| 参数名    | 类型    | 说明           | 特殊说明                                                     |
+| --------- | ------- | -------------- | ------------------------------------------------------------ |
+| `id`      | int32   | 转发消息id     | 直接引用他人的消息合并转发,  实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
+| `name`    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) |
+| `uin`     | int64   | 发送者QQ号     | 用于自定义消息                                               |
+| `content` | message | 具体消息       | 用于自定义消息            |
 
 特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.  另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
@@ -197,7 +269,8 @@ Type: `node`
         "data": {
             "name": "自定义发送者",
             "uin": "10086",
-            "content": "我是自定义消息"
+            "content": "我是自定义消息",
+            "time": "3376656000"
         }
     },
     {
@@ -208,8 +281,22 @@ Type: `node`
     }
 ]
 ````
+### 短视频消息
 
-### xml支持
+Type: `video`
+
+范围: **发送/接收**
+
+参数:
+
+| 参数名  | 类型   | 说明                                              |
+| ------- | ------ | ------------------------------------------------|
+| `file`  | string | 支持http和file发送                                |
+| `cover` | string | 视频封面，支持http，file和base64发送，格式必须为jpg    |
+| `c`     | `2` `3`| 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
+示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
+
+### XML 消息
 
 Type: `xml`
 
@@ -217,10 +304,10 @@ Type: `xml`
 
 参数:
 
-| 参数名 | 类型   | 说明                                      |
-| ------ | ------ | ----------------------------------------- |
-| data   | string | xml内容，xml中的value部分，记得实体化处理 |
-| resid  | int32  | 可以不填                                  |
+| 参数名  | 类型   | 说明                                      |
+| ------- | ------ | ----------------------------------------- |
+| `data`  | string | xml内容，xml中的value部分，记得实体化处理 |
+| `resid` | int32  | 可以不填                                  |
 
 示例: `[CQ:xml,data=xxxx]`
 
@@ -258,7 +345,7 @@ Type: `xml`
 </msg>
 ```
 
-### json消息支持
+### JSON 消息
 
 Type: `json`
 
@@ -266,20 +353,20 @@ Type: `json`
 
 参数:
 
-| 参数名 | 类型   | 说明                                            |
-| ------ | ------ | ----------------------------------------------- |
-| data   | string | json内容，json的所有字符串记得实体化处理        |
-| resid  | int32  | 默认不填为0，走小程序通道，填了走富文本通道发送 |
+| 参数名  | 类型   | 说明                                            |
+| ------- | ------ | ----------------------------------------------- |
+| `data`  | string | json内容，json的所有字符串记得实体化处理        |
+| `resid` | int32  | 默认不填为0，走小程序通道，填了走富文本通道发送 |
 
 json中的字符串需要进行转义：
 
->","=>`&#44;`、
+>","=> `&#44;`
 
->"&"=> `&amp;`、
+>"&"=> `&amp;`
 
->"["=>`&#91;`、
+>"["=> `&#91;`
 
->"]"=>`&#93;`、
+>"]"=> `&#93;`
 
 否则无法正确得到解析
 
@@ -289,7 +376,8 @@ json中的字符串需要进行转义：
 ```
 
 
-### cardimage 一种xml的图片消息（装逼大图）
+### cardimage
+一种xml的图片消息（装逼大图）
 
 ps: xml 接口的消息都存在风控风险，请自行兼容发送失败后的处理（可以失败后走普通图片模式）
 
@@ -299,15 +387,15 @@ Type: `cardimage`
 
 参数:
 
-| 参数名    | 类型   | 说明                                  |
-| --------- | ------ | ------------------------------------- |
-| file      | string | 和image的file字段对齐，支持也是一样的 |
-| minwidth  | int64  | 默认不填为400，最小width              |
-| minheight | int64  | 默认不填为400，最小height             |
-| maxwidth  | int64  | 默认不填为500，最大width              |
-| maxheight | int64  | 默认不填为1000，最大height            |
-| source    | string | 分享来源的名称，可以留空              |
-| icon      | string | 分享来源的icon图标url，可以留空       |
+| 参数名      | 类型   | 说明                                  |
+| ----------- | ------ | ------------------------------------- |
+| `file`      | string | 和image的file字段对齐，支持也是一样的 |
+| `minwidth`  | int64  | 默认不填为400，最小width              |
+| `minheight` | int64  | 默认不填为400，最小height             |
+| `maxwidth`  | int64  | 默认不填为500，最大width              |
+| `maxheight` | int64  | 默认不填为1000，最大height            |
+| `source`    | string | 分享来源的名称，可以留空              |
+| `icon`      | string | 分享来源的icon图标url，可以留空       |
 
 
 示例cardimage 的cq码：
@@ -327,7 +415,7 @@ Type: `tts`
 
 | 参数名 | 类型   | 说明 |
 | ------ | ------ | ---- |
-| text   | string | 内容 |
+| `text` | string | 内容 |
 
 示例: `[CQ:tts,text=这是一条测试消息]`
 
@@ -339,10 +427,10 @@ Type: `tts`
 
 **参数** 
 
-| 字段       | 类型   | 说明 |
-| ---------- | ------ | ---- |
-| group_id   | int64  | 群号 |
-| group_name | string | 新名 |
+| 字段         | 类型   | 说明 |
+| ------------ | ------ | ---- |
+| `group_id`   | int64  | 群号 |
+| `group_name` | string | 新名 |
 
 ### 设置群头像
 
@@ -350,11 +438,11 @@ Type: `tts`
 
 **参数** 
 
-| 字段     | 类型   | 说明                     |
-| -------- | ------ | ------------------------ |
-| group_id | int64  | 群号                     |
-| file     | string | 图片文件名               |
-| cache    | int    | 表示是否使用已缓存的文件 |
+| 字段       | 类型   | 说明                     |
+| ---------- | ------ | ------------------------ |
+| `group_id` | int64  | 群号                     |
+| `file`     | string | 图片文件名               |
+| `cache`    | int    | 表示是否使用已缓存的文件 |
 
 [1]`file` 参数支持以下几种格式：
 
@@ -462,6 +550,12 @@ Type: `tts`
 | `group_id` | int64          | 群号                         |
 | `messages` | forward node[] | 自定义转发消息, 具体看CQCode |
 
+响应数据
+
+| 字段         | 类型   | 说明   |
+| ------------ | ------ | ------ |
+| `message_id` | string | 消息id |
+
 ### 获取中文分词
 
 终结点: `/.get_word_slices`  
@@ -654,34 +748,177 @@ Type: `tts`
 
 **响应数据**
 
-| 字段            | 类型       | 说明                            |
-| --------------- | ---------- | ------------------------------- |
-| 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 | 运行统计                        |
+| 字段              | 类型       | 说明                            |
+| ----------------- | ---------- | ------------------------------- |
+| `app_initialized` | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| `app_enabled`     | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| `plugins_good`    | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| `app_good`        | bool       | 原 `CQHTTP` 字段, 恒定为 `true` |
+| `online`          | bool       | 表示BOT是否在线                 |
+| `good`           | 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 | 账号掉线次数     |
+| 字段               | 类型   | 说明             |
+| ------------------ | ------ | ---------------- |
+| `packet_received`  | uint64 | 收到的数据包总数 |
+| `packet_sent`      | uint64 | 发送的数据包总数 |
+| `packet_lost`      | uint32 | 数据包丢失总数   |
+| `message_received` | uint64 | 接受信息总数     |
+| `message_sent`     | uint64 | 发送信息总数     |
+| `disconnect_times` | uint32 | TCP链接断开次数  |
+| `lost_times`       | uint32 | 账号掉线次数     |
 
 > 注意: 所有统计信息都将在重启后重制
 
+### 获取群@全体成员剩余次数
+
+终结点: `/get_group_at_all_remain`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `group_id` | int64  | 群号                      |
+
+**响应数据**
+
+| 字段                             | 类型       | 说明                            |
+| ------------------------------- | ---------- | ------------------------------- |
+| `can_at_all`                    | bool       | 是否可以@全体成员                |
+| `remain_at_all_count_for_group` | int16      | 群内所有管理当天剩余@全体成员次数 |
+| `remain_at_all_count_for_uin`   | int16      | BOT当天剩余@全体成员次数         |
+
+### 下载文件到缓存目录
+
+终结点: `/download_file`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `url` | string  | 链接地址                      |
+| `thread_count` | int32  | 下载线程数            |
+| `headers` | string or array  | 自定义请求头    |
+
+**`headers`格式:**
+
+字符串:
+
+```
+User-Agent=YOUR_UA[\r\n]Referer=https://www.baidu.com
+```
+
+> `[\r\n]` 为换行符, 使用http请求时请注意编码
+
+JSON数组:
+
+```
+[
+    "User-Agent=YOUR_UA",
+    "Referer=https://www.baidu.com",
+]
+```
+
+**响应数据**
+
+| 字段        | 类型       | 说明            |
+| ---------- | ---------- | ------------ |
+| `file`    | string       |  下载文件的*绝对路径*        |
+
+> 通过这个API下载的文件能直接放入CQ码作为图片或语音发送
+> 调用后会阻塞直到下载完成后才会返回数据，请注意下载大文件时的超时
+
+### 获取群消息历史记录
+
+终结点：`/get_group_msg_history`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `message_seq` | int64  | 起始消息序号, 可通过 `get_msg` 获得  |
+| `group_id` | int64  | 群号            |
+
+**响应数据**
+
+| 字段        | 类型       | 说明            |
+| ---------- | ---------- | ------------ |
+| `messages`    | []Message       |  从起始序号开始的前19条消息  |
+
+> 不提供起始序号将默认获取最新的消息
+
+### 获取当前账号在线客户端列表
+
+终结点：`/get_online_clients`
+
+**参数** 
+
+| 字段       | 类型   | 说明                      |
+| ---------- | ------ | ------------------------- |
+| `no_cache` | bool  | 是否无视缓存  |
+
+**响应数据**
+
+| 字段        | 类型       | 说明            |
+| ---------- | ---------- | ------------ |
+| `clients`    | []Device       |  在线客户端列表  |
+
+**Device**
+
+| 字段        | 类型       | 说明            |
+| ---------- | ---------- | ------------ |
+| `app_id`    | int64       |  客户端ID |
+| `device_name`    | string       |  设备名称 |
+| `device_kind`    | string       |  设备类型 |
+
+### 获取用户VIP信息
+
+终结点：`/_get_vip_info`
+
+**参数**
+
+| 字段名 | 数据类型 | 默认值 | 说明 |
+| ----- | ------- | ----- | --- |
+| `user_id` | int64 | | QQ 号 |
+
+**响应数据**
+
+| 字段                | 类型    | 说明        |
+| ------------------ | ------- | ---------- |
+| `user_id`          | int64   | QQ 号       |
+| `nickname`         | string  | 用户昵称    |
+| `level`            | int64   | QQ 等级     |
+| `level_speed`      | float64 | 等级加速度  |
+| `vip_level`        | string  | 会员等级    |
+| `vip_growth_speed` | int64   | 会员成长速度 |
+| `vip_growth_total` | int64   | 会员成长总值 |
+
+### 发送群公告
+
+终结点： `/_send_group_notice`
+
+**参数**
+
+| 字段名      | 数据类型  | 默认值 | 说明    |
+| ---------- | ------- | ----- | ------ |
+| `group_id` | int64   |       | 群号    |
+| `content`  | string  |       | 公告内容 |
+
+`该 API 没有响应数据`
+
+### 重载事件过滤器
+
+终结点：`/reload_event_filter`
+
+`该 API 无需参数也没有响应数据`
+
+
 ## 事件
 
-#### 群消息撤回
+### 群消息撤回
 
 **上报数据**
 
@@ -694,7 +931,7 @@ Type: `tts`
 | `operator_id` | int64  |                | 操作者id       |
 | `message_id`  | int64  |                | 被撤回的消息id |
 
-#### 好友消息撤回
+### 好友消息撤回
 
 **上报数据**
 
@@ -705,7 +942,22 @@ Type: `tts`
 | `user_id`     | int64  |                 | 好友id         |
 | `message_id`  | int64  |                 | 被撤回的消息id |
 
-#### 群内戳一戳
+## 好友戳一戳
+
+**事件数据**
+
+| 字段名        | 数据类型 | 可能的值 | 说明 |
+| ------------- | ------ | -------- | --- |
+| `post_type`   | string | `notice` | 上报类型     |
+| `notice_type` | string | `notify` | 消息类型     |
+| `sub_type`    | string | `poke`   | 提示类型     |
+| `self_id`     | int64  |          | BOT QQ 号    |
+| `sender_id`   | int64  |          | 发送者 QQ 号 |
+| `user_id`     | int64  |          | 发送者 QQ 号 |
+| `target_id`   | int64  |          | 被戳者 QQ 号 |
+| `time`        | int64  |          | 时间         |
+
+### 群内戳一戳
 
 > 注意：此事件无法在平板和手表协议上触发
 
@@ -720,7 +972,7 @@ Type: `tts`
 | `user_id`     | int64  |          | 发送者id |
 | `target_id`   | int64  |          | 被戳者id |
 
-#### 群红包运气王提示
+### 群红包运气王提示
 
 > 注意：此事件无法在平板和手表协议上触发
 
@@ -735,7 +987,7 @@ Type: `tts`
 | `user_id`     | int64  |              | 红包发送者id |
 | `target_id`   | int64  |              | 运气王id     |
 
-#### 群成员荣誉变更提示
+### 群成员荣誉变更提示
 
 > 注意：此事件无法在平板和手表协议上触发
 
@@ -750,7 +1002,7 @@ Type: `tts`
 | `user_id`     | int64  |                                                          | 成员id   |
 | `honor_type`  | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
 
-#### 群成员名片更新
+### 群成员名片更新
 
 > 注意: 此事件不保证时效性，仅在收到消息时校验卡片
 
@@ -767,7 +1019,7 @@ Type: `tts`
 
 > PS: 当名片为空时 `card_xx` 字段为空字符串, 并不是昵称
 
-#### 接收到离线文件
+### 接收到离线文件
 
 **上报数据**
 
@@ -784,4 +1036,15 @@ Type: `tts`
 | ------ | ------ | -------- | -------- |
 | `name` | string |          | 文件名   |
 | `size` | int64  |          | 文件大小 |
-| `url`  | string |          | 下载链接 |
+| `url`  | string |          | 下载链接 |
+
+### 其他客户端在线状态变更
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明     |
+| ------------- | ------ | -------------- | -------- |
+| `post_type`   | string | `notice`       | 上报类型 |
+| `notice_type` | string | `client_status` | 消息类型 |
+| `client`      | Device  |                | 客户端信息 |
+| `online`        | bool |                | 当前是否在线 |

docs/quick_start.md

@@ -107,6 +107,14 @@ enable ws?(Y/n)
 
 # 进阶指南
 
+## 跳过启动的五秒延时
+
+使用命令行参数 `faststart`即可跳过启动的五秒钟延时，例如
+
+```
+.\go-cqhttp.exe faststart
+```
+
 ## 如何自己构建
 
 1. [下载源码](https://github.com/Mrs4s/go-cqhttp/archive/master.zip)并解压 || 使用`git clone https://github.com/Mrs4s/go-cqhttp.git`来拉取

docs/slider.md

@@ -0,0 +1,74 @@
+# 滑块验证码
+
+由于TX最新的限制, 所有协议在陌生设备/IP登录时都有可能被要求通过滑块验证码, 否则将会出现 `当前上网环境异常` 的错误. 目前我们准备了两个临时方案应对该验证码.
+
+> 如果您有一台运行Windows的PC/Server 并且不会抓包操作, 我们建议直接使用方案B
+
+## 方案A: 自行抓包
+
+由于滑块验证码和QQ本体的协议独立, 我们无法直接处理并提交. 需要在浏览器通过后抓包并获取 `Ticket` 提交.
+
+该方案为具体的抓包教程, 如果您已经知道如何在浏览器中抓包. 可以略过接下来的文档并直接抓取 `cap_union_new_verify` 的返回值, 提取 `Ticket` 并在命令行提交.
+
+首先获取滑块验证码的地址, 并在浏览器中打开. 这里以 *Microsoft Edge* 浏览器为例, *Chrome* 同理. 
+
+![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
+
+首先选择 `1` 并提取链接在浏览器中打开
+
+![image.png](https://i.loli.net/2020/12/27/HYhmZv1wARMV7Uq.png)
+
+![image.png](https://i.loli.net/2020/12/27/otk9Hz7lBCaRFMV.png)
+
+此时不要滑动验证码, 首先按下 `F12` (键盘右上角退格键上方) 打开 *开发者工具*
+
+![image.png](https://i.loli.net/2020/12/27/JDioadLPwcKWpt1.png)
+
+点击 `Network` 选项卡 (在某些浏览器它可能叫做 `网络`)
+
+![image.png](https://i.loli.net/2020/12/27/qEzTB5jrDZUWSwp.png)
+
+点开 `Filter` (箭头) 按钮以确定您能看到下面的工具栏, 勾选 `Preserve log`(红框)
+
+此时可以滑动并通过验证码
+
+![image.png](https://i.loli.net/2020/12/27/Id4hxzyDprQuF2G.png)
+
+回到 *开发者工具*, 我们可以看到已经有了一个请求.
+
+![image.png](https://i.loli.net/2020/12/27/3C6Y2XVKBRv1z9E.png)
+
+此时如果有多个请求, 请不要慌张. 看到上面的 `Filter` 没? 此时在 `Filter` 输入框中输入 `cap_union_new`, 就应该只剩一个请求了.
+
+然后点击该请求. 点开 `Preview` 选项卡 (箭头):  
+
+![image.png](https://i.loli.net/2020/12/27/P1VtxRWpjY8524Z.png)
+
+此时就能看到一个标准的 `JSON`, 复制 `ticket` 字段并回到 `go-cqhttp` 粘贴. 即可通过滑块验证.
+
+如果您看到这里还是不会如何操作, 没关系! 我们还准备了方案B.
+
+## 方案B: 使用专用工具
+
+此方案需要您有一台可以操作的 `Windows` 电脑.
+
+首先下载工具:  [蓝奏云](https://wws.lanzous.com/i2vn0jrofte) [Google Drive](https://drive.google.com/file/d/1peMDHqgP8AgWBVp5vP-cfhcGrb2ksSrE/view?usp=sharing)
+
+解压并打开工具: 
+
+![image.png](https://i.loli.net/2020/12/27/winG4SkxhgLoNDZ.png)
+
+打开 `go-cqhttp` 并选择 `2`:
+
+![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
+
+复制 `ID` 并前往工具粘贴:
+
+![image.png](https://i.loli.net/2020/12/27/fIwXx5nN9r8Zbc7.png)
+
+![image.png](https://i.loli.net/2020/12/27/WZsTCyGwSjc9mb5.png)
+
+点击 `OK` 并处理滑块, 完成即可登录成功. (OK可能反应稍微慢点, 请不要多次点击)
+
+![image.png](https://i.loli.net/2020/12/27/UnvAuxreijYzgLC.png)
+

global/codec.go

@@ -5,34 +5,35 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"os/exec"
 	"path"
-	"sync"
 
+	"github.com/Mrs4s/go-cqhttp/global/codec"
 	log "github.com/sirupsen/logrus"
-	"github.com/wdvxdr1123/go-silk/silk"
 )
 
-var codec silk.Encoder
-var useCodec = true
-var once sync.Once
+var useSilkCodec = true
 
+//InitCodec 初始化Silk编码器
 func InitCodec() {
-	once.Do(func() {
-		log.Info("正在加载silk编码器...")
-		err := codec.Init("data/cache", "codec")
-		if err != nil {
-			log.Error(err)
-			useCodec = false
-		}
-	})
+	log.Info("正在加载silk编码器...")
+	err := codec.Init()
+	if err != nil {
+		log.Error(err)
+		useSilkCodec = false
+	}
 }
 
-func Encoder(data []byte) ([]byte, error) {
-	if useCodec == false {
+//EncoderSilk 将音频编码为Silk
+func EncoderSilk(data []byte) ([]byte, error) {
+	if !useSilkCodec {
 		return nil, errors.New("no silk encoder")
 	}
 	h := md5.New()
-	h.Write(data)
+	_, err := h.Write(data)
+	if err != nil {
+		return nil, err
+	}
 	tempName := fmt.Sprintf("%x", h.Sum(nil))
 	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
 		return ioutil.ReadFile(silkPath)
@@ -43,3 +44,20 @@ func Encoder(data []byte) ([]byte, error) {
 	}
 	return slk, nil
 }
+
+//EncodeMP4 将给定视频文件编码为MP4
+func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
+	cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
+	err := cmd1.Run()
+	if err != nil {
+		cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst)
+		return cmd2.Run()
+	}
+	return err
+}
+
+//ExtractCover 获取给定视频文件的Cover
+func ExtractCover(src string, target string) error {
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
+	return cmd.Run()
+}

global/codec/codec.go

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

global/codec/codec_unsupportedarch.go

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

global/codec/codec_unsupportedos.go

@@ -0,0 +1,15 @@
+// +build !windows,!linux,!darwin
+
+package codec
+
+import "errors"
+
+//Init 下载silk编码器
+func Init() error {
+	return errors.New("not support now")
+}
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not support now")
+}

global/config.go

@@ -12,6 +12,7 @@ import (
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
 
+//DefaultConfigWithComments 为go-cqhttp的默认配置文件
 var DefaultConfigWithComments = `
 /*
     go-cqhttp 默认配置文件
@@ -134,7 +135,8 @@ var DefaultConfigWithComments = `
 }
 `
 
-type JsonConfig struct {
+//JSONConfig Config对应的结构体
+type JSONConfig struct {
 	Uin               int64  `json:"uin"`
 	Password          string `json:"password"`
 	EncryptPassword   bool   `json:"encrypt_password"`
@@ -153,38 +155,41 @@ type JsonConfig struct {
 	} `json:"_rate_limit"`
 	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
 	ForceFragmented     bool                          `json:"force_fragmented"`
+	FixURL              bool                          `json:"fix_url"`
 	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"`
+	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"`
+	WebUI               *GoCQWebUI                    `json:"web_ui"`
 }
 
-type CQHttpApiConfig struct {
+//CQHTTPAPIConfig HTTPAPI对应的Config结构体
+type CQHTTPAPIConfig struct {
 	Host                         string `json:"host"`
 	Port                         uint16 `json:"port"`
-	UseHttp                      bool   `json:"use_http"`
+	UseHTTP                      bool   `json:"use_http"`
 	WSHost                       string `json:"ws_host"`
 	WSPort                       uint16 `json:"ws_port"`
 	UseWS                        bool   `json:"use_ws"`
-	WSReverseUrl                 string `json:"ws_reverse_url"`
-	WSReverseApiUrl              string `json:"ws_reverse_api_url"`
-	WSReverseEventUrl            string `json:"ws_reverse_event_url"`
+	WSReverseURL                 string `json:"ws_reverse_url"`
+	WSReverseAPIURL              string `json:"ws_reverse_api_url"`
+	WSReverseEventURL            string `json:"ws_reverse_event_url"`
 	WSReverseReconnectInterval   uint16 `json:"ws_reverse_reconnect_interval"`
 	WSReverseReconnectOnCode1000 bool   `json:"ws_reverse_reconnect_on_code_1000"`
 	UseWsReverse                 bool   `json:"use_ws_reverse"`
-	PostUrl                      string `json:"post_url"`
+	PostURL                      string `json:"post_url"`
 	AccessToken                  string `json:"access_token"`
 	Secret                       string `json:"secret"`
 	PostMessageFormat            string `json:"post_message_format"`
 }
 
-type GoCQHttpConfig struct {
+//GoCQHTTPConfig 正向HTTP对应config结构体
+type GoCQHTTPConfig struct {
 	Enabled  bool              `json:"enabled"`
 	Host     string            `json:"host"`
 	Port     uint16            `json:"port"`
@@ -192,29 +197,33 @@ type GoCQHttpConfig struct {
 	PostUrls map[string]string `json:"post_urls"`
 }
 
-type GoCQWebsocketConfig struct {
+//GoCQWebSocketConfig 正向WebSocket对应Config结构体
+type GoCQWebSocketConfig struct {
 	Enabled bool   `json:"enabled"`
 	Host    string `json:"host"`
 	Port    uint16 `json:"port"`
 }
 
-type GoCQReverseWebsocketConfig struct {
+//GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
+type GoCQReverseWebSocketConfig struct {
 	Enabled                  bool   `json:"enabled"`
-	ReverseUrl               string `json:"reverse_url"`
-	ReverseApiUrl            string `json:"reverse_api_url"`
-	ReverseEventUrl          string `json:"reverse_event_url"`
+	ReverseURL               string `json:"reverse_url"`
+	ReverseAPIURL            string `json:"reverse_api_url"`
+	ReverseEventURL          string `json:"reverse_event_url"`
 	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
 }
 
-type GoCqWebUi struct {
+//GoCQWebUI WebUI对应Config结构体
+type GoCQWebUI struct {
 	Enabled   bool   `json:"enabled"`
 	Host      string `json:"host"`
-	WebUiPort uint64 `json:"web_ui_port"`
+	WebUIPort uint64 `json:"web_ui_port"`
 	WebInput  bool   `json:"web_input"`
 }
 
-func DefaultConfig() *JsonConfig {
-	return &JsonConfig{
+//DefaultConfig 返回一份默认配置对应结构体
+func DefaultConfig() *JSONConfig {
+	return &JSONConfig{
 		EnableDB: true,
 		ReLogin: struct {
 			Enabled         bool `json:"enabled"`
@@ -236,42 +245,43 @@ func DefaultConfig() *JsonConfig {
 		},
 		PostMessageFormat: "string",
 		ForceFragmented:   false,
-		HttpConfig: &GoCQHttpConfig{
+		HTTPConfig: &GoCQHTTPConfig{
 			Enabled:  true,
 			Host:     "0.0.0.0",
 			Port:     5700,
 			PostUrls: map[string]string{},
 		},
-		WSConfig: &GoCQWebsocketConfig{
+		WSConfig: &GoCQWebSocketConfig{
 			Enabled: true,
 			Host:    "0.0.0.0",
 			Port:    6700,
 		},
-		ReverseServers: []*GoCQReverseWebsocketConfig{
+		ReverseServers: []*GoCQReverseWebSocketConfig{
 			{
 				Enabled:                  false,
-				ReverseUrl:               "ws://you_websocket_universal.server",
-				ReverseApiUrl:            "ws://you_websocket_api.server",
-				ReverseEventUrl:          "ws://you_websocket_event.server",
+				ReverseURL:               "ws://you_websocket_universal.server",
+				ReverseAPIURL:            "ws://you_websocket_api.server",
+				ReverseEventURL:          "ws://you_websocket_event.server",
 				ReverseReconnectInterval: 3000,
 			},
 		},
-		WebUi: &GoCqWebUi{
+		WebUI: &GoCQWebUI{
 			Enabled:   true,
 			Host:      "127.0.0.1",
 			WebInput:  false,
-			WebUiPort: 9999,
+			WebUIPort: 9999,
 		},
 	}
 }
 
-func Load(p string) *JsonConfig {
+//Load 加载配置文件
+func Load(p string) *JSONConfig {
 	if !PathExists(p) {
 		log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
 		return nil
 	}
 	var dat map[string]interface{}
-	var c = JsonConfig{}
+	var c = JSONConfig{}
 	err := hjson.Unmarshal([]byte(ReadAllText(p)), &dat)
 	if err == nil {
 		b, _ := json.Marshal(dat)
@@ -286,7 +296,8 @@ func Load(p string) *JsonConfig {
 	return &c
 }
 
-func (c *JsonConfig) Save(p string) error {
+//Save 写入配置文件至path
+func (c *JSONConfig) Save(path string) error {
 	data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
 		Eol:            "\n",
 		BracesSameLine: true,
@@ -295,5 +306,5 @@ func (c *JsonConfig) Save(p string) error {
 	if err != nil {
 		return err
 	}
-	return WriteAllText(p, string(data))
+	return WriteAllText(path, string(data))
 }

global/filter.go

@@ -1,6 +1,7 @@
 package global
 
 import (
+	"fmt"
 	"io/ioutil"
 	"regexp"
 	"strings"
@@ -9,17 +10,46 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-type Filter interface {
-	Eval(payload gjson.Result) bool
+//MSG 消息Map
+type MSG map[string]interface{}
+
+//Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
+//
+//若所给key对应的值的类型是global.MSG,则返回此值
+//
+//若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
+func (m MSG) Get(s string) MSG {
+	if v, ok := m[s]; ok {
+		if msg, ok := v.(MSG); ok {
+			return msg
+		}
+		return MSG{"__str__": v} // 用这个名字应该没问题吧
+	}
+	return MSG{}
 }
 
-type OperationNode struct {
+//String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
+func (m MSG) String() string {
+	if str, ok := m["__str__"]; ok {
+		return fmt.Sprint(str)
+	}
+	str, _ := json.MarshalToString(m)
+	return str
+}
+
+//Filter 定义了一个消息上报过滤接口
+type Filter interface {
+	Eval(payload MSG) bool
+}
+
+type operationNode struct {
 	key    string
 	filter Filter
 }
 
+//NotOperator 定义了过滤器中Not操作符
 type NotOperator struct {
-	operand_ Filter
+	operand Filter
 }
 
 func notOperatorConstruct(argument gjson.Result) *NotOperator {
@@ -27,16 +57,18 @@ func notOperatorConstruct(argument gjson.Result) *NotOperator {
 		panic("the argument of 'not' operator must be an object")
 	}
 	op := new(NotOperator)
-	op.operand_ = Generate("and", argument)
+	op.operand = Generate("and", argument)
 	return op
 }
 
-func (notOperator NotOperator) Eval(payload gjson.Result) bool {
-	return !(notOperator.operand_).Eval(payload)
+//Eval 对payload执行Not过滤
+func (op *NotOperator) Eval(payload MSG) bool {
+	return !op.operand.Eval(payload)
 }
 
+//AndOperator 定义了过滤器中And操作符
 type AndOperator struct {
-	operands []OperationNode
+	operands []operationNode
 }
 
 func andOperatorConstruct(argument gjson.Result) *AndOperator {
@@ -51,26 +83,27 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 			//       "bar": "baz"
 			//   }
 			opKey := key.Str[1:]
-			op.operands = append(op.operands, OperationNode{"", Generate(opKey, value)})
+			op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
 		} else if value.IsObject() {
 			// is an normal key with an object as the value
 			//   "foo": {
 			//       ".bar": "baz"
 			//   }
 			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, Generate("and", value)})
+			op.operands = append(op.operands, operationNode{opKey, Generate("and", value)})
 		} else {
 			// is an normal key with a non-object as the value
 			//   "foo": "bar"
 			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, Generate("eq", value)})
+			op.operands = append(op.operands, operationNode{opKey, Generate("eq", value)})
 		}
 		return true
 	})
 	return op
 }
 
-func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
+//Eval 对payload执行And过滤
+func (andOperator *AndOperator) Eval(payload MSG) bool {
 	res := true
 	for _, operand := range andOperator.operands {
 
@@ -83,13 +116,14 @@ func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
 			res = res && operand.filter.Eval(val)
 		}
 
-		if res == false {
+		if !res {
 			break
 		}
 	}
 	return res
 }
 
+//OrOperator 定义了过滤器中Or操作符
 type OrOperator struct {
 	operands []Filter
 }
@@ -106,48 +140,54 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
 	return op
 }
 
-func (orOperator OrOperator) Eval(payload gjson.Result) bool {
+//Eval 对payload执行Or过滤
+func (op *OrOperator) Eval(payload MSG) bool {
 	res := false
-	for _, operand := range orOperator.operands {
+	for _, operand := range op.operands {
 		res = res || operand.Eval(payload)
-
-		if res == true {
+		if res {
 			break
 		}
 	}
 	return res
 }
 
+//EqualOperator 定义了过滤器中Equal操作符
 type EqualOperator struct {
-	value gjson.Result
+	operand string
 }
 
 func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
 	op := new(EqualOperator)
-	op.value = argument
+	op.operand = argument.String()
 	return op
 }
 
-func (equalOperator EqualOperator) Eval(payload gjson.Result) bool {
-	return payload.String() == equalOperator.value.String()
+//Eval 对payload执行Equal过滤
+func (op *EqualOperator) Eval(payload MSG) bool {
+	return payload.String() == op.operand
 }
 
+//NotEqualOperator 定义了过滤器中NotEqual操作符
 type NotEqualOperator struct {
-	value gjson.Result
+	operand string
 }
 
 func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
 	op := new(NotEqualOperator)
-	op.value = argument
+	op.operand = argument.String()
 	return op
 }
 
-func (notEqualOperator NotEqualOperator) Eval(payload gjson.Result) bool {
-	return !(payload.String() == notEqualOperator.value.String())
+//Eval 对payload执行NotEqual过滤
+func (op *NotEqualOperator) Eval(payload MSG) bool {
+	return !(payload.String() == op.operand)
 }
 
+//InOperator 定义了过滤器中In操作符
 type InOperator struct {
-	operand gjson.Result
+	operandString string
+	operandArray  []string
 }
 
 func inOperatorConstruct(argument gjson.Result) *InOperator {
@@ -155,22 +195,33 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
 		panic("the argument of 'in' operator must be an array or a string")
 	}
 	op := new(InOperator)
-	op.operand = argument
+	if argument.IsArray() {
+		op.operandArray = []string{}
+		argument.ForEach(func(_, value gjson.Result) bool {
+			op.operandArray = append(op.operandArray, value.String())
+			return true
+		})
+	} else {
+		op.operandString = argument.String()
+	}
 	return op
 }
 
-func (inOperator InOperator) Eval(payload gjson.Result) bool {
-	if inOperator.operand.IsArray() {
-		res := false
-		inOperator.operand.ForEach(func(key, value gjson.Result) bool {
-			res = res || value.String() == payload.String()
-			return true
-		})
-		return res
+//Eval 对payload执行In过滤
+func (op *InOperator) Eval(payload MSG) bool {
+	payloadStr := payload.String()
+	if op.operandArray != nil {
+		for _, value := range op.operandArray {
+			if value == payloadStr {
+				return true
+			}
+		}
+		return false
 	}
-	return strings.Contains(inOperator.operand.String(), payload.String())
+	return strings.Contains(op.operandString, payloadStr)
 }
 
+//ContainsOperator 定义了过滤器中Contains操作符
 type ContainsOperator struct {
 	operand string
 }
@@ -184,15 +235,14 @@ func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
 	return op
 }
 
-func (containsOperator ContainsOperator) Eval(payload gjson.Result) bool {
-	if payload.IsObject() || payload.IsArray() {
-		return false
-	}
-	return strings.Contains(payload.String(), containsOperator.operand)
+//Eval 对payload执行Contains过滤
+func (op *ContainsOperator) Eval(payload MSG) bool {
+	return strings.Contains(payload.String(), op.operand)
 }
 
+//RegexOperator 定义了过滤器中Regex操作符
 type RegexOperator struct {
-	regex string
+	regex *regexp.Regexp
 }
 
 func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
@@ -200,15 +250,17 @@ func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
 		panic("the argument of 'regex' operator must be a string")
 	}
 	op := new(RegexOperator)
-	op.regex = argument.String()
+	op.regex = regexp.MustCompile(argument.String())
 	return op
 }
 
-func (containsOperator RegexOperator) Eval(payload gjson.Result) bool {
-	matched, _ := regexp.MatchString(containsOperator.regex, payload.String())
+//Eval 对payload执行RegexO过滤
+func (op *RegexOperator) Eval(payload MSG) bool {
+	matched := op.regex.MatchString(payload.String())
 	return matched
 }
 
+//Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
 func Generate(opName string, argument gjson.Result) Filter {
 	switch opName {
 	case "not":
@@ -232,8 +284,10 @@ func Generate(opName string, argument gjson.Result) Filter {
 	}
 }
 
-var EventFilter = new(Filter)
+//EventFilter 初始化一个nil过滤器
+var EventFilter Filter = nil
 
+//BootFilter 启动事件过滤器
 func BootFilter() {
 	defer func() {
 		if e := recover(); e != nil {
@@ -247,6 +301,6 @@ func BootFilter() {
 	if err != nil {
 		panic(err)
 	} else {
-		*EventFilter = Generate("and", gjson.ParseBytes(f))
+		EventFilter = Generate("and", gjson.ParseBytes(f))
 	}
 }

global/fs.go

@@ -1,86 +1,114 @@
 package global
 
 import (
+	"bufio"
 	"bytes"
+	"compress/bzip2"
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net"
 	"net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 
+	"github.com/kardianos/osext"
+
 	"github.com/dustin/go-humanize"
 	log "github.com/sirupsen/logrus"
 )
 
-var (
-	IMAGE_PATH = path.Join("data", "images")
-	VOICE_PATH = path.Join("data", "voices")
-	VIDEO_PATH = path.Join("data", "videos")
-	CACHE_PATH = path.Join("data", "cache")
-
-	HEADER_AMR  = []byte("#!AMR")
-	HEADER_SILK = []byte("\x02#!SILK_V3")
+const (
+	//ImagePath go-cqhttp使用的图片缓存目录
+	ImagePath = "data/images"
+	//ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
+	ImagePathOld = "data/image"
+	//VoicePath go-cqhttp使用的语音缓存目录
+	VoicePath = "data/voices"
+	//VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
+	VoicePathOld = "data/record"
+	//VideoPath go-cqhttp使用的视频缓存目录
+	VideoPath = "data/videos"
+	//CachePath go-cqhttp使用的缓存目录
+	CachePath = "data/cache"
 )
 
+var (
+	//ErrSyntax Path语法错误时返回的错误
+	ErrSyntax = errors.New("syntax error")
+	//HeaderAmr AMR文件头
+	HeaderAmr = []byte("#!AMR")
+	//HeaderSilk Silkv3文件头
+	HeaderSilk = []byte("\x02#!SILK_V3")
+)
+
+//PathExists 判断给定path是否存在
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
 	return err == nil || os.IsExist(err)
 }
 
+//ReadAllText 读取给定path对应文件，无法读取时返回空值
 func ReadAllText(path string) string {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
+		log.Error(err)
 		return ""
 	}
 	return string(b)
 }
 
+//WriteAllText 将给定text写入给定path
 func WriteAllText(path, text string) error {
 	return ioutil.WriteFile(path, []byte(text), 0644)
 }
 
+//Check 检测err是否为nil
 func Check(err error) {
 	if err != nil {
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
 
+//IsAMRorSILK 判断给定文件是否为Amr或Silk格式
 func IsAMRorSILK(b []byte) bool {
-	return bytes.HasPrefix(b, HEADER_AMR) || bytes.HasPrefix(b, HEADER_SILK)
+	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
 }
 
-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") {
+//FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
+//对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
+func FindFile(file, cache, PATH string) (data []byte, err error) {
+	data, err = nil, ErrSyntax
+	if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") {
 		if cache == "" {
 			cache = "1"
 		}
-		hash := md5.Sum([]byte(f))
-		cacheFile := path.Join(CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		hash := md5.Sum([]byte(file))
+		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
 		if PathExists(cacheFile) && cache == "1" {
 			return ioutil.ReadFile(cacheFile)
 		}
-		data, err = GetBytes(f)
+		data, err = GetBytes(file)
 		_ = 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://", ""))
+	} else if strings.HasPrefix(file, "base64") {
+		data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(file, "base64://", ""))
 		if err != nil {
 			return nil, err
 		}
-	} else if strings.HasPrefix(f, "file") {
+	} else if strings.HasPrefix(file, "file") {
 		var fu *url.URL
-		fu, err = url.Parse(f)
+		fu, err = url.Parse(file)
 		if err != nil {
 			return nil, err
 		}
@@ -91,8 +119,8 @@ func FindFile(f, cache, PATH string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	} else if PathExists(path.Join(PATH, f)) {
-		data, err = ioutil.ReadFile(path.Join(PATH, f))
+	} else if PathExists(path.Join(PATH, file)) {
+		data, err = ioutil.ReadFile(path.Join(PATH, file))
 		if err != nil {
 			return nil, err
 		}
@@ -100,19 +128,20 @@ func FindFile(f, cache, PATH string) (data []byte, err error) {
 	return
 }
 
+//DelFile 删除一个给定path，并返回删除结果
 func DelFile(path string) bool {
 	err := os.Remove(path)
 	if err != nil {
 		// 删除失败
 		log.Error(err)
 		return false
-	} else {
-		// 删除成功
-		log.Info(path + "删除成功")
-		return true
 	}
+	// 删除成功
+	log.Info(path + "删除成功")
+	return true
 }
 
+//ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
 func ReadAddrFile(path string) []*net.TCPAddr {
 	d, err := ioutil.ReadFile(path)
 	if err != nil {
@@ -131,10 +160,12 @@ func ReadAddrFile(path string) []*net.TCPAddr {
 	return ret
 }
 
+//WriteCounter 写入量计算实例
 type WriteCounter struct {
 	Total uint64
 }
 
+//Write 方法将写入的byte长度追加至写入的总长度Total中
 func (wc *WriteCounter) Write(p []byte) (int, error) {
 	n := len(p)
 	wc.Total += uint64(n)
@@ -142,7 +173,81 @@ func (wc *WriteCounter) Write(p []byte) (int, error) {
 	return n, nil
 }
 
-func (wc WriteCounter) PrintProgress() {
+//PrintProgress 方法将打印当前的总写入量
+func (wc *WriteCounter) PrintProgress() {
 	fmt.Printf("\r%s", strings.Repeat(" ", 35))
 	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
 }
+
+//UpdateFromStream copy form getlantern/go-update
+func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
+	updatePath, err := osext.Executable()
+	if err != nil {
+		return
+	}
+	var newBytes []byte
+	// no patch to apply, go on through
+	var fileHeader []byte
+	bufBytes := bufio.NewReader(updateWith)
+	fileHeader, err = bufBytes.Peek(2)
+	if err != nil {
+		return
+	}
+	// The content is always bzip2 compressed except when running test, in
+	// which case is not prefixed with the magic byte sequence for sure.
+	if bytes.Equal([]byte{0x42, 0x5a}, fileHeader) {
+		// Identifying bzip2 files.
+		updateWith = bzip2.NewReader(bufBytes)
+	} else {
+		updateWith = io.Reader(bufBytes)
+	}
+	newBytes, err = ioutil.ReadAll(updateWith)
+	if err != nil {
+		return
+	}
+	// get the directory the executable exists in
+	updateDir := filepath.Dir(updatePath)
+	filename := filepath.Base(updatePath)
+	// Copy the contents of of newbinary to a the new executable file
+	newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
+	fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
+	if err != nil {
+		return
+	}
+	// We won't log this error, because it's always going to happen.
+	defer func() { _ = fp.Close() }()
+	if _, err = io.Copy(fp, bytes.NewReader(newBytes)); err != nil {
+		log.Errorf("Unable to copy data: %v\n", err)
+	}
+
+	// if we don't call fp.Close(), windows won't let us move the new executable
+	// because the file will still be "in use"
+	if err := fp.Close(); err != nil {
+		log.Errorf("Unable to close file: %v\n", err)
+	}
+	// this is where we'll move the executable to so that we can swap in the updated replacement
+	oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
+
+	// delete any existing old exec file - this is necessary on Windows for two reasons:
+	// 1. after a successful update, Windows can't remove the .old file because the process is still running
+	// 2. windows rename operations fail if the destination file already exists
+	_ = os.Remove(oldPath)
+
+	// move the existing executable to a new file in the same directory
+	err = os.Rename(updatePath, oldPath)
+	if err != nil {
+		return
+	}
+
+	// move the new executable in to become the new program
+	err = os.Rename(newPath, updatePath)
+
+	if err != nil {
+		// copy unsuccessful
+		errRecover = os.Rename(oldPath, updatePath)
+	} else {
+		// copy successful, remove the old binary
+		_ = os.Remove(oldPath)
+	}
+	return
+}

global/net.go

@@ -1,49 +1,59 @@
 package global
 
 import (
+	"bufio"
 	"bytes"
 	"compress/gzip"
 	"fmt"
+	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"net/url"
+	"os"
+	"strconv"
 	"strings"
+	"sync"
 	"time"
 
+	"github.com/guonaihong/gout"
+	"github.com/pkg/errors"
+
 	"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)
+var (
+	client = &http.Client{
+		Transport: &http.Transport{
+			Proxy: func(request *http.Request) (u *url.URL, e error) {
+				if Proxy == "" {
+					return http.ProxyFromEnvironment(request)
+				}
+				return url.Parse(Proxy)
+			},
+			ForceAttemptHTTP2:   true,
+			MaxConnsPerHost:     0,
+			MaxIdleConns:        0,
+			MaxIdleConnsPerHost: 999,
 		},
-		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
+	//Proxy 存储Config.proxy_rewrite,用于设置代理
+	Proxy string
 
+	//ErrOverSize 响应主体过大时返回此错误
+	ErrOverSize = errors.New("oversize")
+
+	//UserAgent HTTP请求时使用的UA
+	UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+)
+
+//GetBytes 对给定URL发送Get请求，返回响应主体
 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"}
+	req.Header["User-Agent"] = []string{UserAgent}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -63,6 +73,215 @@ func GetBytes(url string) ([]byte, error) {
 	return body, nil
 }
 
+//DownloadFile 将给定URL对应的文件下载至给定Path
+func DownloadFile(url, path string, limit int64, headers map[string]string) error {
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	for k, v := range headers {
+		req.Header.Set(k, v)
+	}
+
+	if _, ok := headers["User-Agent"]; !ok {
+		req.Header["User-Agent"] = []string{UserAgent}
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if limit > 0 && resp.ContentLength > limit {
+		return ErrOverSize
+	}
+	_, err = io.Copy(file, resp.Body)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+//DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
+func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
+	if threadCount < 2 {
+		return DownloadFile(url, path, limit, headers)
+	}
+	type BlockMetaData struct {
+		BeginOffset    int64
+		EndOffset      int64
+		DownloadedSize int64
+	}
+	var blocks []*BlockMetaData
+	var contentLength int64
+	errUnsupportedMultiThreading := errors.New("unsupported multi-threading")
+	// 初始化分块或直接下载
+	initOrDownload := func() error {
+		copyStream := func(s io.ReadCloser) error {
+			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+			if _, err = io.Copy(file, s); err != nil {
+				return err
+			}
+			return errUnsupportedMultiThreading
+		}
+		req, err := http.NewRequest("GET", url, nil)
+		if err != nil {
+			return err
+		}
+
+		for k, v := range headers {
+			req.Header.Set(k, v)
+
+		}
+		if _, ok := headers["User-Agent"]; !ok {
+			req.Header["User-Agent"] = []string{UserAgent}
+		}
+		req.Header.Set("range", "bytes=0-")
+		resp, err := client.Do(req)
+		if err != nil {
+			return err
+		}
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		if resp.StatusCode == 200 {
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			return copyStream(resp.Body)
+		}
+		if resp.StatusCode == 206 {
+			contentLength = resp.ContentLength
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			blockSize := func() int64 {
+				if contentLength > 1024*1024 {
+					return (contentLength / int64(threadCount)) - 10
+				}
+				return contentLength
+
+			}()
+			if blockSize == contentLength {
+				return copyStream(resp.Body)
+			}
+			var tmp int64
+			for tmp+blockSize < contentLength {
+				blocks = append(blocks, &BlockMetaData{
+					BeginOffset: tmp,
+					EndOffset:   tmp + blockSize - 1,
+				})
+				tmp += blockSize
+			}
+			blocks = append(blocks, &BlockMetaData{
+				BeginOffset: tmp,
+				EndOffset:   contentLength - 1,
+			})
+			return nil
+		}
+		return errors.New("unknown status code")
+	}
+	// 下载分块
+	downloadBlock := func(block *BlockMetaData) error {
+		req, _ := http.NewRequest("GET", url, nil)
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		_, _ = file.Seek(block.BeginOffset, io.SeekStart)
+		writer := bufio.NewWriter(file)
+		defer writer.Flush()
+
+		for k, v := range headers {
+			req.Header.Set(k, v)
+		}
+
+		if _, ok := headers["User-Agent"]; ok {
+			req.Header["User-Agent"] = []string{UserAgent}
+		}
+		req.Header.Set("range", "bytes="+strconv.FormatInt(block.BeginOffset, 10)+"-"+strconv.FormatInt(block.EndOffset, 10))
+		resp, err := client.Do(req)
+		if err != nil {
+			return err
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		var buffer = make([]byte, 1024)
+		i, err := resp.Body.Read(buffer)
+		for {
+			if err != nil && err != io.EOF {
+				return err
+			}
+			i64 := int64(len(buffer[:i]))
+			needSize := block.EndOffset + 1 - block.BeginOffset
+			if i64 > needSize {
+				i64 = needSize
+				err = io.EOF
+			}
+			_, e := writer.Write(buffer[:i64])
+			if e != nil {
+				return e
+			}
+			block.BeginOffset += i64
+			block.DownloadedSize += i64
+			if err == io.EOF || block.BeginOffset > block.EndOffset {
+				break
+			}
+			i, err = resp.Body.Read(buffer)
+		}
+		return nil
+	}
+
+	if err := initOrDownload(); err != nil {
+		if err == errUnsupportedMultiThreading {
+			return nil
+		}
+		return err
+	}
+	wg := sync.WaitGroup{}
+	wg.Add(len(blocks))
+	var lastErr error
+	for i := range blocks {
+		go func(b *BlockMetaData) {
+			defer wg.Done()
+			if err := downloadBlock(b); err != nil {
+				lastErr = err
+			}
+		}(blocks[i])
+	}
+	wg.Wait()
+	return lastErr
+}
+
+//GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
+func GetSliderTicket(raw, id string) (string, error) {
+	var rsp string
+	if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
+		"id":  id,
+		"url": raw,
+	}).SetTimeout(time.Second * 35).BindBody(&rsp).Do(); err != nil {
+		return "", err
+	}
+	g := gjson.Parse(rsp)
+	if g.Get("error").Str != "" {
+		return "", errors.New(g.Get("error").Str)
+	}
+	return g.Get("ticket").Str, nil
+}
+
+//QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
 func QQMusicSongInfo(id string) (gjson.Result, error) {
 	d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
 	if err != nil {
@@ -71,6 +290,7 @@ func QQMusicSongInfo(id string) (gjson.Result, error) {
 	return gjson.ParseBytes(d).Get("songinfo.data"), nil
 }
 
+//NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
 func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
 	d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
 	if err != nil {

global/param.go

@@ -21,6 +21,15 @@ var falseSet = map[string]struct{}{
 	"0":     {},
 }
 
+//EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
+//
+//支持的合法类型有
+//
+//type bool
+//
+//type gjson.True or gjson.False
+//
+//type string "true","yes","1" or "false","no","0" (case insensitive)
 func EnsureBool(p interface{}, defaultVal bool) bool {
 	var str string
 	if b, ok := p.(bool); ok {
@@ -54,9 +63,13 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 }
 
 // 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*`)
@@ -71,3 +84,24 @@ func VersionNameCompare(current, remote string) bool {
 	}
 	return len(cur) < len(re)
 }
+
+//SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
+func SplitURL(s string) []string {
+	reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
+	idx := reg.FindAllStringIndex(s, -1)
+	if len(idx) == 0 {
+		return []string{s}
+	}
+	var result []string
+	last := 0
+	for i := 0; i < len(idx); i++ {
+		if len(idx[i]) != 2 {
+			continue
+		}
+		m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
+		result = append(result, s[last:m])
+		last = m
+	}
+	result = append(result, s[last:])
+	return result
+}

global/ratelimit.go

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

go.mod

@@ -3,26 +3,24 @@ module github.com/Mrs4s/go-cqhttp
 go 1.15
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20201126173608-8b500107c54d
+	github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a
 	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-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.3
+	github.com/guonaihong/gout v0.1.4
 	github.com/hjson/hjson-go v3.1.0+incompatible
 	github.com/json-iterator/go v1.1.10
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
-	github.com/kr/binarydist v0.1.0 // indirect
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.3 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/lestrrat-go/strftime v1.0.4 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/sirupsen/logrus v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/tidwall/gjson v1.6.3
-	github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6
+	github.com/tidwall/gjson v1.6.7
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
-	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
 )

go.sum

@@ -1,7 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20201126173608-8b500107c54d h1:+oGHcMd+OTR/zmhlaKUI9TjjWHZJaUBQi4I3+HP7faU=
-github.com/Mrs4s/MiraiGo v0.0.0-20201126173608-8b500107c54d/go.mod h1:J1zaJWyeX7hQIPpOobqb8opxTNPbguotudPPrHJMoDM=
+github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a h1:ov5QCDpZpsr+geKLVON7E63UqrpNF0oTiKuZwbKwEmo=
+github.com/Mrs4s/MiraiGo v0.0.0-20210124065645-9549a32d954a/go.mod h1:9V7DdSwpEfCKQNvLZhRnFJFkelTU0tPLfwR5l6UFF1Y=
 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=
@@ -11,36 +11,21 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/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/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
+github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
+github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-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-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-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=
@@ -65,29 +50,24 @@ 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.3 h1:BIiV6nnsA+R6dIB1P33uhCM8+TVAG3zHrXGZad7hDc8=
-github.com/guonaihong/gout v0.1.3/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
+github.com/guonaihong/gout v0.1.4 h1:uBBoyztMX9okC27OQxqhn6bZ0ROkGyvnEIHwtp3TM4g=
+github.com/guonaihong/gout v0.1.4/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
 github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
 github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/hpcloud/tail v1.0.0/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/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo=
-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=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
-github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
+github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 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=
@@ -99,8 +79,6 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 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=
@@ -120,18 +98,16 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.6.3 h1:aHoiiem0dr7GHkW001T1SMTJ7X5PvyekH5WX0whWGnI=
-github.com/tidwall/gjson v1.6.3/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/gjson v1.6.7 h1:Mb1M9HZCRWEcXQ8ieJo7auYyyiSux6w9XN3AdTpxJrE=
+github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
+github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
+github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
 github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6 h1:lX18MCdNzT2zIi7K02x4C5cPkDXpL+wCb1YTAMXjLWQ=
-github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6/go.mod h1:5q9LFlBr+yX/J8Jd/9wHdXwkkjFkNyQIS7kX2Lgx/Zs=
 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=
@@ -154,14 +130,16 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 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-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-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -188,8 +166,6 @@ google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4
 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=

main.go

@@ -16,17 +16,18 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/Mrs4s/go-cqhttp/server"
 	"github.com/guonaihong/gout"
 	"github.com/tidwall/gjson"
+	"golang.org/x/term"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/getlantern/go-update"
 	jsoniter "github.com/json-iterator/go"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"github.com/rifflock/lfshook"
@@ -45,23 +46,23 @@ func init() {
 	if err == nil {
 		log.SetOutput(io.MultiWriter(os.Stderr, w))
 	}
-	if !global.PathExists(global.IMAGE_PATH) {
-		if err := os.MkdirAll(global.IMAGE_PATH, 0755); err != nil {
+	if !global.PathExists(global.ImagePath) {
+		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
 			log.Fatalf("创建图片缓存文件夹失败: %v", err)
 		}
 	}
-	if !global.PathExists(global.VOICE_PATH) {
-		if err := os.MkdirAll(global.VOICE_PATH, 0755); err != nil {
+	if !global.PathExists(global.VoicePath) {
+		if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
 			log.Fatalf("创建语音缓存文件夹失败: %v", err)
 		}
 	}
-	if !global.PathExists(global.VIDEO_PATH) {
-		if err := os.MkdirAll(global.VIDEO_PATH, 0755); err != nil {
+	if !global.PathExists(global.VideoPath) {
+		if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
 			log.Fatalf("创建视频缓存文件夹失败: %v", err)
 		}
 	}
-	if !global.PathExists(global.CACHE_PATH) {
-		if err := os.MkdirAll(global.CACHE_PATH, 0755); err != nil {
+	if !global.PathExists(global.CachePath) {
+		if err := os.MkdirAll(global.CachePath, 0755); err != nil {
 			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
 		}
 	}
@@ -69,24 +70,24 @@ func init() {
 		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
 		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
 		time.Sleep(time.Second * 5)
-		conf := global.CQHttpApiConfig{}
+		conf := global.CQHTTPAPIConfig{}
 		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
 			log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
 		}
 		goConf := global.DefaultConfig()
 		goConf.AccessToken = conf.AccessToken
-		goConf.HttpConfig.Host = conf.Host
-		goConf.HttpConfig.Port = conf.Port
+		goConf.HTTPConfig.Host = conf.Host
+		goConf.HTTPConfig.Port = conf.Port
 		goConf.WSConfig.Host = conf.WSHost
 		goConf.WSConfig.Port = conf.WSPort
-		if conf.PostUrl != "" {
-			goConf.HttpConfig.PostUrls[conf.PostUrl] = conf.Secret
+		if conf.PostURL != "" {
+			goConf.HTTPConfig.PostUrls[conf.PostURL] = conf.Secret
 		}
 		if conf.UseWsReverse {
 			goConf.ReverseServers[0].Enabled = true
-			goConf.ReverseServers[0].ReverseUrl = conf.WSReverseUrl
-			goConf.ReverseServers[0].ReverseApiUrl = conf.WSReverseApiUrl
-			goConf.ReverseServers[0].ReverseEventUrl = conf.WSReverseEventUrl
+			goConf.ReverseServers[0].ReverseURL = conf.WSReverseURL
+			goConf.ReverseServers[0].ReverseAPIURL = conf.WSReverseAPIURL
+			goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
 			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
 		}
 		if err := goConf.Save("config.hjson"); err != nil {
@@ -97,9 +98,9 @@ func init() {
 }
 
 func main() {
-	console := bufio.NewReader(os.Stdin)
-	var strKey string
-	var isFastStart bool = false
+
+	var byteKey []byte
+	var isFastStart = false
 	arg := os.Args
 	if len(arg) > 1 {
 		for i := range arg {
@@ -113,8 +114,7 @@ func main() {
 			case "key":
 				if len(arg) > i+1 {
 					b := []byte(arg[i+1])
-					b = append(b, 13, 10)
-					strKey = string(b[:])
+					byteKey = b
 				}
 			case "faststart":
 				isFastStart = true
@@ -122,7 +122,7 @@ func main() {
 		}
 	}
 
-	var conf *global.JsonConfig
+	var conf *global.JSONConfig
 	if global.PathExists("config.json") {
 		conf = global.Load("config.json")
 		_ = conf.Save("config.hjson")
@@ -132,16 +132,16 @@ func main() {
 		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
 		pwd := os.Getenv("PASS")
 		post := os.Getenv("HTTP_POST")
-		conf = &global.JsonConfig{
+		conf = &global.JSONConfig{
 			Uin:      uin,
 			Password: pwd,
-			HttpConfig: &global.GoCQHttpConfig{
+			HTTPConfig: &global.GoCQHTTPConfig{
 				Enabled:  true,
 				Host:     "0.0.0.0",
 				Port:     5700,
 				PostUrls: map[string]string{},
 			},
-			WSConfig: &global.GoCQWebsocketConfig{
+			WSConfig: &global.GoCQWebSocketConfig{
 				Enabled: true,
 				Host:    "0.0.0.0",
 				Port:    6700,
@@ -150,7 +150,7 @@ func main() {
 			Debug:             os.Getenv("DEBUG") == "true",
 		}
 		if post != "" {
-			conf.HttpConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
+			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
 		}
 	} else {
 		conf = global.Load("config.hjson")
@@ -214,7 +214,12 @@ func main() {
 		log.SetLevel(log.DebugLevel)
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
+		server.Debug = true
+		if conf.WebUI == nil || !conf.WebUI.Enabled {
+			log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
+		}
 	}
+	log.Info("用户交流群: 721829413")
 	if !global.PathExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
 		client.GenRandomDevice()
@@ -228,8 +233,8 @@ func main() {
 	}
 	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
 		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-		strKey, _ := console.ReadString('\n')
-		key := md5.Sum([]byte(strKey))
+		byteKey, _ := term.ReadPassword(int(os.Stdin.Fd()))
+		key := md5.Sum(byteKey)
 		if encrypted := EncryptPwd(conf.Password, key[:]); encrypted != "" {
 			conf.Password = ""
 			conf.PasswordEncrypted = encrypted
@@ -239,7 +244,7 @@ func main() {
 		}
 	}
 	if conf.PasswordEncrypted != "" {
-		if strKey == "" {
+		if len(byteKey) == 0 {
 			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
 			cancel := make(chan struct{}, 1)
 			go func() {
@@ -252,12 +257,12 @@ func main() {
 					os.Exit(0)
 				}
 			}()
-			strKey, _ = console.ReadString('\n')
+			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
 			cancel <- struct{}{}
 		} else {
 			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
 		}
-		key := md5.Sum([]byte(strKey))
+		key := md5.Sum(byteKey)
 		conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
 	}
 	if !isFastStart {
@@ -305,26 +310,26 @@ func main() {
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
 		return true
 	})
-	if conf.WebUi == nil {
-		conf.WebUi = &global.GoCqWebUi{
+	if conf.WebUI == nil {
+		conf.WebUI = &global.GoCQWebUI{
 			Enabled:   true,
 			WebInput:  false,
 			Host:      "0.0.0.0",
-			WebUiPort: 9999,
+			WebUIPort: 9999,
 		}
 	}
-	if conf.WebUi.WebUiPort <= 0 {
-		conf.WebUi.WebUiPort = 9999
+	if conf.WebUI.WebUIPort <= 0 {
+		conf.WebUI.WebUIPort = 9999
 	}
-	if conf.WebUi.Host == "" {
-		conf.WebUi.Host = "127.0.0.1"
+	if conf.WebUI.Host == "" {
+		conf.WebUI.Host = "127.0.0.1"
 	}
 	global.Proxy = conf.ProxyRewrite
-	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
+	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
 	c := server.Console
 	r := server.Restart
 	go checkUpdate()
-	signal.Notify(c, os.Interrupt, os.Kill)
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	select {
 	case <-c:
 		b.Release()
@@ -335,6 +340,7 @@ func main() {
 	}
 }
 
+//EncryptPwd 通过给定key加密给定pwd
 func EncryptPwd(pwd string, key []byte) string {
 	tea := binary.NewTeaCipher(key)
 	if tea == nil {
@@ -343,6 +349,7 @@ func EncryptPwd(pwd string, key []byte) string {
 	return base64.StdEncoding.EncodeToString(tea.Encrypt([]byte(pwd)))
 }
 
+//DecryptPwd 通过给定key解密给定ePwd
 func DecryptPwd(ePwd string, key []byte) string {
 	defer func() {
 		if pan := recover(); pan != nil {
@@ -384,7 +391,7 @@ func checkUpdate() {
 	log.Infof("检查更新完成. 当前已运行最新版本.")
 }
 
-func selfUpdate(imageUrl string) {
+func selfUpdate(imageURL string) {
 	console := bufio.NewReader(os.Stdin)
 	readLine := func() (str string) {
 		str, _ = console.ReadString('\n')
@@ -412,8 +419,8 @@ func selfUpdate(imageUrl string) {
 			url := fmt.Sprintf(
 				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
 				func() string {
-					if imageUrl != "" {
-						return imageUrl
+					if imageURL != "" {
+						return imageURL
 					}
 					return "https://github.com"
 				}(),
@@ -432,7 +439,7 @@ func selfUpdate(imageUrl string) {
 				return
 			}
 			wc := global.WriteCounter{}
-			err, _ = update.New().FromStream(io.TeeReader(resp.Body, &wc))
+			err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
 			fmt.Println()
 			if err != nil {
 				log.Error("更新失败!")
@@ -446,6 +453,8 @@ func selfUpdate(imageUrl string) {
 		} else {
 			log.Warn("已取消更新！")
 		}
+	} else {
+		log.Info("当前版本已经是最新版本!")
 	}
 	log.Info("按 Enter 继续....")
 	readLine()
@@ -453,7 +462,7 @@ func selfUpdate(imageUrl string) {
 }
 
 func restart(Args []string) {
-	cmd := &exec.Cmd{}
+	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
 		file, err := exec.LookPath(Args[0])
 		if err != nil {
@@ -480,5 +489,5 @@ func restart(Args []string) {
 			Stdout: os.Stdout,
 		}
 	}
-	cmd.Start()
+	_ = cmd.Start()
 }

server/apiAdmin.go

@@ -12,8 +12,12 @@ import (
 	"os/signal"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/gin-contrib/pprof"
+
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
@@ -32,13 +36,13 @@ var Console = make(chan os.Signal, 1)
 
 var Restart = make(chan struct{}, 1)
 
-var JsonConfig *global.JsonConfig
+var JSONConfig *global.JSONConfig
 
 type webServer struct {
 	engine  *gin.Engine
 	bot     *coolq.CQBot
 	Cli     *client.QQClient
-	Conf    *global.JsonConfig //old config
+	Conf    *global.JSONConfig //old config
 	Console *bufio.Reader
 }
 
@@ -66,7 +70,7 @@ func Failed(code int, msg string) coolq.MSG {
 func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 	s.Cli = cli
 	s.Conf = GetConf()
-	JsonConfig = s.Conf
+	JSONConfig = s.Conf
 	gin.SetMode(gin.ReleaseMode)
 	s.engine = gin.New()
 
@@ -77,21 +81,26 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
 
 	go func() {
 		//开启端口监听
-		if s.Conf.WebUi != nil && s.Conf.WebUi.Enabled {
+		if s.Conf.WebUI != nil && s.Conf.WebUI.Enabled {
+			if Debug {
+				pprof.Register(s.engine)
+				log.Debugf("pprof 性能分析服务已启动在 http://%v/debug/pprof, 如果有任何性能问题请下载报告并提交给开发者", addr)
+				time.Sleep(time.Second * 3)
+			}
 			log.Infof("Admin API 服务器已启动: %v", addr)
 			err := s.engine.Run(addr)
 			if err != nil {
 				log.Error(err)
 				log.Infof("请检查端口是否被占用.")
 				c := make(chan os.Signal, 1)
-				signal.Notify(c, os.Interrupt, os.Kill)
+				signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 				<-c
 				os.Exit(1)
 			}
 		} else {
 			//关闭端口监听
 			c := make(chan os.Signal, 1)
-			signal.Notify(c, os.Interrupt, os.Kill)
+			signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 			<-c
 			os.Exit(1)
 		}
@@ -106,34 +115,59 @@ func (s *webServer) Dologin() {
 	s.Console = bufio.NewReader(os.Stdin)
 	readLine := func() (str string) {
 		str, _ = s.Console.ReadString('\n')
+		str = strings.TrimSpace(str)
 		return
 	}
 	conf := GetConf()
 	cli := s.Cli
 	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()
+				log.Warnf("登录需要滑条验证码, 请选择解决方案: ")
+				log.Warnf("1. 自行抓包. (推荐)")
+				log.Warnf("2. 使用Cef自动处理.")
+				log.Warnf("3. 不提交滑块并继续.(可能会导致上网环境异常错误)")
+				log.Warnf("详细信息请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <-")
+				log.Warn("请输入(1 - 3): ")
+				text = readLine()
+				if strings.Contains(text, "1") {
+					log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", rsp.VerifyUrl)
+					log.Warn("请输入Ticket： (Enter 提交)")
+					text = readLine()
+					rsp, err = cli.SubmitTicket(strings.TrimSpace(text))
+					continue
+				}
+				if strings.Contains(text, "3") {
+					cli.AllowSlider = false
+					cli.Disconnect()
+					rsp, err = cli.Login()
+					continue
+				}
+				id := utils.RandomStringRange(6, "0123456789")
+				log.Warnf("滑块ID为 %v 请在30S内处理.", id)
+				ticket, err := global.GetSliderTicket(rsp.VerifyUrl, id)
+				if err != nil {
+					log.Warnf("错误: " + err.Error())
+					os.Exit(0)
+				}
+				rsp, err = cli.SubmitTicket(ticket)
+				if err != nil {
+					log.Warnf("错误: " + err.Error())
 					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.WebInput {
-					log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/do_web_write 输入)", conf.WebUi.Host, conf.WebUi.WebUiPort)
+				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 提交)")
@@ -178,8 +212,8 @@ func (s *webServer) Dologin() {
 				return
 			case client.UnsafeDeviceError:
 				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
-				if conf.WebUi.WebInput {
-					log.Infof(" (http://%s:%d/admin/do_web_write 确认后继续)....", conf.WebUi.Host, conf.WebUi.WebUiPort)
+				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 继续....")
@@ -193,6 +227,14 @@ func (s *webServer) Dologin() {
 				if strings.Contains(msg, "版本") {
 					msg = "密码错误或账号被冻结"
 				}
+				if strings.Contains(msg, "上网环境") && count < 5 {
+					cli.Disconnect()
+					rsp, err = cli.Login()
+					count++
+					log.Warnf("错误: 当前上网环境异常. 将更换服务器并重试.")
+					time.Sleep(time.Second)
+					continue
+				}
 				log.Warnf("登录失败: %v", msg)
 				log.Infof("按 Enter 继续....")
 				readLine()
@@ -224,11 +266,14 @@ func (s *webServer) Dologin() {
 	global.BootFilter()
 	global.InitCodec()
 	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
+	coolq.SplitUrl = conf.FixURL
 	coolq.ForceFragmented = conf.ForceFragmented
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
 		if conf.ReLogin.Enabled {
+			conf.ReLogin.Enabled = false
+			defer func() { conf.ReLogin.Enabled = true }()
 			var times uint = 1
 			for {
 				if cli.Online {
@@ -256,6 +301,9 @@ func (s *webServer) Dologin() {
 						log.Fatalf("重连失败: 设备锁")
 					default:
 						log.Errorf("重连失败: %v", rsp.ErrorMessage)
+						if strings.Contains(rsp.ErrorMessage, "冻结") {
+							log.Fatalf("账号被冻结, 放弃重连")
+						}
 						cli.Disconnect()
 						continue
 					}
@@ -281,9 +329,9 @@ func (s *webServer) admin(c *gin.Context) {
 }
 
 // 获取当前配置文件信息
-func GetConf() *global.JsonConfig {
-	if JsonConfig != nil {
-		return JsonConfig
+func GetConf() *global.JSONConfig {
+	if JSONConfig != nil {
+		return JSONConfig
 	}
 	conf := global.Load("config.hjson")
 	return conf
@@ -303,6 +351,10 @@ func AuthMiddleWare() gin.HandlerFunc {
 		if c.Request.Method == "OPTIONS" {
 			c.AbortWithStatus(http.StatusNoContent)
 		}
+		if strings.Contains(c.Request.URL.Path, "debug") {
+			c.Next()
+			return
+		}
 		// 处理请求
 		if c.Request.Method != "GET" && c.Request.Method != "POST" {
 			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
@@ -339,7 +391,7 @@ func AuthMiddleWare() gin.HandlerFunc {
 }
 
 func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
-	JsonConfig = nil
+	JSONConfig = nil
 	conf := GetConf()
 	OldConf := s.Conf
 	cli := client.NewClient(conf.Uin, conf.Password)
@@ -378,7 +430,7 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 	s.Cli = cli
 	s.Dologin()
 	//关闭之前的 server
-	if OldConf.HttpConfig != nil && OldConf.HttpConfig.Enabled {
+	if OldConf.HTTPConfig != nil && OldConf.HTTPConfig.Enabled {
 		HttpServer.ShutDown()
 	}
 	//if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
@@ -391,31 +443,31 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 
 func (s *webServer) UpServer() {
 	conf := GetConf()
-	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
-		go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, s.bot)
-		for k, v := range conf.HttpConfig.PostUrls {
-			NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, s.bot)
+	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)
+		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()
+		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)
+	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()
+		go NewWebSocketClient(rc, conf.AccessToken, s.bot).Run()
 	}
 }
 
@@ -426,7 +478,6 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
 	s.Cli = nil
 	s.DoReLogin()
 	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
 }
 
 // 进程重启
@@ -439,7 +490,6 @@ func AdminProcessRestart(s *webServer, c *gin.Context) {
 func AdminDoRestartDocker(s *webServer, c *gin.Context) {
 	Console <- os.Kill
 	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
 }
 
 // web输入 html 页面
@@ -481,7 +531,7 @@ func AdminDoConfigBase(s *webServer, c *gin.Context) {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
-		JsonConfig = nil
+		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
@@ -490,23 +540,23 @@ func AdminDoConfigBase(s *webServer, c *gin.Context) {
 func AdminDoConfigHttp(s *webServer, c *gin.Context) {
 	conf := GetConf()
 	p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
-	conf.HttpConfig.Port = uint16(p)
-	conf.HttpConfig.Host = c.PostForm("host")
+	conf.HTTPConfig.Port = uint16(p)
+	conf.HTTPConfig.Host = c.PostForm("host")
 	if c.PostForm("enable") == "true" {
-		conf.HttpConfig.Enabled = true
+		conf.HTTPConfig.Enabled = true
 	} else {
-		conf.HttpConfig.Enabled = false
+		conf.HTTPConfig.Enabled = false
 	}
 	t, _ := strconv.ParseInt(c.PostForm("timeout"), 10, 32)
-	conf.HttpConfig.Timeout = int32(t)
+	conf.HTTPConfig.Timeout = int32(t)
 	if c.PostForm("post_url") != "" {
-		conf.HttpConfig.PostUrls[c.PostForm("post_url")] = c.PostForm("post_secret")
+		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
+		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
@@ -526,7 +576,7 @@ func AdminDoConfigWs(s *webServer, c *gin.Context) {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
-		JsonConfig = nil
+		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
@@ -534,9 +584,9 @@ func AdminDoConfigWs(s *webServer, c *gin.Context) {
 // 反向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")
+	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" {
@@ -548,7 +598,7 @@ func AdminDoConfigReverse(s *webServer, c *gin.Context) {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
-		JsonConfig = nil
+		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }
@@ -567,7 +617,7 @@ func AdminDoConfigJson(s *webServer, c *gin.Context) {
 		log.Fatalf("保存 config.hjson 时出现错误: %v", err)
 		c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
 	} else {
-		JsonConfig = nil
+		JSONConfig = nil
 		c.JSON(200, coolq.OK(coolq.MSG{}))
 	}
 }

server/http.go

@@ -35,6 +35,7 @@ type httpClient struct {
 }
 
 var HttpServer = &httpServer{}
+var Debug = false
 
 func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	gin.SetMode(gin.ReleaseMode)
@@ -89,17 +90,11 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 		}
 		if err := s.Http.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
-			log.Infof("请检查端口是否被占用.")
+			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
+			log.Warnf("将在五秒后退出.")
 			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)
-		//}
 	}()
 }
 
@@ -128,7 +123,11 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 		}
 		if c.secret != "" {
 			mac := hmac.New(sha1.New, []byte(c.secret))
-			mac.Write([]byte(m.ToJson()))
+			_, err := mac.Write([]byte(m.ToJson()))
+			if err != nil {
+				log.Error(err)
+				return nil
+			}
 			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
 		}
 		return h
@@ -177,7 +176,8 @@ func GetGroupList(s *httpServer, 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))
+	nc := getParamOrDefault(c, "no_cache", "false")
+	c.JSON(200, s.bot.CQGetGroupInfo(gid, nc == "true"))
 }
 
 func GetGroupMemberList(s *httpServer, c *gin.Context) {
@@ -357,6 +357,9 @@ func SetRestart(s *httpServer, c *gin.Context) {
 
 func GetForwardMessage(s *httpServer, c *gin.Context) {
 	resId := getParam(c, "message_id")
+	if resId == "" {
+		resId = getParam(c, "id")
+	}
 	c.JSON(200, s.bot.CQGetForwardMessage(resId))
 }
 
@@ -399,6 +402,35 @@ func GetStrangerInfo(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
 }
 
+func GetGroupAtAllRemain(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	c.JSON(200, s.bot.CQGetAtAllRemain(gid))
+}
+
+func SetGroupAnonymousBan(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	d, _ := strconv.ParseInt(getParam(c, "duration"), 10, 64)
+	flag := getParam(c, "flag")
+	if flag == "" {
+		flag = getParam(c, "anonymous_flag")
+	}
+	if flag == "" {
+		o := gjson.Parse(getParam(c, "anonymous"))
+		flag = o.Get("flag").String()
+	}
+	c.JSON(200, s.bot.CQSetGroupAnonymousBan(gid, flag, int32(d)))
+}
+
+func GetGroupMessageHistory(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	seq, _ := strconv.ParseInt(getParam(c, "message_seq"), 10, 64)
+	c.JSON(200, s.bot.CQGetGroupMessageHistory(gid, seq))
+}
+
+func GetOnlineClients(s *httpServer, c *gin.Context) {
+	c.JSON(200, s.bot.CQGetOnlineClients(getParamOrDefault(c, "no_cache", "false") == "true"))
+}
+
 func HandleQuickOperation(s *httpServer, c *gin.Context) {
 	if c.Request.Method != "POST" {
 		c.AbortWithStatus(404)
@@ -410,6 +442,33 @@ func HandleQuickOperation(s *httpServer, c *gin.Context) {
 	}
 }
 
+func DownloadFile(s *httpServer, c *gin.Context) {
+	url := getParam(c, "url")
+	tc, _ := strconv.Atoi(getParam(c, "thread_count"))
+	h, t := getParamWithType(c, "headers")
+	headers := map[string]string{}
+	if t == gjson.Null || t == gjson.String {
+		lines := strings.Split(h, "\r\n")
+		for _, sub := range lines {
+			str := strings.SplitN(sub, "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	if t == gjson.JSON {
+		arr := gjson.Parse(h)
+		for _, sub := range arr.Array() {
+			str := strings.SplitN(sub.String(), "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	println(url, tc, h, t)
+	c.JSON(200, s.bot.CQDownloadFile(url, headers, tc))
+}
+
 func OcrImage(s *httpServer, c *gin.Context) {
 	img := getParam(c, "image")
 	c.JSON(200, s.bot.CQOcrImage(img))
@@ -516,8 +575,14 @@ var httpApi = map[string]func(s *httpServer, c *gin.Context){
 	"get_stranger_info":          GetStrangerInfo,
 	"reload_event_filter":        ReloadEventFilter,
 	"set_group_portrait":         SetGroupPortrait,
+	"set_group_anonymous_ban":    SetGroupAnonymousBan,
+	"get_group_msg_history":      GetGroupMessageHistory,
+	"download_file":              DownloadFile,
 	".handle_quick_operation":    HandleQuickOperation,
 	".ocr_image":                 OcrImage,
+	"ocr_image":                  OcrImage,
+	"get_group_at_all_remain":    GetGroupAtAllRemain,
+	"get_online_clients":         GetOnlineClients,
 	".get_word_slices":           GetWordSlices,
 }
 
@@ -527,9 +592,7 @@ func (s *httpServer) ShutDown() {
 	if err := s.Http.Shutdown(ctx); err != nil {
 		log.Fatal("http Server Shutdown:", err)
 	}
-	select {
-	case <-ctx.Done():
-		log.Println("timeout of 5 seconds.")
-	}
+	<-ctx.Done()
+	log.Println("timeout of 5 seconds.")
 	log.Println("http Server exiting")
 }

server/websocket.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -16,36 +17,38 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-type websocketServer struct {
+type webSocketServer struct {
 	bot            *coolq.CQBot
 	token          string
-	eventConn      []*websocketConn
+	eventConn      []*webSocketConn
 	eventConnMutex sync.Mutex
 	handshake      string
 }
 
-type websocketClient struct {
-	conf  *global.GoCQReverseWebsocketConfig
+//WebSocketClient Websocket客户端实例
+type WebSocketClient struct {
+	conf  *global.GoCQReverseWebSocketConfig
 	token string
 	bot   *coolq.CQBot
 
-	universalConn *websocketConn
-	eventConn     *websocketConn
+	universalConn *webSocketConn
+	eventConn     *webSocketConn
 }
 
-type websocketConn struct {
+type webSocketConn struct {
 	*websocket.Conn
 	sync.Mutex
 }
 
-var WebsocketServer = &websocketServer{}
+//WebSocketServer 初始化一个WebSocketServer实例
+var WebSocketServer = &webSocketServer{}
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool {
 		return true
 	},
 }
 
-func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
+func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 	s.token = authToken
 	s.bot = b
 	s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
@@ -60,29 +63,31 @@ func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 	}()
 }
 
-func NewWebsocketClient(conf *global.GoCQReverseWebsocketConfig, authToken string, b *coolq.CQBot) *websocketClient {
-	return &websocketClient{conf: conf, token: authToken, bot: b}
+//NewWebSocketClient 初始化一个NWebSocket客户端
+func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
+	return &WebSocketClient{conf: conf, token: authToken, bot: b}
 }
 
-func (c *websocketClient) Run() {
+//Run 运行实例
+func (c *WebSocketClient) Run() {
 	if !c.conf.Enabled {
 		return
 	}
-	if c.conf.ReverseUrl != "" {
+	if c.conf.ReverseURL != "" {
 		c.connectUniversal()
 	} else {
-		if c.conf.ReverseApiUrl != "" {
-			c.connectApi()
+		if c.conf.ReverseAPIURL != "" {
+			c.connectAPI()
 		}
-		if c.conf.ReverseEventUrl != "" {
+		if c.conf.ReverseEventURL != "" {
 			c.connectEvent()
 		}
 	}
 	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connectApi() {
-	log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseApiUrl)
+func (c *WebSocketClient) connectAPI() {
+	log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseAPIURL)
 	header := http.Header{
 		"X-Client-Role": []string{"API"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -91,22 +96,22 @@ func (c *websocketClient) connectApi() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseApiUrl, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err)
+		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-			c.connectApi()
+			c.connectAPI()
 		}
 		return
 	}
-	log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseApiUrl)
-	wrappedConn := &websocketConn{Conn: conn}
-	go c.listenApi(wrappedConn, false)
+	log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseAPIURL)
+	wrappedConn := &webSocketConn{Conn: conn}
+	go c.listenAPI(wrappedConn, false)
 }
 
-func (c *websocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventUrl)
+func (c *WebSocketClient) connectEvent() {
+	log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Event"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -115,9 +120,9 @@ func (c *websocketClient) connectEvent() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventUrl, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventUrl, err)
+		log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectEvent()
@@ -132,12 +137,12 @@ func (c *websocketClient) connectEvent() {
 		log.Warnf("反向Websocket 握手时出现错误: %v", err)
 	}
 
-	log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventUrl)
-	c.eventConn = &websocketConn{Conn: conn}
+	log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventURL)
+	c.eventConn = &webSocketConn{Conn: conn}
 }
 
-func (c *websocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseUrl)
+func (c *WebSocketClient) connectUniversal() {
+	log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseURL)
 	header := http.Header{
 		"X-Client-Role": []string{"Universal"},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@@ -146,9 +151,9 @@ func (c *websocketClient) connectUniversal() {
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseUrl, header)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseUrl, err)
+		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 			c.connectUniversal()
@@ -163,12 +168,12 @@ func (c *websocketClient) connectUniversal() {
 		log.Warnf("反向Websocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &websocketConn{Conn: conn}
-	go c.listenApi(wrappedConn, true)
+	wrappedConn := &webSocketConn{Conn: conn}
+	go c.listenAPI(wrappedConn, true)
 	c.universalConn = wrappedConn
 }
 
-func (c *websocketClient) listenApi(conn *websocketConn, u bool) {
+func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
 	defer conn.Close()
 	for {
 		_, buf, err := conn.ReadMessage()
@@ -183,12 +188,12 @@ func (c *websocketClient) listenApi(conn *websocketConn, u bool) {
 	if c.conf.ReverseReconnectInterval != 0 {
 		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 		if !u {
-			go c.connectApi()
+			go c.connectAPI()
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
+func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
 	if c.eventConn != nil {
 		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson())
 		conn := c.eventConn
@@ -221,7 +226,7 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
 	}
 }
 
-func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
+func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
@@ -245,14 +250,14 @@ func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &websocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c}
 
 	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
 	s.eventConnMutex.Unlock()
 }
 
-func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
+func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
@@ -268,11 +273,11 @@ func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &websocketConn{Conn: c}
-	go s.listenApi(conn)
+	conn := &webSocketConn{Conn: c}
+	go s.listenAPI(conn)
 }
 
-func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
+func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
 		if auth := r.URL.Query().Get("access_token"); auth != s.token {
 			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
@@ -294,12 +299,12 @@ func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
-	conn := &websocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c}
 	s.eventConn = append(s.eventConn, conn)
-	s.listenApi(conn)
+	s.listenAPI(conn)
 }
 
-func (s *websocketServer) listenApi(c *websocketConn) {
+func (s *webSocketServer) listenAPI(c *webSocketConn) {
 	defer c.Close()
 	for {
 		t, payload, err := c.ReadMessage()
@@ -313,10 +318,10 @@ func (s *websocketServer) listenApi(c *websocketConn) {
 	}
 }
 
-func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
+func (c *webSocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Printf("处置WS命令时发生无法恢复的异常：%v", err)
+			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
 			c.Close()
 		}
 	}()
@@ -324,7 +329,7 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 	j := gjson.ParseBytes(payload)
 	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	if f, ok := wsApi[t]; ok {
+	if f, ok := wsAPI[t]; ok {
 		ret := f(bot, j.Get("params"))
 		if j.Get("echo").Exists() {
 			ret["echo"] = j.Get("echo").Value()
@@ -332,10 +337,18 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 		c.Lock()
 		defer c.Unlock()
 		_ = c.WriteJSON(ret)
+	} else {
+		ret := coolq.Failed(1404, "API_NOT_FOUND", "API不存在")
+		if j.Get("echo").Exists() {
+			ret["echo"] = j.Get("echo").Value()
+		}
+		c.Lock()
+		defer c.Unlock()
+		_ = c.WriteJSON(ret)
 	}
 }
 
-func (s *websocketServer) onBotPushEvent(m coolq.MSG) {
+func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
 	s.eventConnMutex.Lock()
 	defer s.eventConnMutex.Unlock()
 	for i, l := 0, len(s.eventConn); i < l; i++ {
@@ -359,7 +372,7 @@ func (s *websocketServer) onBotPushEvent(m coolq.MSG) {
 	}
 }
 
-var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
+var wsAPI = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_login_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetLoginInfo()
 	},
@@ -370,7 +383,7 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		return bot.CQGetGroupList(p.Get("no_cache").Bool())
 	},
 	"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupInfo(p.Get("group_id").Int())
+		return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
 	},
 	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
@@ -472,16 +485,42 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		return bot.CQGetImage(p.Get("file").Str)
 	},
 	"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetForwardMessage(p.Get("message_id").Str)
+		id := p.Get("message_id").Str
+		if id == "" {
+			id = p.Get("id").Str
+		}
+		return bot.CQGetForwardMessage(id)
 	},
 	"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetMessage(int32(p.Get("message_id").Int()))
 	},
+	"download_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		headers := map[string]string{}
+		headersToken := p.Get("headers")
+		if headersToken.IsArray() {
+			for _, sub := range headersToken.Array() {
+				str := strings.SplitN(sub.String(), "=", 2)
+				if len(str) == 2 {
+					headers[str[0]] = str[1]
+				}
+			}
+		}
+		if headersToken.Type == gjson.String {
+			lines := strings.Split(headersToken.String(), "\r\n")
+			for _, sub := range lines {
+				str := strings.SplitN(sub, "=", 2)
+				if len(str) == 2 {
+					headers[str[0]] = str[1]
+				}
+			}
+		}
+		return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
+	},
 	"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
 	},
 	"set_restart": func(c *coolq.CQBot, p gjson.Result) coolq.MSG {
-		var delay int64 = 0
+		var delay int64
 		delay = p.Get("delay").Int()
 		if delay < 0 {
 			delay = 0
@@ -523,6 +562,9 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupFileUrl(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
 	},
+	"get_group_msg_history": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
+	},
 	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetVipInfo(p.Get("user_id").Int())
 	},
@@ -532,12 +574,35 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	".ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQOcrImage(p.Get("image").Str)
 	},
+	"ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQOcrImage(p.Get("image").Str)
+	},
+	"get_group_at_all_remain": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetAtAllRemain(p.Get("group_id").Int())
+	},
+	"get_online_clients": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
+	},
 	".get_word_slices": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetWordSlices(p.Get("content").Str)
 	},
 	"set_group_portrait": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
 	},
+	"set_group_anonymous_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		obj := p.Get("anonymous")
+		flag := p.Get("anonymous_flag")
+		if !flag.Exists() {
+			flag = p.Get("flag")
+		}
+		if !flag.Exists() && !obj.Exists() {
+			return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
+		}
+		if !flag.Exists() {
+			flag = obj.Get("flag")
+		}
+		return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
+	},
 	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 	},