Merge branch 'dev-lwl/firenze'

api/adapter/firenzeapi/api.go

@@ -12,8 +12,13 @@ import (
 	"time"
 )
 
-var sendBizMsgUrl = "https://wsdebug.tiefen.fun/send_biz_msg"
+var (
+	sendBizMsgUrl       = "https://wsdebug.tiefen.fun/send_biz_msg"
+	batchSendBizMsgUrl  = "https://wsdebug.tiefen.fun/batch_send_biz_msg"
+	sendBroadcastMsgUrl = "https://wsdebug.tiefen.fun/send_broadcast_msg"
+)
 
+// 给指定mid发消息
 func SendBizMsg(param *firenzeproto.SendBizMsgParam) (*base.BaseResponse, error) {
 	defer logger.Recover()
 
@@ -50,7 +55,8 @@ func SendBizMsg(param *firenzeproto.SendBizMsgParam) (*base.BaseResponse, error)
 	return res, nil
 }
 
-func SendBroadcastMsg(param *firenzeproto.SendBroadcastMsgParam) (*base.BaseResponse, error) {
+// 给批量mid发消息
+func BatchSendBizMsg(param *firenzeproto.BatchSendBizMsgParam) (*base.BaseResponse, error) {
 	defer logger.Recover()
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*2000)
@@ -62,7 +68,44 @@ func SendBroadcastMsg(param *firenzeproto.SendBroadcastMsgParam) (*base.BaseResp
 		return nil, err
 	}
 
-	req, err := http.NewRequestWithContext(ctx, "POST", sendBizMsgUrl, bytes.NewBuffer(jsonStr))
+	req, err := http.NewRequestWithContext(ctx, "POST", batchSendBizMsgUrl, bytes.NewBuffer(jsonStr))
+	if err != nil {
+		logger.Error("NewRequest error %v", err)
+		return nil, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		logger.Error("failed to add case, err : %v", err)
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	res := new(base.BaseResponse)
+	bs, _ := ioutil.ReadAll(resp.Body)
+	err = json.Unmarshal(bs, &res)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+// 给所有用户广播消息
+func SendBroadcastMsg(param *firenzeproto.SendBroadcastMsgParam) (*base.BaseResponse, error) {
+	defer logger.Recover()
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*2000)
+	defer cancel()
+
+	jsonStr, err := json.Marshal(param)
+	if err != nil {
+		logger.Error("build data error: %v", err)
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", sendBroadcastMsgUrl, bytes.NewBuffer(jsonStr))
 	if err != nil {
 		logger.Error("NewRequest error %v", err)
 		return nil, err

api/proto/firenze/websocket.go

@@ -13,3 +13,10 @@ type SendBizMsgParam struct {
 type SendBroadcastMsgParam struct {
 	Msg json.RawMessage `json:"msg"`
 }
+
+// 多mid消息
+type BatchSendBizMsgParam struct {
+	Sids []string        `json:"sids"`
+	Mids []int64         `json:"mids"`
+	Msg  json.RawMessage `json:"msg"`
+}