Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
This commit is contained in:
rainyan
2020-04-06 00:47:46 +08:00
28 changed files with 259 additions and 315 deletions
+3 -3
View File
@@ -13,7 +13,7 @@ type JwtBlacklist struct {
// @title JsonInBlacklist
// @description create jwt blacklist
// @auth (2020/04/05 20:22 )
// @return err error
// @return err error
func (j *JwtBlacklist) JsonInBlacklist() (err error) {
err = global.GVA_DB.Create(j).Error
return
@@ -42,8 +42,8 @@ func (j *JwtBlacklist) GetRedisJWT(userName string) (err error, RedisJWT string)
// @title SetRedisJWT
// @description set jwt into the Redis
// @auth (2020/04/05 20:22 )
// @param userName string
// @return err error
// @param userName string
// @return err error
func (j *JwtBlacklist) SetRedisJWT(userName string) (err error) {
err = global.GVA_REDIS.Set(userName, j.Jwt, 1000*1000*1000*60*60*24*7).Err()
return err