jd/xdd-plus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into patch-1

Browse Source
This commit is contained in:
764763903a 2021-09-06 15:56:18 +08:00 committed by GitHub
commit 32ad015c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
models/available.go
View File

@ -137,7 +137,6 @@ func initCookie() {
}
func CookieOK(ck *JdCookie) bool {
// fmt.Println(ck.PtPin)
cookie := "pt_key=" + ck.PtKey + ";pt_pin=" + ck.PtPin + ";"
// fmt.Println(cookie)
// jdzz(cookie, make(chan int64))
@ -169,7 +168,7 @@ func CookieOK(ck *JdCookie) bool {
//临时使用别人代码
JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname))
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 {

82
models/bot.go
View File

@ -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

2
models/command.go
View File

@ -7,8 +7,6 @@ import (
"strings"
"time"
"github.com/beego/beego/v2/client/httplib"
"github.com/beego/beego/v2/server/web"
"gorm.io/gorm"
)

3
models/container.go
View File

@ -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 {

30
models/db.go
View File

@ -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"
@ -272,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{
@ -297,7 +323,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
}

1
models/toekn.go
View File

@ -7,4 +7,5 @@ import (
type Token struct {
Expiration time.Time
Token string
Address string
}

4
models/version.go
View File

@ -11,8 +11,8 @@ import (
"github.com/beego/beego/v2/core/logs"
)
var version = "20210903"
var describe = "维护更新"
var version = "20210905"
var describe = "BUG维护"
var AppName = "xdd"
var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1]

5
readme.txt
View File

@ -5,7 +5,10 @@
secret: admin
在青龙里面系统设置，添加应用后配置
3.发送wskey即可自动添加账号
4.账号过期自动换key 暂未好
4.账号过期自动换key 更新修复完成
5.定时十二小时自动换key 暂未好
6.缓存token
7.批量绑定wskey
8.多容器 token缓存过期问题修复 暂未
9.wskey更新检测，以及覆盖写入
10.解决%!(EXTRA 错误