Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

pkg/common/config/config.go

@@ -282,7 +282,7 @@ type config struct {
 		CallbackAfterSendSingleMsg         callBackConfig `yaml:"callbackAfterSendSingleMsg"`
 		CallbackBeforeSendGroupMsg         callBackConfig `yaml:"callbackBeforeSendGroupMsg"`
 		CallbackAfterSendGroupMsg          callBackConfig `yaml:"callbackAfterSendGroupMsg"`
-		CallbackWordFilter                 callBackConfig `yaml:"callbackWordFilter"`
+		CallbackMsgModify                  callBackConfig `yaml:"callbackMsgModify"`
 		CallbackUserOnline                 callBackConfig `yaml:"callbackUserOnline"`
 		CallbackUserOffline                callBackConfig `yaml:"callbackUserOffline"`
 		CallbackUserKickOff                callBackConfig `yaml:"callbackUserKickOff"`
@@ -290,6 +290,7 @@ type config struct {
 		CallbackOnlinePush                 callBackConfig `yaml:"callbackOnlinePush"`
 		CallbackBeforeSuperGroupOnlinePush callBackConfig `yaml:"callbackSuperGroupOnlinePush"`
 		CallbackBeforeAddFriend            callBackConfig `yaml:"callbackBeforeAddFriend"`
+		CallbackBeforeCreateGroup          callBackConfig `yaml:"callbackBeforeCreateGroup"`
 	} `yaml:"callback"`
 	Notification struct {
 		///////////////////////group/////////////////////////////

pkg/common/constant/constant.go

@@ -200,7 +200,7 @@ const (
 	CallbackAfterSendSingleMsgCommand   = "callbackAfterSendSingleMsgCommand"
 	CallbackBeforeSendGroupMsgCommand   = "callbackBeforeSendGroupMsgCommand"
 	CallbackAfterSendGroupMsgCommand    = "callbackAfterSendGroupMsgCommand"
-	CallbackWordFilterCommand           = "callbackWordFilterCommand"
+	CallbackMsgModifyCommand            = "callbackMsgModifyCommand"
 	CallbackUserOnlineCommand           = "callbackUserOnlineCommand"
 	CallbackUserOfflineCommand          = "callbackUserOfflineCommand"
 	CallbackUserKickOffCommand          = "callbackUserKickOffCommand"
@@ -208,6 +208,7 @@ const (
 	CallbackOnlinePushCommand           = "callbackOnlinePushCommand"
 	CallbackSuperGroupOnlinePushCommand = "callbackSuperGroupOnlinePushCommand"
 	CallbackBeforeAddFriendCommand      = "callbackBeforeAddFriendCommand"
+	CallbackBeforeCreateGroupCommand    = "callbackBeforeCreateGroup"
 
 	//callback actionCode
 	ActionAllow     = 0

pkg/common/db/mongoModel.go

@@ -370,6 +370,9 @@ func (d *DataBases) GetMsgBySeqListMongo2(uid string, seqList []uint32, operatio
 			}
 		}
 	}
+	if len(hasSeqList) == 0 {
+		return nil, errors.New("pull message is null")
+	}
 	if len(hasSeqList) != len(seqList) {
 		var diff []uint32
 		diff = utils.Difference(hasSeqList, seqList)

pkg/common/http/http_client.go

@@ -11,6 +11,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	urlLib "net/url"
 	"time"
 )
 
@@ -34,6 +35,7 @@ func Post(url string, data interface{}, timeOutSecond int) (content []byte, err
 	if err != nil {
 		return nil, err
 	}
+
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
 	if err != nil {
 		return nil, err
@@ -54,7 +56,10 @@ func Post(url string, data interface{}, timeOutSecond int) (content []byte, err
 	return result, nil
 }
 
-func PostReturn(url string, input, output interface{}, timeOut int) error {
+func CallBackPostReturn(url, callbackCommand string, input, output interface{}, timeOut int) error {
+	v := urlLib.Values{}
+	v.Set("callbackCommand", callbackCommand)
+	url = url + "?" + v.Encode()
 	b, err := Post(url, input, timeOut)
 	if err != nil {
 		return err