From 9303b69ea569bcb5e581147543a3fd58e90d0d25 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:05:23 +0800
Subject: [PATCH] add get buckets contrl
---
middlewares/auth/auth.go | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 2de927d..d2e365f 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -1,7 +1,6 @@
package auth
import (
- "fmt"
"github.com/gin-gonic/gin"
"net/http"
"strings"
@@ -16,7 +15,7 @@
type Auth interface {
Check(c *gin.Context)bool
- User(c *gin.Context)interface{}
+ User(c *gin.Context)map[string]interface{}
Login(http *http.Request,w http.ResponseWriter,user map[string]interface{})interface{}
Logout(http *http.Request,w http.ResponseWriter) bool
}
@@ -57,24 +56,24 @@
return func(c *gin.Context) {
urlPath := c.Request.URL.Path
- if strings.Contains(urlPath,"/data/api-v") && !strings.Contains(urlPath,"login"){
+ if strings.Contains(urlPath,"/data/api-") && !strings.Contains(urlPath,"login") && !strings.Contains(urlPath, "/data/api-v/license") && !strings.Contains(urlPath, "/data/api-v/info/"){
jwtDriver :=NewJwtAuthDriver()
if !jwtDriver.Check(c) {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
+ return
}
- user := (*jwtDriver).User(c)
- fmt.Println("AuthHandler user:",user)
- if user == nil {
+ userM := (*jwtDriver).User(c)
+ if userM == nil {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
return
}
- loginM := user.(map[string]interface{})
- userId := loginM["id"].(string)
+ userId := userM["id"].(string)
if OutUser(userId) {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
+ return
}
c.Next()
} else {
@@ -84,5 +83,5 @@
}
func GetCurUser(c *gin.Context)map[string]interface{}{
- return (*GenerateAuthDriver()).User(c).(map[string]interface{})
-}
\ No newline at end of file
+ return (*GenerateAuthDriver()).User(c)
+}
--
Gitblit v1.8.0