解决多容器缓存问题

This commit is contained in:
ZJY 2021-09-05 07:32:46 +08:00
parent 4ca2b1ed38
commit 8e62bd6986
5 changed files with 54 additions and 42 deletions

View File

@ -89,6 +89,10 @@ 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 strings.Contains(rsp, "错误") {
logs.Error("wskey错误")
} else {
if len(ss1) > 0 {
for _, s := range ss1 {
ck := JdCookie{
@ -136,6 +140,8 @@ var handleMessage = func(msgs ...interface{}) interface{} {
return nil
}
}
}
}
{ //tyt
ss := regexp.MustCompile(`packetId=(\S+)(&|&)currentActId`).FindStringSubmatch(msg)

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 {

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

View File

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

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 错误