兼容以0开头的手机号登录

dbproxy/svc/u_account.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/rpc"
+	"strings"
 	"time"
 
 	"github.com/globalsign/mgo"
@@ -108,10 +109,27 @@ func (svc *AccountSvc) AccountIsExist(args *model.AccIsExistArg, ret *model.AccR
 		err := caccounts.Find(bson.M{"tel": args.Tel, "tagkey": args.TagKey}).One(acc)
 		if err != nil {
 			if errors.Is(err, mgo.ErrNotFound) {
-				ret.Tag = common.LoginNew
+				// 兼容8550开头的手机号,8550和855算同一个区号
-				return nil
+				if strings.HasPrefix(args.Tel, "855") {
+					tel := make([]byte, len(args.Tel)+1)
+					copy(tel, "8550")
+					copy(tel[4:], args.Tel[3:])
+					err = caccounts.Find(bson.M{"tel": string(tel), "tagkey": args.TagKey}).One(acc)
+					if err != nil {
+						if errors.Is(err, mgo.ErrNotFound) {
+							ret.Tag = common.LoginNew
+							return nil
+						} else {
+							return err
+						}
+					} else {
+						acc.Tel = args.Tel
+						caccounts.Update(bson.M{"_id": acc.AccountId}, bson.D{{"$set", bson.D{{"tel", args.Tel}}}})
+					}
+				}
+			} else {
+				return err
 			}
-			return err
 		}
 
 		if args.CodeValid {

worldsrv/action_player.go

@@ -11,6 +11,7 @@ import (
 	"net/url"
 	"regexp"
 	"strconv"
+	"strings"
 	"time"
 	"unicode/utf8"
 
@@ -2706,6 +2707,8 @@ func CSPlayerSMSCode(s *netlib.Session, packetId int, data interface{}, sid int6
 		return nil
 	}
 
+	msg.Tel = strings.TrimPrefix(msg.GetTel(), "0")
+
 	tel := fmt.Sprint(msg.GetAreaCode(), msg.GetTel())
 	// tel
 	if !telRule.MatchString(tel) {
@@ -2857,6 +2860,8 @@ func CSBindTel(s *netlib.Session, packetId int, data interface{}, sid int64) err
 	//	return nil
 	//}
 
+	msg.Tel = strings.TrimPrefix(msg.GetTel(), "0")
+
 	tel := fmt.Sprint(msg.GetAreaCode(), msg.GetTel())
 	telKey := common.GetBindTelCodeKey(p.Platform, tel)