token校验

middleware/token.go

@@ -42,8 +42,11 @@ func Token() gin.HandlerFunc {
 
 		var userInfo services.UserInfo
 
-		if sessionInfo.OpenID != "" {
-			tmpUserInfo, tmpErr := services.GetWxUserItemByOpenId(sessionInfo.OpenID)
+		//先判断pc端登录的情况
+		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
+		userInfo = tmpUserInfo
+		if tmpErr == utils.ErrNoRow && sessionInfo.OpenID != ""{
+			tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
 			userInfo = tmpUserInfo
 			err = tmpErr
 		} else {

middleware/token_no_login.go

@@ -42,8 +42,11 @@ func TokenNoLogin() gin.HandlerFunc {
 
 		var userInfo services.UserInfo
 
-		if sessionInfo.OpenID != "" {
-			tmpUserInfo, tmpErr := services.GetWxUserItemByOpenId(sessionInfo.OpenID)
+		//先判断pc端登录的情况
+		tmpUserInfo, tmpErr := services.GetWxUserItemByUserId(int(sessionInfo.UserID), 3)
+		userInfo = tmpUserInfo
+		if tmpErr == utils.ErrNoRow && sessionInfo.OpenID != ""{
+			tmpUserInfo, tmpErr = services.GetWxUserItemByOpenId(sessionInfo.OpenID)
 			userInfo = tmpUserInfo
 			err = tmpErr
 		} else {