From 0222e79afe45d9fc55aed9a7e62ca239c228ab73 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 23 十二月 2019 10:24:12 +0800
Subject: [PATCH] add sys comeback sh
---
middlewares/auth/auth.go | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 61e40ca..784d2c1 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -15,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
}
@@ -56,18 +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"){
jwtDriver :=NewJwtAuthDriver()
if !jwtDriver.Check(c) {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
+ return
}
- user := (*jwtDriver).User(c)
- loginM := user.(map[string]interface{})
- userId := loginM["id"].(string)
+ userM := (*jwtDriver).User(c)
+ if userM == nil {
+ util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
+ c.Abort()
+ return
+ }
+ userId := userM["id"].(string)
if OutUser(userId) {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
+ return
}
c.Next()
} else {
@@ -77,5 +83,5 @@
}
func GetCurUser(c *gin.Context)map[string]interface{}{
- return (*GenerateAuthDriver()).User(c).(map[string]interface{})
+ return (*GenerateAuthDriver()).User(c)
}
\ No newline at end of file
--
Gitblit v1.8.0