update gf v2.4.4

goflyfox · Jun 28, 2023 · 4d826c7 · 4d826c7
1 parent 99794e4
commit 4d826c7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,8 @@
 Change Log 更新说明
 ------------------------------
+## 2022-06-23 v1.5.9
+1. 升级到gf v2.4.4
+
 ## 2022-06-23 v1.5.8
 1. 升级到gf v2.3.3
 

diff --git a/example/sample1/test/api.http b/example/sample1/test/api.http
@@ -1,4 +1,4 @@
-GET http://localhost/system/user
+GET http://localhost:8082/system/user
 
 ### 登陆
 GET http://localhost:8082/login?username=a&passwd=2
@@ -14,4 +14,6 @@ client.test("test",function() {
 %}
 
 ### 登出
-GET http://localhost:8082/user/logout?token={{token}}
+GET http://localhost:8082/user/logout?token={{token}}
+
+###
diff --git a/go.mod b/go.mod
@@ -1,5 +1,5 @@
 module github.com/goflyfox/gtoken
 
-require github.com/gogf/gf/v2 v2.3.3
+require github.com/gogf/gf/v2 v2.4.4
 
 go 1.13
diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/gogf/gf/v2 v2.3.3 h1:3iry6kybjvuryTtjypG9oUuxrQ0URMT7j0DVg7FFnaw=
-github.com/gogf/gf/v2 v2.3.3/go.mod h1:tsbmtwcAl2chcYoq/fP9W2FZf06aw4i89X34nbSHo9Y=
+github.com/gogf/gf/v2 v2.4.4 h1:+s7PKxd4LJKjJn5ODZvYcbXMM5e+88Ww1W3GdOarLE8=
+github.com/gogf/gf/v2 v2.4.4/go.mod h1:tsbmtwcAl2chcYoq/fP9W2FZf06aw4i89X34nbSHo9Y=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=

diff --git a/gtoken/gtoken.go b/gtoken/gtoken.go
@@ -269,7 +269,7 @@ func (m *GfToken) validToken(ctx context.Context, token string) Resp {
 	}
 
 	if uuid != userCacheResp.GetString(KeyUuid) {
-		g.Log().Error(ctx, msgLog(MsgErrAuthUuid)+", decryptToken:"+decryptToken.Json()+" cacheValue:"+gconv.String(userCacheResp.Data))
+		g.Log().Debug(ctx, msgLog(MsgErrAuthUuid)+", decryptToken:"+decryptToken.Json()+" cacheValue:"+gconv.String(userCacheResp.Data))
 		return Unauthorized(MsgErrAuthUuid, "")
 	}
 
@@ -551,7 +551,6 @@ func (m *GfToken) String() string {
 		"CacheKey":         m.CacheKey,
 		"Timeout":          m.Timeout,
 		"TokenDelimiter":   m.TokenDelimiter,
-		"EncryptKey":       string(m.EncryptKey),
 		"AuthFailMsg":      m.AuthFailMsg,
 		"MultiLogin":       m.MultiLogin,
 		"MiddlewareType":   m.MiddlewareType,