ziwen 2 years ago
parent
commit
65d396f20f
2 changed files with 22 additions and 16 deletions
  1. 11 8
      middleware/token.go
  2. 11 8
      middleware/token_no_login.go

+ 11 - 8
middleware/token.go

@@ -45,14 +45,17 @@ func Token() gin.HandlerFunc {
 		//先判断pc端登录的情况
 		//先判断pc端登录的情况
 		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
 		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
 		userInfo = tmpUserInfo
 		userInfo = tmpUserInfo
-		if tmpErr == utils.ErrNoRow && sessionInfo.OpenID != ""{
-			tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
-			userInfo = tmpUserInfo
-			err = tmpErr
-		} else {
-			response.TokenError(nil, "数据异常!", "openid为空", c)
-			c.Abort()
-			return
+		err = tmpErr
+		if tmpErr != nil {
+			if sessionInfo.OpenID != ""{
+				tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
+				userInfo = tmpUserInfo
+				err = tmpErr
+			} else {
+				response.TokenError(nil, "数据异常!", "openid为空", c)
+				c.Abort()
+				return
+			}
 		}
 		}
 
 
 		if err != nil {
 		if err != nil {

+ 11 - 8
middleware/token_no_login.go

@@ -45,14 +45,17 @@ func TokenNoLogin() gin.HandlerFunc {
 		//先判断pc端登录的情况
 		//先判断pc端登录的情况
 		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
 		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
 		userInfo = tmpUserInfo
 		userInfo = tmpUserInfo
-		if tmpErr == utils.ErrNoRow && sessionInfo.OpenID != ""{
-			tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
-			userInfo = tmpUserInfo
-			err = tmpErr
-		} else {
-			response.TokenError(nil, "数据异常!", "openid为空", c)
-			c.Abort()
-			return
+		err = tmpErr
+		if tmpErr != nil {
+			if sessionInfo.OpenID != ""{
+				tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
+				userInfo = tmpUserInfo
+				err = tmpErr
+			} else {
+				response.TokenError(nil, "数据异常!", "openid为空", c)
+				c.Abort()
+				return
+			}
 		}
 		}
 
 
 		//如果查询异常,且异常信息不是:用户openid查询出来发现没有绑定用户
 		//如果查询异常,且异常信息不是:用户openid查询出来发现没有绑定用户