|
|
@ -13,7 +13,6 @@ import (
|
|
|
|
"context"
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
"github.com/golang/protobuf/proto"
|
|
|
|
|
|
|
|
"math/rand"
|
|
|
|
"math/rand"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
"time"
|
|
|
@ -167,18 +166,18 @@ func onboardingProcessNotification(operationID, userID, groupID string) {
|
|
|
|
defer func() {
|
|
|
|
defer func() {
|
|
|
|
log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupID)
|
|
|
|
log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupID)
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
var tips commonPb.TipsComm
|
|
|
|
//var tips commonPb.TipsComm
|
|
|
|
tips.DefaultTips = config.Config.Notification.JoinDepartmentNotification.DefaultTips.Tips
|
|
|
|
//tips.DefaultTips = config.Config.Notification.JoinDepartmentNotification.DefaultTips.Tips
|
|
|
|
tips.JsonDetail = ""
|
|
|
|
//tips.JsonDetail = ""
|
|
|
|
content, err := proto.Marshal(&tips)
|
|
|
|
//content, err := proto.Marshal(&tips)
|
|
|
|
if err != nil {
|
|
|
|
//if err != nil {
|
|
|
|
log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), "proto marshal failed")
|
|
|
|
// log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), "proto marshal failed")
|
|
|
|
return
|
|
|
|
// return
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
notification := &msg.NotificationMsg{
|
|
|
|
notification := &msg.NotificationMsg{
|
|
|
|
SendID: userID,
|
|
|
|
SendID: userID,
|
|
|
|
RecvID: groupID,
|
|
|
|
RecvID: groupID,
|
|
|
|
Content: content,
|
|
|
|
Content: []byte("大家来欢迎我加入部门"),
|
|
|
|
MsgFrom: constant.UserMsgType,
|
|
|
|
MsgFrom: constant.UserMsgType,
|
|
|
|
ContentType: constant.Text,
|
|
|
|
ContentType: constant.Text,
|
|
|
|
SessionType: constant.GroupChatType,
|
|
|
|
SessionType: constant.GroupChatType,
|
|
|
|