bugs

controllers/auth.go

@@ -49,5 +49,11 @@ func (c *BaseController) SetTokenExipre(uid string) {
 
 // CreateNewToken 新 token
 func (c *BaseController) CreateNewToken() {
-	c.Context.Set("token", c.serv.NewToken())
+
+	batchNo := ""
+	if c.Context.Get("token-batch") != nil {
+		batchNo = c.Context.Get("token-batch").(string)
+	}
+
+	c.Context.Set("token", c.serv.NewToken(batchNo))
 }

controllers/user/user.go

@@ -9,6 +9,8 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
+
+	"github.com/yl10/kit/guid"
 )
 
 // UserController 用户
@@ -185,6 +187,7 @@ func (c *UserController) SignIn() {
 
 	// 成功之后, 设置用户
 	c.Context.Set("user", *user)
+	c.Context.Set("token-batch", guid.NewGUIDString())
 
 	if token == "" && doRemember != 0 {
 		var err error

models/model/sys_token_log.go

@@ -8,4 +8,6 @@ type SysTokenLog struct {
 	Uid        string    `xorm:"VARCHAR(64)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
+	ExpireDate time.Time `xorm:"DATETIME"`
+	BatchNo    string    `xorm:"VARCHAR(64)"`
 }

models/sys.go

@@ -3,6 +3,7 @@ package models
 import (
 	"errors"
 	"spaceofcheng/services/models/model"
+	"strings"
 	"time"
 
 	"github.com/yl10/kit/guid"
@@ -136,10 +137,12 @@ func GetWeChatConfig(org, cliType string) (*model.SysWechatConf, error) {
 }
 
 // InsertToken 插入 token 生成记录
-func InsertToken(token, uid string) error {
+func InsertToken(token, uid, batchNo string, expire time.Time) error {
 	tk := model.SysTokenLog{
 		Token:      token,
 		Uid:        uid,
+		BatchNo:    batchNo,
+		ExpireDate: expire,
 		Status:     STATUS_NORMAL,
 		CreateDate: time.Now().Local(),
 	}
@@ -157,6 +160,35 @@ func UpdateTokenExpire(token, uid string) error {
 		Status: STATUS_DEL,
 	}
 
+	// 检索相同批次
+	var tkLogs []model.SysTokenLog
+	if err := DBEngine.Where("token=?", token).Find(&tkLogs); err != nil {
+		return err
+	}
+
+	// 如果有相同批次的, 则更新本批次为失效
+	if tkLogs != nil && len(tkLogs) > 0 {
+		batchNo := []string{}
+
+		for _, t := range tkLogs {
+			if t.BatchNo != "" {
+				batchNo = append(batchNo, t.BatchNo)
+			}
+		}
+
+		if len(batchNo) > 0 {
+
+			if _, err := DBEngine.Cols("status").
+				Where("token=?", token).
+				Or("batch_no in ('" + strings.Join(batchNo, "','") + "'").
+				Update(&tk); err != nil {
+				return err
+			}
+
+			return nil
+		}
+	}
+
 	if _, err := DBEngine.Cols("status").Where("token=?", token).Or("uid=?", uid).Update(&tk); err != nil {
 		return err
 	}

service/sys.go

@@ -76,7 +76,7 @@ func (s *SysServ) AuthAndInitCtx(gctx *context.Context) map[string]interface{} {
 
 // NewToken 设置 TOKEN
 // 15 分钟后过期
-func (s *SysServ) NewToken() string {
+func (s *SysServ) NewToken(batch string) string {
 	var token *utils.JWTToken
 	exp := time.Now().Local().Add(15 * time.Second)
 
@@ -84,17 +84,19 @@ func (s *SysServ) NewToken() string {
 		userMap := s.ctx.Get("userMap").(model.TaUserMapping)
 
 		token = &utils.JWTToken{
-			Guest:  false,
-			ID:     userMap.Openid,
-			Expire: exp,
+			Guest:   false,
+			ID:      userMap.Openid,
+			Expire:  exp,
+			BatchNo: batch,
 		}
 	} else if s.ctx.Get("user") != nil {
 		user := s.ctx.Get("user").(model.SysUser)
 
 		token = &utils.JWTToken{
-			Guest:  false,
-			ID:     user.UserId,
-			Expire: exp,
+			Guest:   false,
+			ID:      user.UserId,
+			Expire:  exp,
+			BatchNo: batch,
 		}
 	} else {
 		token = &utils.JWTToken{
@@ -111,7 +113,7 @@ func (s *SysServ) NewToken() string {
 
 	// 入库
 	if !token.Guest {
-		if err := models.InsertToken(tokenEncodeStr, token.ID); err != nil {
+		if err := models.InsertToken(tokenEncodeStr, token.ID, batch, exp); err != nil {
 			utils.LogError("入库 Token 失败: " + err.Error())
 			return tokenEncodeStr
 		}
@@ -384,6 +386,7 @@ func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
 		return nil, errors.New("超时 或者 Token 已过期")
 	}
 
+	s.ctx.Set("token-batch", tk.BatchNo)
 	return utils.MapToJWTToken(token), nil
 }
 

utils/jwt.go

@@ -44,6 +44,7 @@ type JWTToken struct {
 	Guest    bool
 	ID       string
 	Password string
+	BatchNo  string
 	Expire   time.Time
 }
 
@@ -53,6 +54,7 @@ func (t *JWTToken) ToMap() map[string]interface{} {
 		"guest":    t.Guest,
 		"user":     t.ID,
 		"password": t.Password,
+		"batchno":  t.BatchNo,
 		"exp":      t.Expire.Format("2006-01-02 15:04:05"),
 	}
 }
@@ -73,6 +75,10 @@ func MapToJWTToken(data map[string]interface{}) *JWTToken {
 		token.Password = data["password"].(string)
 	}
 
+	if data["batchno"] != nil {
+		token.BatchNo = data["batchno"].(string)
+	}
+
 	if data["exp"] != nil {
 		exp, _ := time.Parse("2006-01-02 15:04:05", data["exp"].(string))
 		token.Expire = exp