|
|
@@ -103,16 +103,10 @@ func (c *BaseAuthController) Prepare() {
|
|
|
tokenArr := strings.Split(tokenStr, "=")
|
|
|
token := tokenArr[1]
|
|
|
|
|
|
- accountStr := authorizationArr[1]
|
|
|
- accountArr := strings.Split(accountStr, "=")
|
|
|
- account := accountArr[1]
|
|
|
- //校验token是否合法
|
|
|
- // JWT校验Token和Account
|
|
|
- if !utils.CheckToken(account, token) {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "鉴权失败，请重新登录！", ErrMsg: "登录失效，请重新登陆!,CheckToken Fail"}, false, false)
|
|
|
- c.StopRun()
|
|
|
- return
|
|
|
- }
|
|
|
+ //accountStr := authorizationArr[1]
|
|
|
+ //accountArr := strings.Split(accountStr, "=")
|
|
|
+ //account := accountArr[1]
|
|
|
+
|
|
|
session, err := system.GetSysSessionByToken(token)
|
|
|
if err != nil {
|
|
|
if err.Error() == utils.ErrNoRow() {
|
|
|
@@ -129,6 +123,14 @@ func (c *BaseAuthController) Prepare() {
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
+ //校验token是否合法
|
|
|
+ // JWT校验Token和Account
|
|
|
+ account := utils.MD5(session.UserName)
|
|
|
+ if !utils.CheckToken(account, token) {
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "鉴权失败，请重新登录！", ErrMsg: "登录失效，请重新登陆!,CheckToken Fail"}, false, false)
|
|
|
+ c.StopRun()
|
|
|
+ return
|
|
|
+ }
|
|
|
if time.Now().After(session.ExpiredTime) {
|
|
|
c.JSON(models.BaseResponse{Ret: 408, Msg: "请重新登录!", ErrMsg: "获取用户信息异常，Eerr:" + err.Error()}, false, false)
|
|
|
c.StopRun()
|
zwxi