Compare commits

..

4 Commits

Author SHA1 Message Date
junleea 8e5ecc98ce 删除debug输出 2024-11-30 11:19:16 +08:00
junleea 8d0617c74e Merge branch 'refs/heads/master' into release 2024-11-30 11:16:16 +08:00
junleea 27ba32888d Merge branch 'refs/heads/feat-tool' 2024-11-30 11:15:54 +08:00
junleea a730599641 修复监控的设备时间未修改导致每天都发送邮件通知 2024-11-30 11:15:43 +08:00
3 changed files with 3 additions and 3 deletions

View File

@ -117,6 +117,6 @@ func FindCIDByTime() []CID {
// FindCIDByID 查找持续集成、部署
func FindCIDByCID(id uint) CID {
var cid CID
DB.Debug().Where("id = ? ", id).First(&cid)
DB.Where("id = ? ", id).First(&cid)
return cid
}

View File

@ -296,7 +296,7 @@ func FindGroupUsers(group_id int) []GroupUser {
}
func FindGroupUsersInfo(group_id int) []FriendRet {
var groupUsers []FriendRet
DB.Debug().Raw("select distinct users.id, users.name, users.email from users join group_users on users.id = group_users.user_id where group_users.group_id = ? and group_users.deleted_at is null", group_id).Scan(&groupUsers)
DB.Raw("select distinct users.id, users.name, users.email from users join group_users on users.id = group_users.user_id where group_users.group_id = ? and group_users.deleted_at is null", group_id).Scan(&groupUsers)
return groupUsers
}

View File

@ -60,7 +60,7 @@ func SetDeviceStatusV2(c *gin.Context) {
for _, v := range devices {
if v == req.ID {
// 继续处理请求
worker.SetRedisWithExpire(req.ID, "1", time.Second*300)
worker.SetRedisWithExpire("monitor_"+req.ID, "1", time.Second*300)
c.JSON(200, gin.H{"code": 0, "message": "success"})
return
}