Merge branch 'yb_pc2.0'

middleware/token.go

@@ -46,7 +46,7 @@ func Token() gin.HandlerFunc {
 			tmpUserInfo, tmpErr := services.GetWxUserItemByOpenId(sessionInfo.OpenID)
 			userInfo = tmpUserInfo
 			err = tmpErr
-			if err != nil {
+			if err != nil && err != services.ERR_NO_USER_RECORD && err != services.ERR_USER_NOT_BIND{
 				response.TokenError(nil, "数据异常!", "openid查询用户信息错误", c)
 				c.Abort()
 				return

middleware/token_no_login.go

@@ -46,7 +46,7 @@ func TokenNoLogin() gin.HandlerFunc {
 			tmpUserInfo, tmpErr := services.GetWxUserItemByOpenId(sessionInfo.OpenID)
 			userInfo = tmpUserInfo
 			err = tmpErr
-			if err != nil {
+			if err != nil && err != services.ERR_NO_USER_RECORD && err != services.ERR_USER_NOT_BIND{
 				response.TokenError(nil, "数据异常!", "openid查询用户信息错误", c)
 				c.Abort()
 				return