Merge branch 'main' of https://git.1024tool.vip/xl/mini-chat
This commit is contained in:
commit
0a3f3d3cdc
@ -132,14 +132,14 @@ func (h *handler) LatestMessageByAppId() core.HandlerFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 自动标记该appid下的所有消息为已读(管理端访问时)
|
// 自动标记该appid下的所有消息为已读(管理端访问时)
|
||||||
_, err := h.writeDB.AppMessageLog.WithContext(ctx.RequestContext()).
|
//_, err := h.writeDB.AppMessageLog.WithContext(ctx.RequestContext()).
|
||||||
Where(h.writeDB.AppMessageLog.AppID.Eq(req.AppID)).
|
// Where(h.writeDB.AppMessageLog.AppID.Eq(req.AppID)).
|
||||||
Where(h.writeDB.AppMessageLog.IsRead.Eq(0)).
|
// Where(h.writeDB.AppMessageLog.IsRead.Eq(0)).
|
||||||
Update(h.writeDB.AppMessageLog.IsRead, 1)
|
// Update(h.writeDB.AppMessageLog.IsRead, 1)
|
||||||
if err != nil {
|
//if err != nil {
|
||||||
// 记录错误但不影响查询结果
|
// // 记录错误但不影响查询结果
|
||||||
// TODO: 可以添加日志记录
|
// // TODO: 可以添加日志记录
|
||||||
}
|
//}
|
||||||
|
|
||||||
res.Page = req.Page
|
res.Page = req.Page
|
||||||
res.PageSize = req.PageSize
|
res.PageSize = req.PageSize
|
||||||
|
|||||||
@ -110,6 +110,15 @@ func (h *handler) AppMessagePageList() core.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_, err = h.writeDB.AppMessageLog.WithContext(ctx.RequestContext()).
|
||||||
|
Where(h.writeDB.AppMessageLog.AppID.Eq(req.AppID)).
|
||||||
|
Where(h.writeDB.AppMessageLog.SenderID.Eq(req.UserID)).Or(h.readDB.AppMessageLog.ReceiverID.Eq(req.UserID)).
|
||||||
|
Where(h.writeDB.AppMessageLog.IsRead.Eq(0)).
|
||||||
|
Update(h.writeDB.AppMessageLog.IsRead, 1)
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Error(fmt.Sprintf("[AppMessagePageList] update app message log error: %s", err.Error()))
|
||||||
|
}
|
||||||
|
|
||||||
res.Page = req.Page
|
res.Page = req.Page
|
||||||
res.PageSize = req.PageSize
|
res.PageSize = req.PageSize
|
||||||
res.Total = count
|
res.Total = count
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user