瀏覽代碼

add multi login

zhangbiao 5 年之前
父節點
當前提交
e4a7944148
共有 4 個文件被更改,包括 9 次插入6 次删除
  1. 3 0
      ChangeLog.md
  2. 1 1
      go.mod
  3. 2 2
      go.sum
  4. 3 3
      gtoken/gtoken.go

+ 3 - 0
ChangeLog.md

@@ -1,5 +1,8 @@
 Change Log 更新说明
 ------------------------------
+## 2019-12-20 v1.3.9
+1. gf升级为V1.10.1,适配时间格式兼容性修改
+
 ## 2019-12-17 v1.3.8
 1. 加入多端登录支持,可配置剔除登录用户还是同时登录
 

+ 1 - 1
go.mod

@@ -1,7 +1,7 @@
 module github.com/goflyfox/gtoken
 
 require (
-	github.com/gogf/gf v1.10.0
+	github.com/gogf/gf v1.10.1
 	google.golang.org/appengine v1.6.5 // indirect
 )
 

+ 2 - 2
go.sum

@@ -10,8 +10,8 @@ github.com/gf-third/mysql v1.4.2 h1:f1M5CNFUG3WkE07UOomtu4o0n/KJKeuUUf5Nc9ZFXs4=
 github.com/gf-third/mysql v1.4.2/go.mod h1:+dd90V663ppI2fV5uQ6+rHk0u8KCyU6FkG8Um8Cx3ms=
 github.com/gf-third/yaml v1.0.1 h1:pqD4ix+65DqGphU1MDnToPZfGYk0tuuwRzuTSl3g0d0=
 github.com/gf-third/yaml v1.0.1/go.mod h1:t443vj0txEw3+E0MOtkr83kt+PrZg2I8SRuYfn85NM0=
-github.com/gogf/gf v1.10.0 h1:O6QwrdlQ06Nq/mp3EMwGckPA6xnWg2L+k5u+mYCiges=
-github.com/gogf/gf v1.10.0/go.mod h1:/37gncPmuM06D4YSqiDze9GsasDtF2QnWkUfKeiGW/Q=
+github.com/gogf/gf v1.10.1 h1:mu1VWviGm8ucgFNODQnw8ourgvgNBBovbLFbot/70BY=
+github.com/gogf/gf v1.10.1/go.mod h1:/37gncPmuM06D4YSqiDze9GsasDtF2QnWkUfKeiGW/Q=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=

+ 3 - 3
gtoken/gtoken.go

@@ -313,7 +313,7 @@ func (m *GfToken) genToken(userKey string, data interface{}) Resp {
 		"uuid":        token.GetString("uuid"),
 		"data":        data,
 		"createTime":  gtime.Now().Millisecond(),
-		"refreshTime": gtime.Now().Millisecond() + gconv.Int64(m.MaxRefresh),
+		"refreshTime": gtime.Now().Millisecond() + m.MaxRefresh,
 	}
 
 	cacheResp := m.setCache(cacheKey, userCache)
@@ -365,9 +365,9 @@ func (m *GfToken) getToken(userKey string) Resp {
 	refreshTime := userCache["refreshTime"]
 
 	// 需要进行缓存超时时间刷新
-	if gconv.Int64(refreshTime) == 0 || nowTime > gconv.Int64(refreshTime) {
+	if gconv.Int64(refreshTime) == 0 || nowTime > gconv.Int(refreshTime) {
 		userCache["createTime"] = gtime.Now().Millisecond()
-		userCache["refreshTime"] = gtime.Now().Millisecond() + gconv.Int64(m.MaxRefresh)
+		userCache["refreshTime"] = gtime.Now().Millisecond() + m.MaxRefresh
 		glog.Debug("[GToken]refreshToken:" + gconv.String(userCache))
 		return m.setCache(cacheKey, userCache)
 	}