diff --git a/models/bot.go b/models/bot.go index de7ed72..642bcec 100644 --- a/models/bot.go +++ b/models/bot.go @@ -110,16 +110,23 @@ var handleMessage = func(msgs ...interface{}) interface{} { ck1.Telegram = sender.UserID } if nck, err := GetJdCookie(ck1.PtPin); err == nil { - if nck.WsKey == "" || len(nck.WsKey) == 0 { - nck.InPoolWskey(ck1.WsKey) - msg := fmt.Sprintf("写入WsKey,%s", ck1.PtPin) - (&JdCookie{}).Push(msg) - logs.Info(msg) + if len(nck.PtPin) == 0 { + if nck.WsKey == "" || len(nck.WsKey) == 0 { + nck.Updates(JdCookie{ + WsKey: ck1.WsKey, + }) + msg := fmt.Sprintf("写入WsKey,%s", ck1.PtPin) + (&JdCookie{}).Push(msg) + logs.Info(msg) + } else { + msg := fmt.Sprintf("重复写入") + (&JdCookie{}).Push(msg) + logs.Info(msg) + } } else { - msg := fmt.Sprintf("重复写入") - (&JdCookie{}).Push(msg) - logs.Info(msg) + } + } } diff --git a/models/db.go b/models/db.go index 1e9040f..a74dba2 100644 --- a/models/db.go +++ b/models/db.go @@ -2,7 +2,6 @@ package models import ( "fmt" - "github.com/beego/beego/v2/adapter/logs" "strings" "time" @@ -195,33 +194,6 @@ func (ck *JdCookie) Update(column string, value interface{}) { } } -func (ck *JdCookie) InPoolWskey(ws_key string) error { - if ck.ID != 0 { - date := Date() - tx := db.Begin() - jp := &JdCookiePool{} - logs.Info(ck.PtPin) - logs.Info(ws_key) - if tx.Where(fmt.Sprintf("%s = '%s'", PtPin, ck.PtPin)).First(jp).Error == nil { - return tx.Rollback().Error - } - if err := tx.Create(&JdCookiePool{ - PtPin: ck.PtPin, - WsKey: ck.WsKey, - CreateAt: date, - }).Error; err != nil { - tx.Rollback() - return err - } - tx.Model(ck).Updates(map[string]interface{}{ - Available: True, - WsKey: ws_key, - }) - return tx.Commit().Error - } - return nil -} - func (ck *JdCookie) InPool(pt_key string) error { if ck.ID != 0 { date := Date()