This commit is contained in:
suyl
2021-07-20 16:25:36 +08:00
parent e04afaed81
commit 0fd6aa4207

View File

@@ -42,7 +42,7 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
} else {
tokenInfo.Token = cookie.Value
}
globals.SugarLogger.Debugf("checkToken token1: %v", tokenInfo.Token)
globals.SugarLogger.Debugf("checkToken token: %v", tokenInfo.Token)
if tokenMap = utils.GetKey(tokenInfo.Token).(map[string]interface{}); tokenMap == nil {
err = fmt.Errorf("token过期或无效请重新登录")
c.JSON(http.StatusOK, &CallBack{
@@ -51,9 +51,8 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
})
return nil
}
globals.SugarLogger.Debugf("checkToken token2: %v", utils.Format4Output(tokenMap, true))
data, _ := json.Marshal(tokenMap)
if err = json.Unmarshal(data, &user); err == nil {
if err = json.Unmarshal(data, &user); err == nil && user != nil {
tokenInfo.User = user
} else {
err = fmt.Errorf("token错误请重新登录")
@@ -63,6 +62,7 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
})
return nil
}
globals.SugarLogger.Debugf("checkToken user: %v", utils.Format4Output(user, true))
}
return tokenInfo
}