update gf v1.16.4 and update test

ChangeLog.md

@@ -1,7 +1,8 @@
 Change Log 更新说明
 ------------------------------
-## 2021-07-05
-1. 完善测试用例，加入获取userdata测试用例
+## 2021-07-05 v1.4.2
+1. gf升级为v1.16.4
+2. 完善测试用例，加入获取userdata测试用例
 
 ## 2020-11-30 v1.4.1
 1. Group Middleware加入登出放行逻辑；

example/sample/test/api_admin_test.go

@@ -14,13 +14,13 @@ const (
 
 var (
 	TokenAdmin    = g.MapStrStr{}
-	AdminUsername = "flyfox"
+	AdminUsername = "adminFlyFox"
 )
 
 func TestAdminSystemUser(t *testing.T) {
 	// 未登录
 	t.Log("1. not login and visit user")
-	if r, e := ghttp.Post(TestAdminURL+"/system/user", "username="+AdminUsername); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/system/user", "username="+AdminUsername); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -64,12 +64,13 @@ func TestAdminSystemUser(t *testing.T) {
 	} else {
 		t.Log(data.Json())
 	}
+	delete(TokenAdmin, AdminUsername)
 }
 
 func TestAdminUserLoginFail(t *testing.T) {
 	// 登录失败
 	t.Log("1. login fail ")
-	if r, e := ghttp.Post(TestAdminURL+"/login", "username=&passwd="); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/login", "username=&passwd="); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -92,7 +93,7 @@ func TestAdminUserLoginFail(t *testing.T) {
 func TestAdminExclude(t *testing.T) {
 	// 未登录可以访问
 	t.Log("1. exclude user info")
-	if r, e := ghttp.Post(TestAdminURL+"/system/user/info", "username="+AdminUsername); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/system/user/info", "username="+AdminUsername); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -110,7 +111,7 @@ func TestAdminExclude(t *testing.T) {
 		}
 	}
 
-	if r, e := ghttp.Post(TestAdminURL+"/user/info", "username="+AdminUsername); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/user/info", "username="+AdminUsername); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -131,7 +132,6 @@ func TestAdminExclude(t *testing.T) {
 }
 
 func TestAdminLogin(t *testing.T) {
-	AdminUsername = "testLogin"
 	t.Log(" login first ")
 	token1 := getAdminToken(t)
 	t.Log("token:" + token1)
@@ -141,11 +141,10 @@ func TestAdminLogin(t *testing.T) {
 	if token1 != token2 {
 		t.Error("error:", "token not same ")
 	}
-	AdminUsername = "flyfox"
+	delete(TokenAdmin, AdminUsername)
 }
 
 func TestAdminLogout(t *testing.T) {
-	AdminUsername = "testLogout"
 	t.Log(" logout test ")
 	data := PostAdmin(t, "/user/logout", "username="+AdminUsername)
 	if data.Success() {
@@ -153,14 +152,13 @@ func TestAdminLogout(t *testing.T) {
 	} else {
 		t.Error("error:", data.Json())
 	}
-	AdminUsername = "flyfox"
+	delete(TokenAdmin, AdminUsername)
 }
 
 func TestAdminMultiLogin(t *testing.T) {
-	AdminUsername = "testLogin"
 	t.Log(" TestMultiLogin start... ")
 	var token1, token2 string
-	if r, e := ghttp.Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -182,7 +180,7 @@ func TestAdminMultiLogin(t *testing.T) {
 	}
 	t.Log("token1:" + token1)
 
-	if r, e := ghttp.Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -214,8 +212,7 @@ func TestAdminMultiLogin(t *testing.T) {
 			t.Error("error:", "token same ")
 		}
 	}
-
-	AdminUsername = "flyfox"
+	delete(TokenAdmin, AdminUsername)
 }
 
 func PostAdmin(t *testing.T, urlPath string, data ...interface{}) gtoken.Resp {
@@ -235,7 +232,7 @@ func getAdminToken(t *testing.T) string {
 		return TokenAdmin[AdminUsername]
 	}
 
-	if r, e := ghttp.Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestAdminURL+"/login", "username="+AdminUsername+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()

example/sample/test/api_test.go

@@ -14,12 +14,12 @@ const (
 
 var (
 	Token    = g.MapStrStr{}
-	Username = "flyfox"
+	Username = "flyFox"
 )
 
 func TestHello(t *testing.T) {
 	t.Log("visit hello and no auth")
-	if r, e := ghttp.Post(TestURL+"/hello", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/hello", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -41,7 +41,7 @@ func TestHello(t *testing.T) {
 func TestSystemUser(t *testing.T) {
 	// 未登录
 	t.Log("1. not login and visit user")
-	if r, e := ghttp.Post(TestURL+"/system/user", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/system/user", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -94,12 +94,13 @@ func TestSystemUser(t *testing.T) {
 	} else {
 		t.Log(data.Json())
 	}
+	delete(Token, Username)
 }
 
 func TestUserLoginFail(t *testing.T) {
 	// 登录失败
 	t.Log("1. login fail ")
-	if r, e := ghttp.Post(TestURL+"/login", "username=&passwd="); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username=&passwd="); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -122,7 +123,7 @@ func TestUserLoginFail(t *testing.T) {
 func TestExclude(t *testing.T) {
 	// 未登录可以访问
 	t.Log("1. exclude user info")
-	if r, e := ghttp.Post(TestURL+"/system/user/info", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/system/user/info", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -140,7 +141,7 @@ func TestExclude(t *testing.T) {
 		}
 	}
 
-	if r, e := ghttp.Post(TestURL+"/user/info", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/user/info", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -185,7 +186,6 @@ func TestExclude(t *testing.T) {
 //}
 
 func TestLogin(t *testing.T) {
-	Username = "testLogin"
 	t.Log(" login first ")
 	token1 := getToken(t)
 	t.Log("token:" + token1)
@@ -195,11 +195,10 @@ func TestLogin(t *testing.T) {
 	if token1 != token2 {
 		t.Error("error:", "token not same ")
 	}
-	Username = "flyfox"
+	delete(Token, Username)
 }
 
 func TestLogout(t *testing.T) {
-	Username = "testLogout"
 	t.Log(" logout test ")
 	data := Post(t, "/user/logout", "username="+Username)
 	if data.Success() {
@@ -207,14 +206,13 @@ func TestLogout(t *testing.T) {
 	} else {
 		t.Error("error:", data.Json())
 	}
-	Username = "flyfox"
+	delete(Token, Username)
 }
 
 func TestMultiLogin(t *testing.T) {
-	Username = "testLogin"
 	t.Log(" TestMultiLogin start... ")
 	var token1, token2 string
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -236,7 +234,7 @@ func TestMultiLogin(t *testing.T) {
 	}
 	t.Log("token1:" + token1)
 
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -268,8 +266,6 @@ func TestMultiLogin(t *testing.T) {
 			t.Error("error:", "token same ")
 		}
 	}
-
-	Username = "flyfox"
 }
 
 func Post(t *testing.T, urlPath string, data ...interface{}) gtoken.Resp {
@@ -289,7 +285,7 @@ func getToken(t *testing.T) string {
 		return Token[Username]
 	}
 
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()

example/sample1/test/api_test.go

@@ -2,9 +2,11 @@ package test
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/goflyfox/gtoken/gtoken"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
+	"os"
 	"testing"
 )
 
@@ -14,12 +16,27 @@ const (
 
 var (
 	Token    = g.MapStrStr{}
-	Username = "flyfox"
+	Username = "flyFox"
 )
 
+func setup() {
+	fmt.Println("Before all tests")
+}
+
+func teardown() {
+	fmt.Println("After all tests")
+}
+
+func TestMain(m *testing.M) {
+	setup()
+	code := m.Run()
+	teardown()
+	os.Exit(code)
+}
+
 func TestHello(t *testing.T) {
 	t.Log("visit hello and no auth")
-	if r, e := ghttp.Post(TestURL+"/hello", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/hello", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -40,7 +57,7 @@ func TestHello(t *testing.T) {
 
 func TestUserData(t *testing.T) {
 	// 登录，访问用户信息
-	t.Log("2. execute login and visit user")
+	t.Log("1. execute login and visit user")
 	data := Post(t, "/system/data", "username="+Username)
 	if data.Success() {
 		if data.DataString() == "1" {
@@ -53,20 +70,20 @@ func TestUserData(t *testing.T) {
 	}
 
 	// 登出
-	t.Log("3. execute logout")
+	t.Log("2. execute logout")
 	data = Post(t, "/user/logout", "username="+Username)
 	if data.Success() {
 		t.Log(data.Json())
 	} else {
 		t.Error("error:", data.Json())
 	}
-
+	delete(Token, Username)
 }
 
 func TestSystemUser(t *testing.T) {
 	// 未登录
 	t.Log("1. not login and visit user")
-	if r, e := ghttp.Post(TestURL+"/system/user", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/system/user", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -110,12 +127,13 @@ func TestSystemUser(t *testing.T) {
 	} else {
 		t.Log(data.Json())
 	}
+	delete(Token, Username)
 }
 
 func TestUserLoginFail(t *testing.T) {
 	// 登录失败
 	t.Log("1. login fail ")
-	if r, e := ghttp.Post(TestURL+"/login", "username=&passwd="); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username=&passwd="); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -138,7 +156,7 @@ func TestUserLoginFail(t *testing.T) {
 func TestExclude(t *testing.T) {
 	// 未登录可以访问
 	t.Log("1. exclude user info")
-	if r, e := ghttp.Post(TestURL+"/system/user/info", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/system/user/info", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -156,7 +174,7 @@ func TestExclude(t *testing.T) {
 		}
 	}
 
-	if r, e := ghttp.Post(TestURL+"/user/info", "username="+Username); e != nil {
+	if r, e := g.Client().Post(TestURL+"/user/info", "username="+Username); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -201,7 +219,6 @@ func TestExclude(t *testing.T) {
 //}
 
 func TestLogin(t *testing.T) {
-	Username = "testLogin"
 	t.Log(" login first ")
 	token1 := getToken(t)
 	t.Log("token:" + token1)
@@ -211,11 +228,10 @@ func TestLogin(t *testing.T) {
 	if token1 != token2 {
 		t.Error("error:", "token not same ")
 	}
-	Username = "flyfox"
+	delete(Token, Username)
 }
 
 func TestLogout(t *testing.T) {
-	Username = "testLogout"
 	t.Log(" logout test ")
 	data := Post(t, "/user/logout", "username="+Username)
 	if data.Success() {
@@ -223,7 +239,7 @@ func TestLogout(t *testing.T) {
 	} else {
 		t.Error("error:", data.Json())
 	}
-	Username = "flyfox"
+	delete(Token, Username)
 }
 
 func Post(t *testing.T, urlPath string, data ...interface{}) gtoken.Resp {
@@ -243,7 +259,7 @@ func getToken(t *testing.T) string {
 		return Token[Username]
 	}
 
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -266,10 +282,9 @@ func getToken(t *testing.T) string {
 }
 
 func TestMultiLogin(t *testing.T) {
-	Username = "testLogin"
 	t.Log(" TestMultiLogin start... ")
 	var token1, token2 string
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -291,7 +306,7 @@ func TestMultiLogin(t *testing.T) {
 	}
 	t.Log("token1:" + token1)
 
-	if r, e := ghttp.Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
+	if r, e := g.Client().Post(TestURL+"/login", "username="+Username+"&passwd=123456"); e != nil {
 		t.Error("error:", e)
 	} else {
 		defer r.Close()
@@ -323,6 +338,4 @@ func TestMultiLogin(t *testing.T) {
 			t.Error("error:", "token same ")
 		}
 	}
-
-	Username = "flyfox"
 }

go.mod

@@ -1,5 +1,7 @@
 module github.com/goflyfox/gtoken
 
-require github.com/gogf/gf v1.14.5
+require (
+	github.com/gogf/gf v1.16.4
+)
 
 go 1.13

go.sum

@@ -11,8 +11,13 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gogf/gf v1.14.5 h1:y/4q8rfFtiuIL7PwNUhG8RyBWLlvR1pl44x7/EJeDMI=
 github.com/gogf/gf v1.14.5/go.mod h1:s4b0tkBqHyEWAk/Hwm4hzUCbCbdIPeERxB2wmeBg11g=
+github.com/gogf/gf v1.16.4 h1:1Y8/P1UMp9BmrtUn0wAg3g6ElRAO0R9QHCdUNt9Z5L4=
+github.com/gogf/gf v1.16.4/go.mod h1:EjnxZXddTwfFoLPofDE3NokFWx+immofINtSyFCj280=
+github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579 h1:pP/uEy52biKDytlgK/ug8kiYPAiYu6KajKVUHfGrtyw=
+github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579/go.mod h1:52e6mXyNnHAsFrXrSnj5JPRSKsZKpHylVtA3j4AtMz8=
 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=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -22,28 +27,52 @@ github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
+go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
+go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg=
+go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=
+go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA=
+go.opentelemetry.io/otel/trace v0.19.0 h1:1ucYlenXIDA1OlHVLDZKX0ObXV5RLaq06DtUKz5e5zc=
+go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

gtoken/gtoken.go

@@ -114,11 +114,17 @@ func (m *GfToken) InitConfig() bool {
 	if m.LoginAfterFunc == nil {
 		m.LoginAfterFunc = func(r *ghttp.Request, respData Resp) {
 			if !respData.Success() {
-				r.Response.WriteJson(respData)
+				err := r.Response.WriteJson(respData)
+				if err != nil {
+					glog.Error(err)
+				}
 			} else {
-				r.Response.WriteJson(Succ(g.Map{
+				err := r.Response.WriteJson(Succ(g.Map{
 					"token": respData.GetString("token"),
 				}))
+				if err != nil {
+					glog.Error(err)
+				}
 			}
 		}
 	}
@@ -132,9 +138,15 @@ func (m *GfToken) InitConfig() bool {
 	if m.LogoutAfterFunc == nil {
 		m.LogoutAfterFunc = func(r *ghttp.Request, respData Resp) {
 			if respData.Success() {
-				r.Response.WriteJson(Succ("Logout success"))
+				err := r.Response.WriteJson(Succ("Logout success"))
+				if err != nil {
+					glog.Error(err)
+				}
 			} else {
-				r.Response.WriteJson(respData)
+				err := r.Response.WriteJson(respData)
+				if err != nil {
+					glog.Error(err)
+				}
 			}
 		}
 	}
@@ -169,7 +181,10 @@ func (m *GfToken) InitConfig() bool {
 				glog.Warning(fmt.Sprintf("[AUTH_%s][url:%s][params:%s][data:%s]",
 					no, r.URL.Path, params, respData.Json()))
 				respData.Msg = m.AuthFailMsg
-				r.Response.WriteJson(respData)
+				err := r.Response.WriteJson(respData)
+				if err != nil {
+					glog.Error(err)
+				}
 				r.ExitAll()
 			}
 		}
@@ -229,7 +244,7 @@ func (m *GfToken) Start() bool {
 	return true
 }
 
-// Start 结束
+// Stop 结束
 func (m *GfToken) Stop() bool {
 	glog.Info("[GToken]stop. ")
 	return true
@@ -310,7 +325,7 @@ func (m *GfToken) authMiddleware(r *ghttp.Request) {
 
 }
 
-// 判断路径是否需要进行认证拦截
+// AuthPath 判断路径是否需要进行认证拦截
 // return true 需要认证
 func (m *GfToken) AuthPath(urlPath string) bool {
 	// 去除后斜杠
@@ -469,7 +484,7 @@ func (m *GfToken) getToken(userKey string) Resp {
 	return Succ(userCache)
 }
 
-// removeToken 删除Token
+// RemoveToken 删除Token
 func (m *GfToken) RemoveToken(token string) Resp {
 	decryptToken := m.DecryptToken(token)
 	if !decryptToken.Success() {
@@ -522,7 +537,7 @@ func (m *GfToken) DecryptToken(token string) Resp {
 		glog.Error("[GToken]decode error", err)
 		return Error("decode error")
 	}
-	decryptToken, err2 := gaes.Decrypt([]byte(token64), m.EncryptKey)
+	decryptToken, err2 := gaes.Decrypt(token64, m.EncryptKey)
 	if err2 != nil {
 		glog.Error("[GToken]decrypt error", err2)
 		return Error("decrypt error")

gtoken/gtoken_cache.go

@@ -72,7 +72,10 @@ func (m *GfToken) getCache(cacheKey string) Resp {
 func (m *GfToken) removeCache(cacheKey string) Resp {
 	switch m.CacheMode {
 	case CacheModeCache:
-		gcache.Remove(cacheKey)
+		_, err := gcache.Remove(cacheKey)
+		if err != nil {
+			glog.Error(err)
+		}
 	case CacheModeRedis:
 		var err error
 		_, err = g.Redis().Do("DEL", cacheKey)

gtoken/gtoken_group.go

@@ -5,7 +5,7 @@ import (
 	"github.com/gogf/gf/os/glog"
 )
 
-// 绑定group
+// Middleware 绑定group
 func (m *GfToken) Middleware(group *ghttp.RouterGroup) bool {
 	if !m.InitConfig() {
 		return false