From cc53b3131a9134f901da78151d6a4dad9bfe89a6 Mon Sep 17 00:00:00 2001 From: cdle <50124752+cdle@users.noreply.github.com> Date: Fri, 20 Aug 2021 05:56:10 +0800 Subject: [PATCH 1/7] Update user.go --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index aff3474..ebd0cdf 100644 --- a/models/user.go +++ b/models/user.go @@ -55,7 +55,7 @@ func NewActiveUser(class string, uid int, msgs ...interface{}) { } else { if zero.Unix() > u.ActiveAt.Unix() { first = true - db.Updates(map[string]interface{}{ + db.Model(&u).Updates(map[string]interface{}{ "active_at": ntime, "coin": gorm.Expr("coin+1"), }) From 996d377a6a4180826921bf111255dd034ea4cf14 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 07:53:41 +0800 Subject: [PATCH 2/7] x --- models/bot.go | 4 +++- models/user.go | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/models/bot.go b/models/bot.go index d02341d..e76720a 100644 --- a/models/bot.go +++ b/models/bot.go @@ -100,13 +100,15 @@ var handleMessage = func(msgs ...interface{}) interface{} { if len(msgs) == 4 { gid = msgs[3].(int) } - go NewActiveUser(tp, uid, msgs...) + switch msg { case "status", "状态": if !isAdmin(msgs...) { return "你没有权限操作" } return Count() + case "打卡", "sign": + NewActiveUser(tp, uid, msgs...) case "许愿币": return fmt.Sprintf("余额%d", GetCoin(uid)) case "qrcode", "扫码", "二维码", "scan": diff --git a/models/user.go b/models/user.go index aff3474..fe2eb6b 100644 --- a/models/user.go +++ b/models/user.go @@ -60,11 +60,14 @@ func NewActiveUser(class string, uid int, msgs ...interface{}) { "coin": gorm.Expr("coin+1"), }) u.Coin++ + } else { + msg += fmt.Sprintf("你打过卡了，许愿币余额%d。", u.Coin) + sendMessagee(msg, msgs...) } } if first { db.Model(User{}).Select("count(id) as total").Where("active_at > ?", zero).Pluck("total", &total) - msg += fmt.Sprintf("你是今天第%d个发言的用户，奖励%d个许愿币，许愿币余额%d。", total[0]+1, 1, u.Coin) + msg += fmt.Sprintf("你是打卡第%d人，奖励%d个许愿币，许愿币余额%d。", total[0]+1, 1, u.Coin) // fmt.Println(msg) sendMessagee(msg, msgs...) } From fac136ed387368ddf63df5bdc7e9ad5498c40a45 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 07:57:24 +0800 Subject: [PATCH 3/7] x --- models/bot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/bot.go b/models/bot.go index e76720a..9fab9ca 100644 --- a/models/bot.go +++ b/models/bot.go @@ -107,7 +107,7 @@ var handleMessage = func(msgs ...interface{}) interface{} { return "你没有权限操作" } return Count() - case "打卡", "sign": + case "打卡", "签到", "sign": NewActiveUser(tp, uid, msgs...) case "许愿币": return fmt.Sprintf("余额%d", GetCoin(uid)) From f178bfb630af6397c5d42b6d98ecbe5a877d0377 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 08:01:04 +0800 Subject: [PATCH 4/7] x --- models/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/version.go b/models/version.go index 6587f1b..0410b45 100644 --- a/models/version.go +++ b/models/version.go @@ -11,7 +11,7 @@ import ( "github.com/beego/beego/v2/core/logs" ) -var version = "2021081905" +var version = "2021082005" var AppName = "xdd" var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1] From b34cf2b78553e814fd0053bb157f165dbba97543 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 08:52:41 +0800 Subject: [PATCH 5/7] x --- models/bot.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/models/bot.go b/models/bot.go index 9fab9ca..b74fe49 100644 --- a/models/bot.go +++ b/models/bot.go @@ -102,6 +102,12 @@ var handleMessage = func(msgs ...interface{}) interface{} { } switch msg { + case "取消屏蔽": + if !isAdmin(msgs...) { + return "你没有权限操作" + } + db.Model(JdCookie{}).Update(Hack, False) + return "操作成功" case "status", "状态": if !isAdmin(msgs...) { return "你没有权限操作" From 6799b1d5e46c865507dfffabea7d9669ebaceff3 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 08:56:31 +0800 Subject: [PATCH 6/7] x --- models/bot.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/bot.go b/models/bot.go index b74fe49..5d58fb9 100644 --- a/models/bot.go +++ b/models/bot.go @@ -106,8 +106,8 @@ var handleMessage = func(msgs ...interface{}) interface{} { if !isAdmin(msgs...) { return "你没有权限操作" } - db.Model(JdCookie{}).Update(Hack, False) - return "操作成功" + + return fmt.Sprintf("操作成功，更新%d条记录", db.Model(JdCookie{}).Update(Hack, False).RowsAffected) case "status", "状态": if !isAdmin(msgs...) { return "你没有权限操作" From 9172e504fdc17abfff89c366b8aaa93496024c77 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Fri, 20 Aug 2021 09:15:03 +0800 Subject: [PATCH 7/7] x --- models/available.go | 1 + models/bot.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/models/available.go b/models/available.go index 382ac39..7639341 100644 --- a/models/available.go +++ b/models/available.go @@ -161,6 +161,7 @@ func CookieOK(ck *JdCookie) bool { if ui.Msg == "not login" { if ck.Available == True { ck.Push(fmt.Sprintf("失效账号，%s", ck.PtPin)) + JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname)) } return false } diff --git a/models/bot.go b/models/bot.go index 5d58fb9..c65e2c6 100644 --- a/models/bot.go +++ b/models/bot.go @@ -106,7 +106,6 @@ var handleMessage = func(msgs ...interface{}) interface{} { if !isAdmin(msgs...) { return "你没有权限操作" } - return fmt.Sprintf("操作成功，更新%d条记录", db.Model(JdCookie{}).Update(Hack, False).RowsAffected) case "status", "状态": if !isAdmin(msgs...) {