zwxi 11 months ago
parent
commit
c866843efd
3 changed files with 13 additions and 13 deletions
  1. 11 11
      controllers/base_auth.go
  2. 1 1
      controllers/sys_user.go
  3. 1 1
      controllers/user_login.go

+ 11 - 11
controllers/base_auth.go

@@ -93,19 +93,19 @@ func (c *BaseAuthController) Prepare() {
 				c.StopRun()
 				return
 			}
-			authorizationArr := strings.Split(authorization, "$")
-			if len(authorizationArr) <= 1 {
-				c.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权!", ErrMsg: "请重新授权:Token is empty or account is empty"}, false, false)
-				c.StopRun()
-				return
-			}
-			tokenStr := authorizationArr[0]
+			//authorizationArr := strings.Split(authorization, "$")
+			//if len(authorizationArr) <= 1 {
+			//	c.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权!", ErrMsg: "请重新授权:Token is empty or account is empty"}, false, false)
+			//	c.StopRun()
+			//	return
+			//}
+			tokenStr := authorization
 			tokenArr := strings.Split(tokenStr, "=")
 			token := tokenArr[1]
 
-			accountStr := authorizationArr[1]
-			accountArr := strings.Split(accountStr, "=")
-			account := accountArr[1]
+			//accountStr := authorizationArr[1]
+			//accountArr := strings.Split(accountStr, "=")
+			//account := accountArr[1]
 
 			session, err := system.GetSysSessionByToken(token)
 			if err != nil {
@@ -125,7 +125,7 @@ func (c *BaseAuthController) Prepare() {
 			}
 			//校验token是否合法
 			// JWT校验Token和Account
-			//account := utils.MD5(session.UserName)
+			account := utils.MD5(session.UserName)
 			if !utils.CheckToken(account, token) {
 				c.JSON(models.BaseResponse{Ret: 408, Msg: "鉴权失败,请重新登录!", ErrMsg: "登录失效,请重新登陆!,CheckToken Fail"}, false, false)
 				c.StopRun()

+ 1 - 1
controllers/sys_user.go

@@ -100,7 +100,7 @@ func (this *SysUserController) Login() {
 
 	resp := new(system.LoginResp)
 	resp.Authorization = token
-	resp.Authorization = "authorization=" + token + "$account=" + account
+	resp.Authorization = "authorization=" + token
 	resp.RealName = sysUser.RealName
 	resp.AdminName = sysUser.AdminName
 	resp.RoleName = sysUser.RoleName

+ 1 - 1
controllers/user_login.go

@@ -535,7 +535,7 @@ func (this *UserLoginController) Login() {
 
 	resp := new(system.LoginResp)
 	resp.Authorization = token
-	resp.Authorization = "authorization=" + token + "$account=" + account
+	resp.Authorization = "authorization=" + token
 	resp.RealName = sysUser.RealName
 	resp.AdminName = sysUser.AdminName
 	resp.RoleName = sysUser.RoleName