fix auth

liuxiaolong

2019-11-06 f6547ecc30f8a5c51cb32ada62819d5fe8115769

fix auth

 controllers/user.go

@@ -2,7 +2,6 @@

import (
    "basic.com/dbapi.git"
    "basic.com/valib/logger.git"
    "github.com/gin-gonic/gin"
    "net/http"
    "time"
@@ -104,10 +103,8 @@
// @Router /data/api-u/users/findAllUser [get]
func (uc UserController) FindAllUser(c *gin.Context) {
    authDriver := auth.GenerateAuthDriver()
    user := (*authDriver).User(c)
    logger.Debug("cur userInfo:",user)
    loginM := user.(map[string]interface{})
    userId := loginM["id"].(string)
    userM := (*authDriver).User(c)
    userId := userM["id"].(string)
    var api dbapi.UserApi
    b,d := api.FindAllUser(userId)
    if 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
}
@@ -62,14 +62,13 @@
                util.ResponseFormat(c,code.TokenNotFound,"尚未登录，请登录")
                c.Abort()
            }
            user := (*jwtDriver).User(c)
            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()
@@ -82,5 +81,5 @@
}

func GetCurUser(c *gin.Context)map[string]interface{}{
    return (*GenerateAuthDriver()).User(c).(map[string]interface{})
    return (*GenerateAuthDriver()).User(c)
}

 middlewares/auth/jwt.go

@@ -50,7 +50,7 @@
    return authJwtToken.Valid
}

func (jwtAuth *jwtAuthManager) User(c *gin.Context) interface{} {
func (jwtAuth *jwtAuthManager) User(c *gin.Context) map[string]interface{} {
    var jwtToken *jwtLib.Token
    if jwtUser, exist := c.Get("User"); !exist {
        tokenStr := strings.Replace(c.Request.Header.Get("Authorization"), "Bearer ", "", -1)