|
@@ -328,7 +328,11 @@ func (s *Server) Register(c *gin.Context) {
|
|
|
db.Where("is_default = ?", 1).First(&defaultLevel)
|
|
db.Where("is_default = ?", 1).First(&defaultLevel)
|
|
|
|
|
|
|
|
// 昵称
|
|
// 昵称
|
|
|
- nickname := ctx.I18n("user_prefix")
|
|
|
|
|
|
|
+ userPrefix := ctx.I18n("user_prefix")
|
|
|
|
|
+ if userPrefix == "" || userPrefix == "user_prefix" {
|
|
|
|
|
+ userPrefix = "User"
|
|
|
|
|
+ }
|
|
|
|
|
+ nickname := userPrefix
|
|
|
if len(req.Account) >= 4 {
|
|
if len(req.Account) >= 4 {
|
|
|
nickname += req.Account[len(req.Account)-4:]
|
|
nickname += req.Account[len(req.Account)-4:]
|
|
|
} else {
|
|
} else {
|
|
@@ -724,7 +728,11 @@ func (s *Server) OAuthLogin(c *gin.Context) {
|
|
|
|
|
|
|
|
nickname := req.Nickname
|
|
nickname := req.Nickname
|
|
|
if nickname == "" {
|
|
if nickname == "" {
|
|
|
- nickname = req.Provider + ctx.I18n("user_prefix")
|
|
|
|
|
|
|
+ oauthPrefix := ctx.I18n("user_prefix")
|
|
|
|
|
+ if oauthPrefix == "" || oauthPrefix == "user_prefix" {
|
|
|
|
|
+ oauthPrefix = "User"
|
|
|
|
|
+ }
|
|
|
|
|
+ nickname = req.Provider + oauthPrefix
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 为OAuth用户生成唯一占位手机号(用MD5避免截断碰撞)
|
|
// 为OAuth用户生成唯一占位手机号(用MD5避免截断碰撞)
|