update MiraiGo.

修改代码样式

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set RELEASE_VERSION env
         run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
-      - uses: wangyoucao577/go-release-action@master
+      - uses: pcrbot/go-release-action@master
         env:
           CGO_ENABLED: 0
         with:

README.md

@@ -68,7 +68,7 @@
 | /set_group_leave         | [退出群组](https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-退出群组) |
 | /set_group_name          | 设置群组名(拓展API)                                         |
 | /get_image               | 获取图片信息(拓展API)                                        |
-| /get_group_msg           | 获取群组消息(拓展API)                                        |
+| /get_msg                 | [获取消息]()                                        | <!-- TODO 来人补个链接-->
 | /can_send_image          | [检查是否可以发送图片](https://cqhttp.cc/docs/4.15/#/API?id=can_send_image-检查是否可以发送图片) |
 | /can_send_record         | [检查是否可以发送语音](https://cqhttp.cc/docs/4.15/#/API?id=can_send_record-检查是否可以发送语音) |
 | /get_status              | [获取插件运行状态](https://cqhttp.cc/docs/4.15/#/API?id=get_status-获取插件运行状态) |

coolq/api.go

@@ -102,6 +102,59 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
 	return OK(convertGroupMemberInfo(groupId, member))
 }
 
+func (bot *CQBot) CQGetGroupFileSystemInfo(groupId int64) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100)
+	}
+	return OK(fs)
+}
+
+func (bot *CQBot) CQGetGroupRootFiles(groupId int64) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100)
+	}
+	files, folders, err := fs.Root()
+	if err != nil {
+		log.Errorf("获取群 %v 根目录文件失败: %v", groupId, err)
+		return Failed(100)
+	}
+	return OK(MSG{
+		"files":   files,
+		"folders": folders,
+	})
+}
+
+func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG {
+	fs, err := bot.Client.GetGroupFileSystem(groupId)
+	if err != nil {
+		log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
+		return Failed(100)
+	}
+	files, folders, err := fs.GetFilesByFolder(folderId)
+	if err != nil {
+		log.Errorf("获取群 %v 根目录 %v 子文件失败: %v", groupId, folderId, err)
+		return Failed(100)
+	}
+	return OK(MSG{
+		"files":   files,
+		"folders": folders,
+	})
+}
+
+func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) MSG {
+	url := bot.Client.GetGroupFileUrl(groupId, fileId, busId)
+	if url == "" {
+		return Failed(100)
+	}
+	return OK(MSG{
+		"url": url,
+	})
+}
+
 func (bot *CQBot) CQGetWordSlices(content string) MSG {
 	slices, err := bot.Client.GetWordSegmentation(content)
 	if err != nil {
@@ -384,29 +437,43 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%EF%BC%8F%E9%82%80%E8%AF%B7
 func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) MSG {
+	msgs, err := bot.Client.GetGroupSystemMessages()
+	if err != nil {
+		log.Errorf("获取群系统消息失败: %v", err)
+		return Failed(100)
+	}
 	if subType == "add" {
-		req, ok := bot.joinReqCache.Load(flag)
-		if !ok {
-			return Failed(100)
+		for _, req := range msgs.JoinRequests {
+			if strconv.FormatInt(req.RequestId, 10) == flag {
+				if req.Checked {
+					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
+					return Failed(100)
+				}
+				if approve {
+					req.Accept()
+				} else {
+					req.Reject(false, reason)
+				}
+				return OK(nil)
+			}
 		}
-		bot.joinReqCache.Delete(flag)
-		if approve {
-			req.(*client.UserJoinGroupRequest).Accept()
-		} else {
-			req.(*client.UserJoinGroupRequest).Reject(false, reason)
+	} else {
+		for _, req := range msgs.InvitedRequests {
+			if strconv.FormatInt(req.RequestId, 10) == flag {
+				if req.Checked {
+					log.Errorf("处理群系统消息失败: 无法操作已处理的消息.")
+					return Failed(100)
+				}
+				if approve {
+					req.Accept()
+				} else {
+					req.Reject(false, reason)
+				}
+				return OK(nil)
+			}
 		}
-		return OK(nil)
-	}
-	req, ok := bot.invitedReqCache.Load(flag)
-	if ok {
-		bot.invitedReqCache.Delete(flag)
-		if approve {
-			req.(*client.GroupInvitedRequest).Accept()
-		} else {
-			req.(*client.GroupInvitedRequest).Reject(false, reason)
-		}
-		return OK(nil)
 	}
+	log.Errorf("处理群系统消息失败: 消息 %v 不存在.", flag)
 	return Failed(100)
 }
 
@@ -740,7 +807,7 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 		"version":                    Version,
 		"protocol": func() int {
 			switch client.SystemDeviceInfo.Protocol {
-			case client.AndroidPad:
+			case client.IPad:
 				return 0
 			case client.AndroidPhone:
 				return 1

coolq/bot.go

@@ -23,13 +23,11 @@ import (
 type CQBot struct {
 	Client *client.QQClient
 
-	events          []func(MSG)
-	db              *leveldb.DB
-	friendReqCache  sync.Map
-	invitedReqCache sync.Map
-	joinReqCache    sync.Map
-	tempMsgCache    sync.Map
-	oneWayMsgCache  sync.Map
+	events         []func(MSG)
+	db             *leveldb.DB
+	friendReqCache sync.Map
+	tempMsgCache   sync.Map
+	oneWayMsgCache sync.Map
 }
 
 type MSG map[string]interface{}
@@ -44,7 +42,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 		p := path.Join("data", "leveldb")
 		db, err := leveldb.OpenFile(p, nil)
 		if err != nil {
-			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/db 文件夹或关闭数据库功能。")
+			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
 		}
 		bot.db = db
 		gob.Register(message.Sender{})
@@ -216,6 +214,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 		return -1
 	}
 	m.Elements = newElem
+	bot.checkMedia(newElem)
 	ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
@@ -296,7 +295,12 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		}
 		newElem = append(newElem, elem)
 	}
+	if len(newElem) == 0 {
+		log.Warnf("好友消息发送失败: 消息为空.")
+		return -1
+	}
 	m.Elements = newElem
+	bot.checkMedia(newElem)
 	var id int32 = -1
 	if bot.Client.FindFriend(target) != nil { // 双向好友
 		msg := bot.Client.SendPrivateMessage(target, m)

coolq/cqcode.go

@@ -1,9 +1,11 @@
 package coolq
 
 import (
+	"bytes"
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
+	xml2 "encoding/xml"
 	"errors"
 	"fmt"
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -243,6 +245,10 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 			} else {
 				r += fmt.Sprintf(`[CQ:image,file=%s,url=%s]`, o.Filename, CQCodeEscapeValue(o.Url))
 			}
+		case *message.GroupImageElement:
+			r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
+		case *message.FriendImageElement:
+			r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				r += fmt.Sprintf(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
@@ -306,7 +312,12 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 			}
 			continue
 		}
-		r = append(r, elem)
+		switch i := elem.(type) {
+		case message.IMessageElement:
+			r = append(r, i)
+		case []message.IMessageElement:
+			r = append(r, i...)
+		}
 	}
 	if si != len(m) {
 		r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
@@ -350,7 +361,13 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
 			return
 		}
-		r = append(r, elem)
+		switch i := elem.(type) {
+		case message.IMessageElement:
+			r = append(r, i)
+		case []message.IMessageElement:
+			r = append(r, i...)
+		}
+
 	}
 	if m.Type == gjson.String {
 		return bot.ConvertStringMessage(m.Str, group)
@@ -366,7 +383,10 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
 	return
 }
 
-func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m message.IMessageElement, err error) {
+// ToElement 将解码后的CQCode转换为Element.
+// 返回 interface{} 存在三种类型
+// message.IMessageElement []message.IMessageElement nil
+func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) {
 	switch t {
 	case "text":
 		return message.NewText(d["text"]), nil
@@ -550,7 +570,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
 				}}, nil
 			}
 			xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="%s" src="%s"/><title>%s</title><summary>%s</summary></item><source name="音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
-				d["title"], d["url"], d["image"], d["audio"], d["title"], d["content"])
+				XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"]))
 			return &message.ServiceElement{
 				Id:      60,
 				Content: xml,
@@ -600,13 +620,19 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
-		return bot.SendNewPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
+		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
 	default:
 		return nil, errors.New("unsupported cq code: " + t)
 	}
 	return nil, nil
 }
 
+func XmlEscape(c string) string {
+	buf := new(bytes.Buffer)
+	_ = xml2.EscapeText(buf, []byte(c))
+	return buf.String()
+}
+
 func CQCodeEscapeText(raw string) string {
 	ret := raw
 	ret = strings.ReplaceAll(ret, "&", "&amp;")
@@ -749,10 +775,10 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
 	return nil, errors.New("invalid image")
 }
 
-//SendNewPic 一种xml 方式发送的群消息图片
-func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) (*message.ServiceElement, error) {
-	var xml string
-	xml = ""
+//makeShowPic 一种xml 方式发送的群消息图片
+func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
+	xml := ""
+	var suf message.IMessageElement
 	if i, ok := elem.(*message.ImageElement); ok {
 		if group == false {
 			gm, err := bot.Client.UploadPrivateImage(1, i.Data)
@@ -760,27 +786,32 @@ func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon s
 				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
 			}
+			suf = gm
 			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
-
 		} else {
 			gm, err := bot.Client.UploadGroupImage(1, i.Data)
 			if err != nil {
 				log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
 				return nil, err
 			}
+			suf = gm
 			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		}
 	}
+
 	if i, ok := elem.(*message.GroupImageElement); ok {
 		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		suf = i
 	}
 	if i, ok := elem.(*message.FriendImageElement); ok {
 		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		suf = i
 	}
 	if xml != "" {
-		log.Warn(xml)
-		XmlMsg := message.NewRichXml(xml, 5)
-		return XmlMsg, nil
+		//log.Warn(xml)
+		ret := []message.IMessageElement{suf}
+		ret = append(ret, message.NewRichXml(xml, 5))
+		return ret, nil
 	}
-	return nil, errors.New("发送xml图片消息失败")
+	return nil, errors.New("生成xml图片消息失败")
 }

coolq/event.go

@@ -167,13 +167,24 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 
 func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
 	g := c.FindGroup(e.GroupCode)
-	if e.Time > 0 {
-		log.Infof("群 %v 内 %v 被 %v 禁言了 %v秒.",
-			formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
+	if e.TargetUin == 0 {
+		if e.Time != 0 {
+			log.Infof("群 %v 被 %v 开启全员禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+		} else {
+			log.Infof("群 %v 被 %v 解除全员禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+		}
 	} else {
-		log.Infof("群 %v 内 %v 被 %v 解除禁言.",
-			formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
+		if e.Time > 0 {
+			log.Infof("群 %v 内 %v 被 %v 禁言了 %v 秒.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
+		} else {
+			log.Infof("群 %v 内 %v 被 %v 解除禁言.",
+				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
+		}
 	}
+
 	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"duration":    e.Time,
@@ -184,10 +195,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 		"user_id":     e.TargetUin,
 		"time":        time.Now().Unix(),
 		"sub_type": func() string {
-			if e.Time > 0 {
-				return "ban"
+			if e.Time == 0 {
+				return "lift_ban"
 			}
-			return "lift_ban"
+			return "ban"
 		}(),
 	})
 }
@@ -396,7 +407,6 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.invitedReqCache.Store(flag, e)
 	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
@@ -413,7 +423,6 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.joinReqCache.Store(flag, e)
 	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
@@ -480,6 +489,26 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 				}), 0644)
 			}
 			i.Filename = filename
+		case *message.GroupImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+		case *message.FriendImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
 		case *message.VoiceElement:
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")

docs/config.md

@@ -36,6 +36,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 	"ignore_invalid_cqcode": false,
 	"force_fragmented": true,
 	"heartbeat_interval": 5,
+    "use_sso_address": false,
 	"http_config": {
 		"enabled": true,
 		"host": "0.0.0.0",
@@ -77,6 +78,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | post_message_format  | string   | 上报信息类型                                                        |
 | ignore_invalid_cqcode| bool     | 是否忽略错误的CQ码                                                   |
 | force_fragmented     | bool     | 是否强制分片发送群长消息                                              |
+| use_sso_address      | bool     | 是否使用服务器下发的地址                                              |
 | heartbeat_interval   | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)        |
 | http_config          | object   | HTTP API配置                                                       |
 | ws_config            | object   | Websocket API 配置                                                 |
@@ -110,8 +112,20 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 
 | 值   | 类型          | 限制                                                  |
 | ---- | ------------- | ----------------------------------------------------- |
-| 0    | Android Pad   | 无法接收 `group_notify` 事件、无法接收口令红包        |
+| 0    | iPad          | 无                                                    |
 | 1    | Android Phone | 无                                                    |
-| 2    | Android Watch | 除了 `Android Pad` 有的限制外还包括: 无法接收撤回消息 |
+| 2    | Android Watch | 无法接收 `group_notify` 事件、无法接收口令红包、无法接收撤回消息 |
 
 > 注意, 根据协议的不同, 各类消息有所限制
+
+## 自定义服务器IP
+
+> 某些海外服务器使用默认地址可能会存在链路问题，此功能可以指定 go-cqhttp 连接哪些地址以达到最优化.
+
+将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
+
+示例:
+````
+1.1.1.1:53
+1.1.2.2:8899
+````

docs/cqhttp.md

@@ -380,9 +380,9 @@ Type: `tts`
 | `filename` | string | 图片文件原名   |
 | `url`      | string | 图片下载地址   |
 
-### 获取群消息
+### 获取消息
 
-终结点: `/get_group_msg` 
+终结点: `/get_msg` 
 
 参数
 
@@ -398,7 +398,7 @@ Type: `tts`
 | `real_id`    | int32   | 消息真实id |
 | `sender`     | object  | 发送者     |
 | `time`       | int32   | 发送时间   |
-| `content`    | message | 消息内容   |
+| `message`    | message | 消息内容   |
 
 ### 获取合并转发内容
 
@@ -538,7 +538,109 @@ Type: `tts`
   | `checked` | bool | 是否已被处理|
   | `actor` | int64 | 处理者, 未处理为0 |
   
+### 获取群文件系统信息
 
+终结点: `/get_group_file_system_info`
+
+**参数** 
+ 
+ | 字段         | 类型   | 说明   |
+ | ------------ | ------ | ------ |
+ | `group_id` | int64 | 群号 |
+
+**响应数据**
+
+ | 字段       | 类型              | 说明     |
+ | ---------- | ----------------- | -------- |
+ | `file_count` |      int32       | 文件总数 |
+ | `limit_count` |      int32        | 文件上限 |
+ | `used_space` |      int64        | 已使用空间 |
+ | `total_space` |      int64        | 空间上限 |
+
+### 获取群根目录文件列表
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_root_files`
+
+**参数** 
+ 
+ | 字段         | 类型   | 说明   |
+ | ------------ | ------ | ------ |
+ | `group_id` | int64 | 群号 |
+ 
+**响应数据**
+
+ | 字段       | 类型              | 说明     |
+ | ---------- | ----------------- | -------- |
+ | `files` |      File[]       | 文件列表 |
+ | `folders` |      Folder[]        | 文件夹列表 |
+ 
+### 获取群子目录文件列表
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_files_by_folder`
+
+**参数** 
+ 
+ | 字段         | 类型   | 说明   |
+ | ------------ | ------ | ------ |
+ | `group_id` | int64 | 群号 |
+ | `folder_id` | string | 文件夹ID 参考 `Folder` 对象 |
+ 
+**响应数据**
+
+ | 字段       | 类型              | 说明     |
+ | ---------- | ----------------- | -------- |
+ | `files` |      File[]       | 文件列表 |
+ | `folders` |      Folder[]        | 文件夹列表 |
+ 
+### 获取群文件资源链接
+
+> `File` 和 `Folder` 对象信息请参考最下方
+
+终结点: `/get_group_file_url`
+
+**参数** 
+ 
+ | 字段         | 类型   | 说明   |
+ | ------------ | ------ | ------ |
+ | `group_id` | int64 | 群号 |
+ | `file_id` | string | 文件ID 参考 `File` 对象 |
+ | `busid` | int32 | 文件类型 参考 `File` 对象 |
+ 
+**响应数据**
+
+ | 字段       | 类型              | 说明     |
+ | ---------- | ----------------- | -------- |
+ | `url` |      string       | 文件下载链接 |
+ 
+ **File**
+
+  | 字段       | 类型              | 说明     |
+  | ---------- | ----------------- | -------- |
+  | `file_id` |      string       | 文件ID |
+  | `file_name` |      string        | 文件名 |
+  | `busid` |      int32       | 文件类型 |
+  | `file_size` | int64        | 文件大小 |
+  | `upload_time` | int64 | 上传时间 |
+  | `dead_time` | int64 | 过期时间,永久文件恒为0 |
+  | `modify_time` | int64 | 最后修改时间 |
+  | `download_times` | int32 | 下载次数 |
+  | `uploader` | int64 | 上传者ID |
+  | `uploader_name` | string | 上传者名字 |
+  
+ **Folder**
+
+  | 字段       | 类型              | 说明     |
+  | ---------- | ----------------- | -------- |
+  | `folder_id` |      string       | 文件夹ID |
+  | `folder_name` |      string        | 文件名 |
+  | `create_time` | int64 | 创建时间 |
+  | `creator` | int64 | 创建者 |
+  | `creator_name` | string | 创建者名字 |
+  | `total_file_count` | int32 | 子文件数量 |
 
 ## 事件
 

global/config.go

@@ -33,6 +33,7 @@ type JsonConfig struct {
 	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"`
@@ -131,7 +132,7 @@ func DefaultConfig() *JsonConfig {
 		},
 		WebUi: &GoCqWebUi{
 			Enabled:   true,
-			Host:      "0.0.0.0",
+			Host:      "127.0.0.1",
 			WebInput:  false,
 			WebUiPort: 9999,
 		},

global/fs.go

@@ -6,12 +6,16 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"errors"
+	"fmt"
+	"github.com/dustin/go-humanize"
 	log "github.com/sirupsen/logrus"
 	"io/ioutil"
+	"net"
 	"net/url"
 	"os"
 	"path"
 	"runtime"
+	"strconv"
 	"strings"
 )
 
@@ -107,3 +111,37 @@ func DelFile(path string) bool {
 		return true
 	}
 }
+
+func ReadAddrFile(path string) []*net.TCPAddr {
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil
+	}
+	str := string(d)
+	lines := strings.Split(str, "\n")
+	var ret []*net.TCPAddr
+	for _, l := range lines {
+		ip := strings.Split(l, ":")
+		if len(ip) == 2 {
+			port, _ := strconv.Atoi(ip[1])
+			ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
+		}
+	}
+	return ret
+}
+
+type WriteCounter struct {
+	Total uint64
+}
+
+func (wc *WriteCounter) Write(p []byte) (int, error) {
+	n := len(p)
+	wc.Total += uint64(n)
+	wc.PrintProgress()
+	return n, nil
+}
+
+func (wc WriteCounter) PrintProgress() {
+	fmt.Printf("\r%s", strings.Repeat(" ", 35))
+	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
+}

global/param.go

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

go.mod

@@ -3,10 +3,15 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20201025135955-5be0ad946177
+	github.com/Mrs4s/MiraiGo v0.0.0-20201113113825-c1739dba15c9
+	github.com/dustin/go-humanize v1.0.0
+	github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c
+	github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
 	github.com/guonaihong/gout v0.1.3
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
+	github.com/kr/binarydist v0.1.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -14,7 +19,7 @@ require (
 	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.1
+	github.com/tidwall/gjson v1.6.3
 	github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e

go.sum

@@ -1,24 +1,30 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20201013050256-7b392cacdb79 h1:t9PK37mnl5tbilG+FMUY1hZujoDjFr8iO8upwYHww5c=
-github.com/Mrs4s/MiraiGo v0.0.0-20201013050256-7b392cacdb79/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/Mrs4s/MiraiGo v0.0.0-20201016033322-0922b058ff56 h1:vcXOLG+W/c56EWOwA8btrHMEGBMwFgLUZli0Jh1axzg=
-github.com/Mrs4s/MiraiGo v0.0.0-20201016033322-0922b058ff56/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/Mrs4s/MiraiGo v0.0.0-20201017083749-517ddcd50b8d h1:f59SuqT0RVy6T9nAg6zTNfnzkvdgLdGqkNKu/AfiPU4=
-github.com/Mrs4s/MiraiGo v0.0.0-20201017083749-517ddcd50b8d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/Mrs4s/MiraiGo v0.0.0-20201024092610-03d2bbf32a4d h1:g200Tv/mkCy6oSFqfOzblMfa3D50iNhyG7IUUQWkb78=
-github.com/Mrs4s/MiraiGo v0.0.0-20201024092610-03d2bbf32a4d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/Mrs4s/MiraiGo v0.0.0-20201025135955-5be0ad946177 h1:TcKqPWXKvOKW2O80rbswKYVLBB3Xas3+RvRInVMyBm8=
-github.com/Mrs4s/MiraiGo v0.0.0-20201025135955-5be0ad946177/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
-github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
-github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
+github.com/Mrs4s/MiraiGo v0.0.0-20201113113825-c1739dba15c9 h1:7mFBaoEz2HCIkUqfiW1EtpsZEhxfupEda8+EMeuNS+4=
+github.com/Mrs4s/MiraiGo v0.0.0-20201113113825-c1739dba15c9/go.mod h1:pAsWtMIwqkBXr5DkUpTIHoWQJNduVnX9WSBPmPvkuCs=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
+github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c h1:mP9bsvdddRSMwqO+lmNuSrsH7nD2nBIz7af+e/4je4c=
+github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c/go.mod h1:goroSTghTcnjKaR2C8ovKWy1lEvRNfqHrW/kRJNMek0=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 h1:8MYJU90rB1bsavemKSAuDKBjtAKo5xq95bEPOnzV7CE=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
@@ -33,6 +39,8 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 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=
@@ -44,8 +52,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -57,14 +65,16 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
-github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
 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/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/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=
@@ -83,6 +93,8 @@ 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=
@@ -102,8 +114,9 @@ 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.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
 github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
+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/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
@@ -114,13 +127,6 @@ 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/xujiajun/gorouter v1.2.0/go.mod h1:yJrIta+bTNpBM/2UT8hLOaEAFckO+m/qmR3luMIQygM=
-github.com/xujiajun/mmap-go v1.0.1 h1:7Se7ss1fLPPRW+ePgqGpCkfGIZzJV6JPq9Wq9iv/WHc=
-github.com/xujiajun/mmap-go v1.0.1/go.mod h1:CNN6Sw4SL69Sui00p0zEzcZKbt+5HtEnYUsc6BKKRMg=
-github.com/xujiajun/nutsdb v0.5.0 h1:j/jM3Zw7Chg8WK7bAcKR0Xr7Mal47U1oJAMgySfDn9E=
-github.com/xujiajun/nutsdb v0.5.0/go.mod h1:owdwN0tW084RxEodABLbO7h4Z2s9WiAjZGZFhRh0/1Q=
-github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b h1:jKG9OiL4T4xQN3IUrhUpc1tG+HfDXppkgVcrAiiaI/0=
-github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJlUzl82Yab2kTjx1EyXSQCAfZDhpTo1SQC4k=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -141,7 +147,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

main.go

@@ -7,18 +7,24 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/Mrs4s/go-cqhttp/server"
+	"github.com/guonaihong/gout"
+	"github.com/tidwall/gjson"
 	"io"
 	"io/ioutil"
+	"net/http"
 	"os"
 	"os/signal"
 	"path"
+	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"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"
 	"github.com/lestrrat-go/file-rotatelogs"
 	"github.com/rifflock/lfshook"
 	log "github.com/sirupsen/logrus"
@@ -87,6 +93,16 @@ func init() {
 
 func main() {
 	console := bufio.NewReader(os.Stdin)
+
+	arg := os.Args
+	if len(arg) > 1 && arg[1] == "update" {
+		if len(arg) > 2 {
+			selfUpdate(arg[2])
+		} else {
+			selfUpdate("")
+		}
+	}
+
 	var conf *global.JsonConfig
 	if global.PathExists("config.json") || os.Getenv("UIN") == "" {
 		conf = global.Load("config.json")
@@ -210,8 +226,8 @@ func main() {
 	log.Info("开始尝试登录并同步消息...")
 	log.Infof("使用协议: %v", func() string {
 		switch client.SystemDeviceInfo.Protocol {
-		case client.AndroidPad:
-			return "Android Pad"
+		case client.IPad:
+			return "iPad"
 		case client.AndroidPhone:
 			return "Android Phone"
 		case client.AndroidWatch:
@@ -230,8 +246,21 @@ func main() {
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
-	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
+	if global.PathExists("address.txt") {
+		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
+		addr := global.ReadAddrFile("address.txt")
+		if len(addr) > 0 {
+			cli.SetCustomServer(addr)
+		}
+		log.Infof("读取到 %v 个自定义地址.", len(addr))
+	}
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+		if !conf.UseSSOAddress {
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+			return false
+		}
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+		return true
 	})
 	if conf.WebUi == nil {
 		conf.WebUi = &global.GoCqWebUi{
@@ -245,7 +274,7 @@ func main() {
 		conf.WebUi.WebUiPort = 9999
 	}
 	if conf.WebUi.Host == "" {
-		conf.WebUi.Host = "0.0.0.0"
+		conf.WebUi.Host = "127.0.0.1"
 	}
 	confErr := conf.Save("config.json")
 	if confErr != nil {
@@ -253,6 +282,7 @@ func main() {
 	}
 	b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
 	c := server.Console
+	go checkUpdate()
 	signal.Notify(c, os.Interrupt, os.Kill)
 	<-c
 	b.Release()
@@ -282,3 +312,95 @@ func DecryptPwd(ePwd string, key []byte) string {
 	}
 	return string(tea.Decrypt(encrypted))
 }
+
+func checkUpdate() {
+	log.Infof("正在检查更新.")
+	if coolq.Version == "unknown" {
+		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
+		return
+	}
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
+		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
+		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
+		return
+	}
+	log.Infof("检查更新完成. 当前已运行最新版本.")
+}
+
+func selfUpdate(imageUrl string) {
+	console := bufio.NewReader(os.Stdin)
+	readLine := func() (str string) {
+		str, _ = console.ReadString('\n')
+		return
+	}
+	log.Infof("正在检查更新.")
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	version := info.Get("tag_name").Str
+	if coolq.Version != version {
+		log.Info("当前最新版本为 ", version)
+		log.Warn("是否更新(y/N): ")
+		r := strings.TrimSpace(readLine())
+
+		doUpdate := func() {
+			log.Info("正在更新,请稍等...")
+			url := fmt.Sprintf(
+				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
+				func() string {
+					if imageUrl != "" {
+						return imageUrl
+					}
+					return "https://github.com"
+				}(),
+				version,
+				version,
+				runtime.GOOS,
+				runtime.GOARCH,
+			)
+			if runtime.GOOS == "windows" {
+				url = url + ".exe"
+			}
+			resp, err := http.Get(url)
+			if err != nil {
+				fmt.Println(err)
+				log.Error("更新失败!")
+				return
+			}
+			wc := global.WriteCounter{}
+			err, _ = update.New().FromStream(io.TeeReader(resp.Body, &wc))
+			fmt.Println()
+			if err != nil {
+				log.Error("更新失败!")
+				return
+			}
+			log.Info("更新完成！")
+		}
+
+		if r == "y" || r == "Y" {
+			doUpdate()
+		} else {
+			log.Warn("已取消更新！")
+		}
+	}
+	log.Info("按 Enter 继续....")
+	readLine()
+	os.Exit(0)
+}

server/apiAdmin.go

@@ -183,7 +183,11 @@ func (s *webServer) Dologin() {
 				os.Exit(0)
 				return
 			case client.OtherLoginError, client.UnknownLoginError:
-				log.Warnf("登录失败: %v", rsp.ErrorMessage)
+				msg := rsp.ErrorMessage
+				if strings.Contains(msg, "版本") {
+					msg = "密码错误或账号被冻结"
+				}
+				log.Warnf("登录失败: %v", msg)
 				log.Infof("按 Enter 继续....")
 				readLine()
 				os.Exit(0)
@@ -225,8 +229,7 @@ func (s *webServer) Dologin() {
 					log.Warn("Bot已登录")
 					return
 				}
-				if conf.ReLogin.MaxReloginTimes == 0 {
-				} else if times > conf.ReLogin.MaxReloginTimes {
+				if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
 					break
 				}
 				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
@@ -236,6 +239,7 @@ func (s *webServer) Dologin() {
 				rsp, err := cli.Login()
 				if err != nil {
 					log.Errorf("重连失败: %v", err)
+					cli.Disconnect()
 					continue
 				}
 				if !rsp.Success {
@@ -246,6 +250,7 @@ func (s *webServer) Dologin() {
 						log.Fatalf("重连失败: 设备锁")
 					default:
 						log.Errorf("重连失败: %v", rsp.ErrorMessage)
+						cli.Disconnect()
 						continue
 					}
 				}
@@ -335,8 +340,8 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 	log.Info("开始尝试登录并同步消息...")
 	log.Infof("使用协议: %v", func() string {
 		switch client.SystemDeviceInfo.Protocol {
-		case client.AndroidPad:
-			return "Android Pad"
+		case client.IPad:
+			return "iPad"
 		case client.AndroidPhone:
 			return "Android Phone"
 		case client.AndroidWatch:
@@ -354,8 +359,13 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
-	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+		if !conf.UseSSOAddress {
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+			return false
+		}
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+		return true
 	})
 	s.Cli = cli
 	s.Dologin()
@@ -403,6 +413,7 @@ func (s *webServer) ReloadServer() {
 
 // 热重启
 func AdminDoRestart(s *webServer, c *gin.Context) {
+	s.bot.Release()
 	s.bot = nil
 	s.Cli = nil
 	s.DoReLogin()

server/http.go

@@ -5,6 +5,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
+	"github.com/guonaihong/gout/dataflow"
 	"net/http"
 	"os"
 	"strconv"
@@ -132,7 +133,13 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 		return h
 	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
 		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
-		Do()
+		Func(func(con *dataflow.Context) error {
+			if con.Error != nil {
+				log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
+				return con.Error
+			}
+			return nil
+		}).Do()
 	if err != nil {
 		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
 		return
@@ -154,55 +161,78 @@ func (s *httpServer) HandleActions(c *gin.Context) {
 	}
 }
 
-func (s *httpServer) GetLoginInfo(c *gin.Context) {
+func GetLoginInfo(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetLoginInfo())
 }
 
-func (s *httpServer) GetFriendList(c *gin.Context) {
+func GetFriendList(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetFriendList())
 }
 
-func (s *httpServer) GetGroupList(c *gin.Context) {
+func GetGroupList(s *httpServer, c *gin.Context) {
 	nc := getParamOrDefault(c, "no_cache", "false")
 	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
 }
 
-func (s *httpServer) GetGroupInfo(c *gin.Context) {
+func GetGroupInfo(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetGroupInfo(gid))
 }
 
-func (s *httpServer) GetGroupMemberList(c *gin.Context) {
+func GetGroupMemberList(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	nc := getParamOrDefault(c, "no_cache", "false")
 	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
 }
 
-func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
+func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
 }
 
-func (s *httpServer) SendMessage(c *gin.Context) {
+func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
+}
+
+func GetGroupRootFiles(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
+}
+
+func GetGroupFilesByFolderId(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	folderId := getParam(c, "folder_id")
+	c.JSON(200, s.bot.CQGetGroupFilesByFolderId(gid, folderId))
+}
+
+func GetGroupFileUrl(s *httpServer, c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	fid := getParam(c, "file_id")
+	busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
+	c.JSON(200, s.bot.CQGetGroupFileUrl(gid, fid, int32(busid)))
+}
+
+func SendMessage(s *httpServer, c *gin.Context) {
 	if getParam(c, "message_type") == "private" {
-		s.SendPrivateMessage(c)
+		SendPrivateMessage(s, c)
 		return
 	}
 	if getParam(c, "message_type") == "group" {
-		s.SendGroupMessage(c)
+		SendGroupMessage(s, c)
 		return
 	}
 	if getParam(c, "group_id") != "" {
-		s.SendGroupMessage(c)
+		SendGroupMessage(s, c)
 		return
 	}
 	if getParam(c, "user_id") != "" {
-		s.SendPrivateMessage(c)
+		SendPrivateMessage(s, c)
 	}
 }
 
-func (s *httpServer) SendPrivateMessage(c *gin.Context) {
+func SendPrivateMessage(s *httpServer, c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	msg, t := getParamWithType(c, "message")
 	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
@@ -213,7 +243,7 @@ func (s *httpServer) SendPrivateMessage(c *gin.Context) {
 	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
 }
 
-func (s *httpServer) SendGroupMessage(c *gin.Context) {
+func SendGroupMessage(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	msg, t := getParamWithType(c, "message")
 	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
@@ -224,34 +254,34 @@ func (s *httpServer) SendGroupMessage(c *gin.Context) {
 	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
 }
 
-func (s *httpServer) SendGroupForwardMessage(c *gin.Context) {
+func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	msg := getParam(c, "messages")
 	c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
 }
 
-func (s *httpServer) GetImage(c *gin.Context) {
+func GetImage(s *httpServer, c *gin.Context) {
 	file := getParam(c, "file")
 	c.JSON(200, s.bot.CQGetImage(file))
 }
 
-func (s *httpServer) GetMessage(c *gin.Context) {
+func GetMessage(s *httpServer, c *gin.Context) {
 	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
 	c.JSON(200, s.bot.CQGetMessage(int32(mid)))
 }
 
-func (s *httpServer) GetGroupHonorInfo(c *gin.Context) {
+func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
 }
 
-func (s *httpServer) ProcessFriendRequest(c *gin.Context) {
+func ProcessFriendRequest(s *httpServer, c *gin.Context) {
 	flag := getParam(c, "flag")
 	approve := getParamOrDefault(c, "approve", "true")
 	c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
 }
 
-func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
+func ProcessGroupRequest(s *httpServer, c *gin.Context) {
 	flag := getParam(c, "flag")
 	subType := getParam(c, "sub_type")
 	if subType == "" {
@@ -261,103 +291,103 @@ func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
 	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
 }
 
-func (s *httpServer) SetGroupCard(c *gin.Context) {
+func SetGroupCard(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
 }
 
-func (s *httpServer) SetSpecialTitle(c *gin.Context) {
+func SetSpecialTitle(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
 }
 
-func (s *httpServer) SetGroupKick(c *gin.Context) {
+func SetGroupKick(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	msg := getParam(c, "message")
 	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg))
 }
 
-func (s *httpServer) SetGroupBan(c *gin.Context) {
+func SetGroupBan(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
 }
 
-func (s *httpServer) SetWholeBan(c *gin.Context) {
+func SetWholeBan(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
 }
 
-func (s *httpServer) SetGroupName(c *gin.Context) {
+func SetGroupName(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
 }
 
-func (s *httpServer) SetGroupAdmin(c *gin.Context) {
+func SetGroupAdmin(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
 }
 
-func (s *httpServer) SendGroupNotice(c *gin.Context) {
+func SendGroupNotice(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
 }
 
-func (s *httpServer) SetGroupLeave(c *gin.Context) {
+func SetGroupLeave(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupLeave(gid))
 }
 
-func (s *httpServer) GetForwardMessage(c *gin.Context) {
+func GetForwardMessage(s *httpServer, c *gin.Context) {
 	resId := getParam(c, "message_id")
 	c.JSON(200, s.bot.CQGetForwardMessage(resId))
 }
 
-func (s *httpServer) GetGroupSystemMessage(c *gin.Context) {
+func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetGroupSystemMessages())
 }
 
-func (s *httpServer) DeleteMessage(c *gin.Context) {
+func DeleteMessage(s *httpServer, c *gin.Context) {
 	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
 	c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
 }
 
-func (s *httpServer) CanSendImage(c *gin.Context) {
+func CanSendImage(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQCanSendImage())
 }
 
-func (s *httpServer) CanSendRecord(c *gin.Context) {
+func CanSendRecord(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQCanSendRecord())
 }
 
-func (s *httpServer) GetStatus(c *gin.Context) {
+func GetStatus(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetStatus())
 }
 
-func (s *httpServer) GetVersionInfo(c *gin.Context) {
+func GetVersionInfo(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQGetVersionInfo())
 }
 
-func (s *httpServer) ReloadEventFilter(c *gin.Context) {
+func ReloadEventFilter(s *httpServer, c *gin.Context) {
 	c.JSON(200, s.bot.CQReloadEventFilter())
 }
 
-func (s *httpServer) GetVipInfo(c *gin.Context) {
+func GetVipInfo(s *httpServer, c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetVipInfo(uid))
 }
 
-func (s *httpServer) GetStrangerInfo(c *gin.Context) {
+func GetStrangerInfo(s *httpServer, c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
 }
 
-func (s *httpServer) HandleQuickOperation(c *gin.Context) {
+func HandleQuickOperation(s *httpServer, c *gin.Context) {
 	if c.Request.Method != "POST" {
 		c.AbortWithStatus(404)
 		return
@@ -368,17 +398,17 @@ func (s *httpServer) HandleQuickOperation(c *gin.Context) {
 	}
 }
 
-func (s *httpServer) OcrImage(c *gin.Context) {
+func OcrImage(s *httpServer, c *gin.Context) {
 	img := getParam(c, "image")
 	c.JSON(200, s.bot.CQOcrImage(img))
 }
 
-func (s *httpServer) GetWordSlices(c *gin.Context) {
+func GetWordSlices(s *httpServer, c *gin.Context) {
 	content := getParam(c, "content")
 	c.JSON(200, s.bot.CQGetWordSlices(content))
 }
 
-func (s *httpServer) SetGroupPortrait(c *gin.Context) {
+func SetGroupPortrait(s *httpServer, c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	file := getParam(c, "file")
 	cache := getParam(c, "cache")
@@ -434,120 +464,48 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 }
 
 var httpApi = map[string]func(s *httpServer, c *gin.Context){
-	"get_login_info": func(s *httpServer, c *gin.Context) {
-		s.GetLoginInfo(c)
-	},
-	"get_friend_list": func(s *httpServer, c *gin.Context) {
-		s.GetFriendList(c)
-	},
-	"get_group_list": func(s *httpServer, c *gin.Context) {
-		s.GetGroupList(c)
-	},
-	"get_group_info": func(s *httpServer, c *gin.Context) {
-		s.GetGroupInfo(c)
-	},
-	"get_group_member_list": func(s *httpServer, c *gin.Context) {
-		s.GetGroupMemberList(c)
-	},
-	"get_group_member_info": func(s *httpServer, c *gin.Context) {
-		s.GetGroupMemberInfo(c)
-	},
-	"send_msg": func(s *httpServer, c *gin.Context) {
-		s.SendMessage(c)
-	},
-	"send_group_msg": func(s *httpServer, c *gin.Context) {
-		s.SendGroupMessage(c)
-	},
-	"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
-		s.SendGroupForwardMessage(c)
-	},
-	"send_private_msg": func(s *httpServer, c *gin.Context) {
-		s.SendPrivateMessage(c)
-	},
-	"delete_msg": func(s *httpServer, c *gin.Context) {
-		s.DeleteMessage(c)
-	},
-	"set_friend_add_request": func(s *httpServer, c *gin.Context) {
-		s.ProcessFriendRequest(c)
-	},
-	"set_group_add_request": func(s *httpServer, c *gin.Context) {
-		s.ProcessGroupRequest(c)
-	},
-	"set_group_card": func(s *httpServer, c *gin.Context) {
-		s.SetGroupCard(c)
-	},
-	"set_group_special_title": func(s *httpServer, c *gin.Context) {
-		s.SetSpecialTitle(c)
-	},
-	"set_group_kick": func(s *httpServer, c *gin.Context) {
-		s.SetGroupKick(c)
-	},
-	"set_group_ban": func(s *httpServer, c *gin.Context) {
-		s.SetGroupBan(c)
-	},
-	"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
-		s.SetWholeBan(c)
-	},
-	"set_group_name": func(s *httpServer, c *gin.Context) {
-		s.SetGroupName(c)
-	},
-	"set_group_admin": func(s *httpServer, c *gin.Context) {
-		s.SetGroupAdmin(c)
-	},
-	"_send_group_notice": func(s *httpServer, c *gin.Context) {
-		s.SendGroupNotice(c)
-	},
-	"set_group_leave": func(s *httpServer, c *gin.Context) {
-		s.SetGroupLeave(c)
-	},
-	"get_image": func(s *httpServer, c *gin.Context) {
-		s.GetImage(c)
-	},
-	"get_forward_msg": func(s *httpServer, c *gin.Context) {
-		s.GetForwardMessage(c)
-	},
-	"get_msg": func(s *httpServer, c *gin.Context) {
-		s.GetMessage(c)
-	},
-	"get_group_system_msg": func(s *httpServer, c *gin.Context) {
-		s.GetGroupSystemMessage(c)
-	},
-	"get_group_honor_info": func(s *httpServer, c *gin.Context) {
-		s.GetGroupHonorInfo(c)
-	},
-	"can_send_image": func(s *httpServer, c *gin.Context) {
-		s.CanSendImage(c)
-	},
-	"can_send_record": func(s *httpServer, c *gin.Context) {
-		s.CanSendRecord(c)
-	},
-	"get_status": func(s *httpServer, c *gin.Context) {
-		s.GetStatus(c)
-	},
-	"get_version_info": func(s *httpServer, c *gin.Context) {
-		s.GetVersionInfo(c)
-	},
-	"_get_vip_info": func(s *httpServer, c *gin.Context) {
-		s.GetVipInfo(c)
-	},
-	"get_stranger_info": func(s *httpServer, c *gin.Context) {
-		s.GetStrangerInfo(c)
-	},
-	"reload_event_filter": func(s *httpServer, c *gin.Context) {
-		s.ReloadEventFilter(c)
-	},
-	"set_group_portrait": func(s *httpServer, c *gin.Context) {
-		s.SetGroupPortrait(c)
-	},
-	".handle_quick_operation": func(s *httpServer, c *gin.Context) {
-		s.HandleQuickOperation(c)
-	},
-	".ocr_image": func(s *httpServer, c *gin.Context) {
-		s.OcrImage(c)
-	},
-	".get_word_slices": func(s *httpServer, c *gin.Context) {
-		s.GetWordSlices(c)
-	},
+	"get_login_info":             GetLoginInfo,
+	"get_friend_list":            GetFriendList,
+	"get_group_list":             GetGroupList,
+	"get_group_info":             GetGroupInfo,
+	"get_group_member_list":      GetGroupMemberList,
+	"get_group_member_info":      GetGroupMemberInfo,
+	"get_group_file_system_info": GetGroupFileSystemInfo,
+	"get_group_root_files":       GetGroupRootFiles,
+	"get_group_files_by_folder":  GetGroupFilesByFolderId,
+	"get_group_file_url":         GetGroupFileUrl,
+	"send_msg":                   SendMessage,
+	"send_group_msg":             SendGroupMessage,
+	"send_group_forward_msg":     SendGroupForwardMessage,
+	"send_private_msg":           SendPrivateMessage,
+	"delete_msg":                 DeleteMessage,
+	"set_friend_add_request":     ProcessFriendRequest,
+	"set_group_add_request":      ProcessGroupRequest,
+	"set_group_card":             SetGroupCard,
+	"set_group_special_title":    SetSpecialTitle,
+	"set_group_kick":             SetGroupKick,
+	"set_group_ban":              SetGroupBan,
+	"set_group_whole_ban":        SetWholeBan,
+	"set_group_name":             SetGroupName,
+	"set_group_admin":            SetGroupAdmin,
+	"_send_group_notice":         SendGroupNotice,
+	"set_group_leave":            SetGroupLeave,
+	"get_image":                  GetImage,
+	"get_forward_msg":            GetForwardMessage,
+	"get_msg":                    GetMessage,
+	"get_group_system_msg":       GetGroupSystemMessage,
+	"get_group_honor_info":       GetGroupHonorInfo,
+	"can_send_image":             CanSendImage,
+	"can_send_record":            CanSendRecord,
+	"get_status":                 GetStatus,
+	"get_version_info":           GetVersionInfo,
+	"_get_vip_info":              GetVipInfo,
+	"get_stranger_info":          GetStrangerInfo,
+	"reload_event_filter":        ReloadEventFilter,
+	"set_group_portrait":         SetGroupPortrait,
+	".handle_quick_operation":    HandleQuickOperation,
+	".ocr_image":                 OcrImage,
+	".get_word_slices":           GetWordSlices,
 }
 
 func (s *httpServer) ShutDown() {

server/websocket.go

@@ -498,6 +498,18 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_group_system_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupSystemMessages()
 	},
+	"get_group_file_system_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
+	},
+	"get_group_root_files": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
+	},
+	"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupFilesByFolderId(p.Get("group_id").Int(), p.Get("folder_id").Str)
+	},
+	"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupFileUrl(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
+	},
 	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetVipInfo(p.Get("user_id").Int())
 	},