liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改冲突

Browse Source
This commit is contained in:
邹宗楠
2022-08-05 09:39:35 +08:00
parent 7176f00b9d
commit 5984d5a475
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event.go
View File

@@ -471,7 +471,7 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er
db = dao.GetDB() db = dao.GetDB()
) )
messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID) messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID)
messageGroupMembers3, err := dao.GetMessageGroupMembers(db, 0, 0, userID) //messageGroupMembers3, err := dao.GetMessageGroupMembers(db, 0, 0, userID)
messageGroupsResult, err := dao.GetMessageGroups(db, userID, groupID, model.GroupTypeMulit, false, "") messageGroupsResult, err := dao.GetMessageGroups(db, userID, groupID, model.GroupTypeMulit, false, "")
messageGroupsResult2, err := dao.GetMessageGroups(db, "", groupID, model.GroupTypeMulit, false, "") messageGroupsResult2, err := dao.GetMessageGroups(db, "", groupID, model.GroupTypeMulit, false, "")
//messageGroupsResult3, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeMulit, false, "") //messageGroupsResult3, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeMulit, false, "")

3
business/jxstore/event/event_tcp_utils.go
View File

@@ -385,9 +385,6 @@ func buildMsg(printMsg *model.PrintMsg) (data []byte, err error) {
x1, x2 := int2h8l8(lenData / 2) x1, x2 := int2h8l8(lenData / 2)
dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData
check := getCheckSum(dataStr) check := getCheckSum(dataStr)
// 测试
printMsg.Comment = dataStr + check
dao.UpdateEntity(dao.GetDB(), printMsg, "Comment")
return jxutils.Hextob(dataStr + check), err return jxutils.Hextob(dataStr + check), err
} }