token校验修改

middleware/token_no_login.go

@@ -42,17 +42,22 @@ func TokenNoLogin() gin.HandlerFunc {
 
 		var userInfo services.UserInfo
 
-		//先判断pc端登录的情况
-		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
-		userInfo = tmpUserInfo
-		err = tmpErr
-		if tmpErr != nil {
-			if sessionInfo.OpenID != ""{
-				tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
-				userInfo = tmpUserInfo
-				err = tmpErr
-			} else {
-				response.TokenError(nil, "数据异常!", "openid为空", c)
+		if sessionInfo.OpenID != "" {
+			tmpUserInfo, tmpErr := services.GetWxUserItemByOpenId(sessionInfo.OpenID)
+			userInfo = tmpUserInfo
+			err = tmpErr
+			if err != nil {
+				response.TokenError(nil, "数据异常!", "openid查询用户信息错误", c)
+				c.Abort()
+				return
+			}
+		} else {
+			//判断pc端登录的情况
+			tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
+			userInfo = tmpUserInfo
+			err = tmpErr
+			if err != nil {
+				response.TokenError(nil, "数据异常!", "userID查询用户信息错误", c)
 				c.Abort()
 				return
 			}