diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index f2b7fe11f..0b1d0aada 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -289,16 +289,16 @@ type OANotificationElem struct { Url string `mapstructure:"url"` MixType int32 `mapstructure:"mixType"` Image struct { - SourceUrl string `mapstructure:"sourceUrl"` - SnapshotUrl string `mapstructure:"snapshotUrl"` + SourceUrl string `mapstructure:"sourceURL"` + SnapshotUrl string `mapstructure:"snapshotURL"` } `mapstructure:"image"` Video struct { - SourceUrl string `mapstructure:"sourceUrl"` - SnapshotUrl string `mapstructure:"snapshotUrl"` + SourceUrl string `mapstructure:"sourceURL"` + SnapshotUrl string `mapstructure:"snapshotURL"` Duration int64 `mapstructure:"duration"` } `mapstructure:"video"` File struct { - SourceUrl string `mapstructure:"sourceUrl"` + SourceUrl string `mapstructure:"sourceURL"` FileName string `mapstructure:"fileName"` FileSize int64 `mapstructure:"fileSize"` } `mapstructure:"file"` diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index e96475773..a6bcb1a97 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -103,7 +103,7 @@ func (s *officeServer) GetUserTags(_ context.Context, req *pbOffice.GetUserTagsR func (s *officeServer) CreateTag(_ context.Context, req *pbOffice.CreateTagReq) (resp *pbOffice.CreateTagResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "CreateTag req", req.String()) - userIDList := utils.RemoveUserIDRepByMap(req.UserIDList) + userIDList := utils.RemoveRepeatedStringInList(req.UserIDList) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "userIDList: ", userIDList) resp = &pbOffice.CreateTagResp{CommonResp: &pbOffice.CommonResp{}} if err := db.DB.CreateTag(req.UserID, req.TagName, userIDList); err != nil { @@ -132,8 +132,8 @@ func (s *officeServer) DeleteTag(_ context.Context, req *pbOffice.DeleteTagReq) func (s *officeServer) SetTag(_ context.Context, req *pbOffice.SetTagReq) (resp *pbOffice.SetTagResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbOffice.SetTagResp{CommonResp: &pbOffice.CommonResp{}} - IncreaseUserIDList := utils.RemoveUserIDRepByMap(req.IncreaseUserIDList) - reduceUserIDList := utils.RemoveUserIDRepByMap(req.ReduceUserIDList) + IncreaseUserIDList := utils.RemoveRepeatedStringInList(req.IncreaseUserIDList) + reduceUserIDList := utils.RemoveRepeatedStringInList(req.ReduceUserIDList) if err := db.DB.SetTag(req.UserID, req.TagID, req.NewName, IncreaseUserIDList, reduceUserIDList); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "SetTag failed", err.Error()) resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg @@ -171,7 +171,7 @@ func (s *officeServer) SendMsg2Tag(_ context.Context, req *pbOffice.SendMsg2TagR userIDList = append(userIDList, tagUserIDList...) userIDList = append(userIDList, groupUserIDList...) userIDList = append(userIDList, req.UserList...) - userIDList = utils.RemoveUserIDRepByMap(userIDList) + userIDList = utils.RemoveRepeatedStringInList(userIDList) for i, userID := range userIDList { if userID == req.SendID || userID == "" { userIDList = append(userIDList[:i], userIDList[i+1:]...) diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index bcc05a295..55324d0f1 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -491,7 +491,7 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s } } tag.UserList = append(tag.UserList, increaseUserIDList...) - tag.UserList = utils.RemoveUserIDRepByMap(tag.UserList) + tag.UserList = utils.RemoveRepeatedStringInList(tag.UserList) for _, v := range reduceUserIDList { for i2, v2 := range tag.UserList { if v == v2 { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index f0e34aa90..d23b1633a 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -77,7 +77,7 @@ func OperationIDGenerator() string { return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10) } -func RemoveUserIDRepByMap(slc []string) []string { +func RemoveRepeatedStringInList(slc []string) []string { var result []string tempMap := map[string]byte{} for _, e := range slc {