From f2470231e5ee2ec7517202474721aa98550397fd Mon Sep 17 00:00:00 2001 From: U188 <54225629+U188@users.noreply.github.com> Date: Sat, 4 Sep 2021 18:37:06 +0800 Subject: [PATCH 01/11] Update command.go --- models/command.go | 69 +++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 41 deletions(-) diff --git a/models/command.go b/models/command.go index 12cbfe7..55abe7f 100644 --- a/models/command.go +++ b/models/command.go @@ -77,8 +77,8 @@ func (sender *Sender) handleJdCookies(handle func(ck *JdCookie)) error { } } if !ok { - sender.Reply("你尚未绑定🐶东账号，请对我说扫码，扫码后即可查询账户资产信息。") - return errors.New("你尚未绑定🐶东账号，请对我说扫码，扫码后即可查询账户资产信息。") + sender.Reply("你尚未绑定🐶东账号，请提交wskey，提交后即可查询账户资产信息。") + return errors.New("你尚未绑定🐶东账号，请提交wskey，提交后即可查询账户资产信息。") } } else { cks = LimitJdCookie(cks, a) @@ -132,7 +132,7 @@ var codeSignals = []CodeSignal{ if zero.Unix() > u.ActiveAt.Unix() { first = true } else { - return fmt.Sprintf("你打过卡了，许愿币余额%d。", u.Coin) + return fmt.Sprintf("你打过卡了，东币余额%d。", u.Coin) } } if first { @@ -149,7 +149,7 @@ var codeSignals = []CodeSignal{ "coin": gorm.Expr(fmt.Sprintf("coin+%d", coin)), }) u.Coin += coin - sender.Reply(fmt.Sprintf("你是打卡第%d人，奖励%d个许愿币，许愿币余额%d。", total[0]+1, coin, u.Coin)) + sender.Reply(fmt.Sprintf("你是打卡第%d人，奖励%d个东币，东币余额%d。", total[0]+1, coin, u.Coin)) ReturnCoin(sender) return "" } @@ -157,25 +157,12 @@ var codeSignals = []CodeSignal{ }, }, { - Command: []string{"coin", "许愿币", "余额", "yu", "yue"}, + Command: []string{"coin", "东币", "余额", "yu", "yue"}, Handle: func(sender *Sender) interface{} { - return fmt.Sprintf("余额%d", GetCoin(sender.UserID)) - }, - }, - { - Command: []string{"qrcode", "扫码", "二维码", "scan"}, - Handle: func(sender *Sender) interface{} { - url := fmt.Sprintf("http://127.0.0.1:%d/api/login/qrcode.png?tp=%s&uid=%d&gid=%d", web.BConfig.Listen.HTTPPort, sender.Type, sender.UserID, sender.ChatID) - if sender.Type == "tgg" { - url += fmt.Sprintf("&mid=%v&unm=%v", sender.MessageID, sender.Username) - } - rsp, err := httplib.Get(url).Response() - if err != nil { - return nil - } - return rsp + return fmt.Sprintf("东币余额%d", GetCoin(sender.UserID)) }, }, + { Command: []string{"升级", "更新", "update", "upgrade"}, Admin: true, @@ -183,7 +170,7 @@ var codeSignals = []CodeSignal{ if err := Update(sender); err != nil { return err.Error() } - sender.Reply("小滴滴重启程序") + sender.Reply("重启程序") Daemon() return nil }, @@ -192,7 +179,7 @@ var codeSignals = []CodeSignal{ Command: []string{"重启", "reload", "restart", "reboot"}, Admin: true, Handle: func(sender *Sender) interface{} { - sender.Reply("小滴滴重启程序") + sender.Reply("重启程序") Daemon() return nil }, @@ -202,11 +189,11 @@ var codeSignals = []CodeSignal{ Handle: func(sender *Sender) interface{} { if !sender.IsAdmin { coin := GetCoin(sender.UserID) - if coin < 0 { - return "许愿币不足以查看UserAgent。" + if coin < 10 { + return "东币不足以查看UserAgent。" } - sender.Reply("查看一次扣1个许愿币。") - RemCoin(sender.UserID, 1) + sender.Reply("查看一次扣10个东币。") + RemCoin(sender.UserID, 10) } return ua }, @@ -262,7 +249,7 @@ var codeSignals = []CodeSignal{ }, }, { - Command: []string{"翻翻乐"}, + Command: []string{"赌一把"}, Handle: func(sender *Sender) interface{} { cost := Int(sender.JoinContens()) if cost <= 0 || cost > 10000 { @@ -270,7 +257,7 @@ var codeSignals = []CodeSignal{ } u := &User{} if err := db.Where("number = ?", sender.UserID).First(u).Error; err != nil || u.Coin < cost { - return "许愿币不足，先去打卡吧。" + return "东币不足，先去打卡吧。" } baga := 0 if u.Coin > 100000 { @@ -279,18 +266,18 @@ var codeSignals = []CodeSignal{ } r := time.Now().Nanosecond() % 10 if r < 5 || baga > 0 { - sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚许愿币。", cost)) + sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚东币。", cost)) cost = -cost } else { if r == 9 { cost *= 2 - sender.Reply(fmt.Sprintf("恭喜你幸运暴击获得%d枚许愿币，20秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("恭喜你幸运暴击获得%d枚东币，20秒后自动转入余额。", cost)) time.Sleep(time.Second * 20) } else { - sender.Reply(fmt.Sprintf("很幸运你获得%d枚许愿币，10秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("很幸运你获得%d枚东币，10秒后自动转入余额。", cost)) time.Sleep(time.Second * 10) } - sender.Reply(fmt.Sprintf("%d枚许愿币已到账。", cost)) + sender.Reply(fmt.Sprintf("%d枚东币已到账。", cost)) } db.Model(u).Update("coin", gorm.Expr(fmt.Sprintf("coin + %d", cost))) return nil @@ -336,7 +323,7 @@ var codeSignals = []CodeSignal{ u := &User{} if err := tx.Where("number = ?", sender.UserID).First(u).Error; err != nil { tx.Rollback() - return "许愿币不足，先去打卡吧。" + return "东币不足，先去打卡吧。" } w := &Wish{ Content: ct, @@ -345,7 +332,7 @@ var codeSignals = []CodeSignal{ } if u.Coin < cost { tx.Rollback() - return fmt.Sprintf("许愿币不足，需要%d个许愿币。", cost) + return fmt.Sprintf("东币不足，需要%d个东币。", cost) } if err := tx.Create(w).Error; err != nil { tx.Rollback() @@ -357,7 +344,7 @@ var codeSignals = []CodeSignal{ } tx.Commit() (&JdCookie{}).Push(fmt.Sprintf("有人许愿%s，愿望id为%d。", w.Content, w.ID)) - return fmt.Sprintf("收到愿望，已扣除%d个许愿币。", cost) + return fmt.Sprintf("收到愿望，已扣除%d个东币。", cost) }, }, { @@ -523,7 +510,7 @@ var codeSignals = []CodeSignal{ ).RowsAffected == 0 { return "先去打卡吧你。" } - return "许愿币+1" + return "东币+1" }, }, { @@ -606,7 +593,7 @@ var codeSignals = []CodeSignal{ db.Model(User{}).Where("number = ?", sender.UserID).Updates(map[string]interface{}{ "coin": gorm.Expr(fmt.Sprintf("coin - %d", cost)), }) - return fmt.Sprintf("转账成功，扣除手续费%d枚许愿币。", cost) + return fmt.Sprintf("转账成功，扣除手续费%d枚东币。", cost) } if amount > 10000 { return "单笔转账限额10000。" @@ -625,7 +612,7 @@ var codeSignals = []CodeSignal{ if !sender.IsAdmin { if amount <= cost { tx.Rollback() - return fmt.Sprintf("转账失败，手续费需要%d个许愿币。", cost) + return fmt.Sprintf("转账失败，手续费需要%d个东币。", cost) } real = amount - cost } else { @@ -707,15 +694,15 @@ func ReturnCoin(sender *Sender) { "coin", gorm.Expr(fmt.Sprintf("coin + %d", w.Coin)), ).RowsAffected == 0 { tx.Rollback() - sender.Reply("愿望未达成退还许愿币失败。") + sender.Reply("愿望未达成退还东币失败。") return } - sender.Reply(fmt.Sprintf("愿望未达成退还%d枚许愿币。", w.Coin)) + sender.Reply(fmt.Sprintf("愿望未达成退还%d枚东币。", w.Coin)) if tx.Model(&w).Update( "status", 1, ).RowsAffected == 0 { tx.Rollback() - sender.Reply("愿望未达成退还许愿币失败。") + sender.Reply("愿望未达成退还东币失败。") return } } From 0d049a2940b29389473a80ccd46547d3ef916db7 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sat, 4 Sep 2021 21:47:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/available.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/available.go b/models/available.go index df1cc1a..445eec4 100644 --- a/models/available.go +++ b/models/available.go @@ -168,6 +168,7 @@ func CookieOK(ck *JdCookie) bool { //临时使用别人代码 JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname)) + logs.Info(ck.WsKey) var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey) msg1 := cmd(fmt.Sprintf(`wskey="%s" python3 wspt.py`, pinky), &Sender{}) JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1)) From f81086c094aa1f34245f59e05f15afc68aa03401 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sat, 4 Sep 2021 22:47:26 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/available.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/available.go b/models/available.go index 445eec4..59750d0 100644 --- a/models/available.go +++ b/models/available.go @@ -137,7 +137,7 @@ func initCookie() { } func CookieOK(ck *JdCookie) bool { - // fmt.Println(ck.PtPin) + fmt.Println(ck.WsKey) cookie := "pt_key=" + ck.PtKey + ";pt_pin=" + ck.PtPin + ";" // fmt.Println(cookie) // jdzz(cookie, make(chan int64)) @@ -169,6 +169,7 @@ func CookieOK(ck *JdCookie) bool { //临时使用别人代码 JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname)) logs.Info(ck.WsKey) + logs.Info("进入失效账号") var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey) msg1 := cmd(fmt.Sprintf(`wskey="%s" python3 wspt.py`, pinky), &Sender{}) JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1)) From 088706cd3649e25c240937b3e0337512bd047f36 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sat, 4 Sep 2021 22:49:47 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=E3=80=82=E3=80=82=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/available.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/available.go b/models/available.go index 59750d0..7c94130 100644 --- a/models/available.go +++ b/models/available.go @@ -171,7 +171,7 @@ func CookieOK(ck *JdCookie) bool { logs.Info(ck.WsKey) logs.Info("进入失效账号") var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey) - msg1 := cmd(fmt.Sprintf(`wskey="%s" python3 wspt.py`, pinky), &Sender{}) + msg1 := cmd(fmt.Sprintf(`python3 test.py "%s"`, pinky), &Sender{}) JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1)) ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(msg1, -1) if len(ss) > 0 { From 24ec4b3731eff22f78f81505a46793bf7e5cb316 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sat, 4 Sep 2021 22:51:05 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/available.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/models/available.go b/models/available.go index 7c94130..3b1e55c 100644 --- a/models/available.go +++ b/models/available.go @@ -137,7 +137,6 @@ func initCookie() { } func CookieOK(ck *JdCookie) bool { - fmt.Println(ck.WsKey) cookie := "pt_key=" + ck.PtKey + ";pt_pin=" + ck.PtPin + ";" // fmt.Println(cookie) // jdzz(cookie, make(chan int64)) @@ -168,8 +167,6 @@ func CookieOK(ck *JdCookie) bool { //临时使用别人代码 JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname)) - logs.Info(ck.WsKey) - logs.Info("进入失效账号") var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey) msg1 := cmd(fmt.Sprintf(`python3 test.py "%s"`, pinky), &Sender{}) JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1)) From 4ca2b1ed387fc111a137cd6dea24fab9ac830796 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sat, 4 Sep 2021 22:51:46 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/version.go b/models/version.go index 72bbda7..875fb21 100644 --- a/models/version.go +++ b/models/version.go @@ -11,8 +11,8 @@ import ( "github.com/beego/beego/v2/core/logs" ) -var version = "20210903" -var describe = "维护更新" +var version = "20210904" +var describe = "BUG维护" var AppName = "xdd" var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1] From 8e62bd6986acd6d2c7d2702fd7aa49d06a5d54a6 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sun, 5 Sep 2021 07:32:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/bot.go | 82 ++++++++++++++++++++++++--------------------- models/container.go | 3 +- models/db.go | 5 +-- models/toekn.go | 1 + readme.txt | 5 ++- 5 files changed, 54 insertions(+), 42 deletions(-) diff --git a/models/bot.go b/models/bot.go index d576edb..6fb2492 100644 --- a/models/bot.go +++ b/models/bot.go @@ -89,52 +89,58 @@ var handleMessage = func(msgs ...interface{}) interface{} { rsp := cmd(fmt.Sprintf(`python3 test.py "%s"`, msg), &Sender{}) logs.Info(rsp) ss1 := regexp.MustCompile(`pin=([^;=\s]+);wskey=([^;=\s]+)`).FindAllStringSubmatch(msg, -1) - if len(ss1) > 0 { - for _, s := range ss1 { - ck := JdCookie{ - PtPin: s[1], - PtKey: rsp, - WsKey: s[2], - } + if strings.Contains(rsp, "错误") { + logs.Error("wskey错误") + } else { - ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(rsp, -1) - for _, s1 := range ss { - ck.PtPin = s1[2] - ck.PtKey = s1[1] - } + if len(ss1) > 0 { + for _, s := range ss1 { + ck := JdCookie{ + PtPin: s[1], + PtKey: rsp, + WsKey: s[2], + } - if sender.IsQQ() { - ck.QQ = sender.UserID - } else if sender.IsTG() { - ck.Telegram = sender.UserID - } - if nck, err := GetJdCookie(ck.PtPin); err == nil { - nck.InPool(ck.PtKey) - if nck.WsKey == "" || len(nck.WsKey) == 0 { - nck.Updates(JdCookie{ - WsKey: ck.WsKey, - }) - msg := fmt.Sprintf("写入WsKey，并更新账号%s", ck.PtPin) - (&JdCookie{}).Push(msg) - logs.Info(msg) + ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(rsp, -1) + for _, s1 := range ss { + ck.PtPin = s1[2] + ck.PtKey = s1[1] + } + + if sender.IsQQ() { + ck.QQ = sender.UserID + } else if sender.IsTG() { + ck.Telegram = sender.UserID + } + if nck, err := GetJdCookie(ck.PtPin); err == nil { + nck.InPool(ck.PtKey) + if nck.WsKey == "" || len(nck.WsKey) == 0 { + nck.Updates(JdCookie{ + WsKey: ck.WsKey, + }) + msg := fmt.Sprintf("写入WsKey，并更新账号%s", ck.PtPin) + (&JdCookie{}).Push(msg) + logs.Info(msg) + } else { + msg := fmt.Sprintf("重复写入") + (&JdCookie{}).Push(msg) + logs.Info(msg) + } } else { - msg := fmt.Sprintf("重复写入") - (&JdCookie{}).Push(msg) + NewJdCookie(&ck) + msg := fmt.Sprintf("添加账号，%s", ck.PtPin) + sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID))) logs.Info(msg) } - } else { - NewJdCookie(&ck) - msg := fmt.Sprintf("添加账号，%s", ck.PtPin) - sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID))) - logs.Info(msg) - } + } + go func() { + Save <- &JdCookie{} + }() + return nil } - go func() { - Save <- &JdCookie{} - }() - return nil } + } } { //tyt diff --git a/models/container.go b/models/container.go index 01a8eb3..a084f12 100644 --- a/models/container.go +++ b/models/container.go @@ -355,7 +355,7 @@ func (c *Container) getToken() error { version, err := GetQlVersion(c.Address) logs.Debug(err) if version == "2.9" { - token, err := getSqlToken() + token, err := getSqlToken(c.Address) if err != nil { logs.Error(err) } @@ -414,6 +414,7 @@ func getT(c *Container, token *Token) (error, bool) { token.Token, _ = jsonparser.GetString(data, "data", "token") zero, _ := time.ParseInLocation("2006-01-02", time.Now().Local().Format("2006-01-02"), time.Local) token.Expiration = zero + token.Address = c.Address setSqlToken(token) logs.Info(c.Token + token.Expiration.String()) } else { diff --git a/models/db.go b/models/db.go index 4f2976b..420f839 100644 --- a/models/db.go +++ b/models/db.go @@ -130,6 +130,7 @@ var UnAvailable = "UnAvailable" var PtKey = "PtKey" var PtPin = "PtPin" var WsKey = "WsKey" +var Address = "Address" var Priority = "Priority" var Nickname = "Nickname" var BeanNum = "BeanNum" @@ -297,7 +298,7 @@ func setSqlToken(token *Token) error { return tx.Commit().Error } -func getSqlToken() (*Token, error) { +func getSqlToken(address string) (*Token, error) { token := &Token{} - return token, db.Order("expiration desc").First(token).Error + return token, db.Where(Address+" = ?", address).Order("expiration desc").First(token).Error } diff --git a/models/toekn.go b/models/toekn.go index 76895d3..d2e0878 100644 --- a/models/toekn.go +++ b/models/toekn.go @@ -7,4 +7,5 @@ import ( type Token struct { Expiration time.Time Token string + Address string } diff --git a/readme.txt b/readme.txt index d481d20..5f6958b 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,10 @@ secret: admin 在青龙里面系统设置，添加应用后配置 3.发送wskey即可自动添加账号 - 4.账号过期自动换key 暂未好 + 4.账号过期自动换key 更新修复完成 5.定时十二小时自动换key 暂未好 6.缓存token 7.批量绑定wskey + 8.多容器 token缓存过期问题修复 暂未 + 9.wskey更新检测，以及覆盖写入 + 10.解决%!(EXTRA 错误 From 14218cdb60de7131acf5db2465871e7a4be9ca29 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sun, 5 Sep 2021 08:29:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9ECK?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/bot.go | 2 +- models/db.go | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/models/bot.go b/models/bot.go index 6fb2492..8fb0b4c 100644 --- a/models/bot.go +++ b/models/bot.go @@ -127,7 +127,7 @@ var handleMessage = func(msgs ...interface{}) interface{} { logs.Info(msg) } } else { - NewJdCookie(&ck) + UpdateCookie(&ck) msg := fmt.Sprintf("添加账号，%s", ck.PtPin) sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID))) logs.Info(msg) diff --git a/models/db.go b/models/db.go index 420f839..8012b5d 100644 --- a/models/db.go +++ b/models/db.go @@ -273,6 +273,31 @@ func NewJdCookie(ck *JdCookie) error { return tx.Commit().Error } +func UpdateCookie(ck *JdCookie) error { + if ck.Hack == "" { + ck.Hack = False + } + ck.Priority = Config.DefaultPriority + date := Date() + ck.CreateAt = date + tx := db.Begin() + if err := tx.Updates(ck).Error; err != nil { + tx.Rollback() + return err + } + go test2(fmt.Sprintf("pt_key=%s;pt_pin=%s;", ck.PtKey, ck.PtPin)) + if err := tx.Create(&JdCookiePool{ + PtPin: ck.PtPin, + PtKey: ck.PtKey, + WsKey: ck.WsKey, + CreateAt: date, + }).Error; err != nil { + tx.Rollback() + return err + } + return tx.Commit().Error +} + func CheckIn(pin, key string) int { if !HasPin(pin) { NewJdCookie(&JdCookie{ From f75847f4f34eef5f42128ea15e44c13570a110f9 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sun, 5 Sep 2021 08:59:06 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9ECK?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/version.go b/models/version.go index 875fb21..47d7ec9 100644 --- a/models/version.go +++ b/models/version.go @@ -11,7 +11,7 @@ import ( "github.com/beego/beego/v2/core/logs" ) -var version = "20210904" +var version = "20210905" var describe = "BUG维护" var AppName = "xdd" var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1] From 5bf26fdfa5df866bad77c56ea044dfb949c28094 Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sun, 5 Sep 2021 09:38:19 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9ECK?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/bot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/bot.go b/models/bot.go index 8fb0b4c..6fb2492 100644 --- a/models/bot.go +++ b/models/bot.go @@ -127,7 +127,7 @@ var handleMessage = func(msgs ...interface{}) interface{} { logs.Info(msg) } } else { - UpdateCookie(&ck) + NewJdCookie(&ck) msg := fmt.Sprintf("添加账号，%s", ck.PtPin) sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID))) logs.Info(msg) From 65ce5e04d8d90340a5c2a27f3a82e4af19db9c5c Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Sun, 5 Sep 2021 09:49:56 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=89=AB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/command.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/models/command.go b/models/command.go index 12cbfe7..2cff4fc 100644 --- a/models/command.go +++ b/models/command.go @@ -7,8 +7,6 @@ import ( "strings" "time" - "github.com/beego/beego/v2/client/httplib" - "github.com/beego/beego/v2/server/web" "gorm.io/gorm" ) @@ -77,8 +75,8 @@ func (sender *Sender) handleJdCookies(handle func(ck *JdCookie)) error { } } if !ok { - sender.Reply("你尚未绑定🐶东账号，请对我说扫码，扫码后即可查询账户资产信息。") - return errors.New("你尚未绑定🐶东账号，请对我说扫码，扫码后即可查询账户资产信息。") + sender.Reply("你尚未绑定🐶东账号，请联系管理也绑定，绑定后即可查询账户资产信息。") + return errors.New("你尚未绑定🐶东账号，请联系管理也绑定，绑定后即可查询账户资产信息。") } } else { cks = LimitJdCookie(cks, a) @@ -165,15 +163,8 @@ var codeSignals = []CodeSignal{ { Command: []string{"qrcode", "扫码", "二维码", "scan"}, Handle: func(sender *Sender) interface{} { - url := fmt.Sprintf("http://127.0.0.1:%d/api/login/qrcode.png?tp=%s&uid=%d&gid=%d", web.BConfig.Listen.HTTPPort, sender.Type, sender.UserID, sender.ChatID) - if sender.Type == "tgg" { - url += fmt.Sprintf("&mid=%v&unm=%v", sender.MessageID, sender.Username) - } - rsp, err := httplib.Get(url).Response() - if err != nil { - return nil - } - return rsp + sender.Reply("已屏蔽，联系管理员登录，或者发送ck/wskey登录") + return errors.New("已屏蔽，联系管理员登录，或者发送ck/wskey登录") }, }, {