From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
middlewares/auth/auth.go | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 479d931..2de927d 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -1,6 +1,7 @@
package auth
import (
+ "fmt"
"github.com/gin-gonic/gin"
"net/http"
"strings"
@@ -35,7 +36,16 @@
outUserM[userId] = userId
}
-func removeOutUser(userId string) {
+func OutUser(userId string) bool {
+ lock.Lock()
+ defer lock.Unlock()
+ if _,ok := outUserM[userId];ok{
+ return true
+ }
+ return false
+}
+
+func RemoveOutUser(userId string) {
lock.Lock()
defer lock.Unlock()
if _,ok := outUserM[userId];ok{
@@ -54,9 +64,18 @@
c.Abort()
}
user := (*jwtDriver).User(c)
+ fmt.Println("AuthHandler user:",user)
+ if user == nil {
+ util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
+ c.Abort()
+ return
+ }
loginM := user.(map[string]interface{})
userId := loginM["id"].(string)
- removeOutUser(userId)
+ if OutUser(userId) {
+ util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
+ c.Abort()
+ }
c.Next()
} else {
c.Next()
--
Gitblit v1.8.0