Merge branch 'master' of https://github.com/goflyfox/gtoken

ChangeLog.md

@@ -1,5 +1,8 @@
 Change Log 更新说明
 ------------------------------
+## 2019-07-03 v1.2.2
+1. gf升级为V1.7.1
+
 ## 2019-06-16 v1.2.1
 1. 目录重构
 

go.mod

@@ -1,3 +1,3 @@
 module gtoken
 
-require github.com/gogf/gf v1.7.0
+require github.com/gogf/gf v1.7.1

go.sum

@@ -1,2 +1,2 @@
-github.com/gogf/gf v1.7.0 h1:hhfawnjEiQLPuIXhX+7l+1mqc5ZYvJqvphq1YmpYDyk=
-github.com/gogf/gf v1.7.0/go.mod h1:41x91y5T+itylJH0NsW/CfTD87qeBoPe/BX3DZAwP0U=
+github.com/gogf/gf v1.7.1 h1:LECdt4UwVFpCGoWUk56dNFEHG9JxeKi34eOIdgFBbOg=
+github.com/gogf/gf v1.7.1/go.mod h1:witsoQr7PSjWHK2T1lOa1EKSFIs31QF0T8/+ITaJoho=

gtoken/gtoken.go

@@ -332,7 +332,11 @@ func (m *GfToken) EncryptToken(userKey string) resp.Resp {
 		return resp.Fail("encrypt userKey empty")
 	}
 
-	uuid := gmd5.Encrypt(grand.Str(10))
+	uuid, err := gmd5.Encrypt(grand.Str(10))
+	if err != nil {
+		glog.Error("[GToken]uuid error", err)
+		return resp.Error("uuid error")
+	}
 	tokenStr := userKey + m.TokenDelimiter + uuid
 
 	token, err := gaes.Encrypt([]byte(tokenStr), m.EncryptKey)
@@ -344,7 +348,7 @@ func (m *GfToken) EncryptToken(userKey string) resp.Resp {
 	return resp.Succ(g.Map{
 		"userKey": userKey,
 		"uuid":    uuid,
-		"token":   gbase64.Encode(string(token)),
+		"token":   gbase64.Encode(token),
 	})
 }
 
@@ -354,7 +358,7 @@ func (m *GfToken) DecryptToken(token string) resp.Resp {
 		return resp.Fail("decrypt token empty")
 	}
 
-	token64, err := gbase64.Decode(token)
+	token64, err := gbase64.Decode([]byte(token))
 	if err != nil {
 		glog.Error("[GToken]decode error", err)
 		return resp.Error("decode error")