This commit is contained in:
桀尼龟 2025-03-12 10:42:29 +08:00
parent dbb4711cca
commit bfcde95bca
4 changed files with 584 additions and 533 deletions

File diff suppressed because it is too large Load Diff

View File

@ -141,6 +141,7 @@ message UserListInfo{
string telAreaCode = 17; string telAreaCode = 17;
string language = 18; string language = 18;
string subscriberNumber = 19; string subscriberNumber = 19;
string nickName = 20;
} }
message UserListRequest{ message UserListRequest{
string domain = 1; string domain = 1;
@ -170,6 +171,7 @@ message UserInfoResponse{
string domain = 14; string domain = 14;
string language = 15; string language = 15;
string subscriberNumber = 16; string subscriberNumber = 16;
string nickName = 17;
} }
message RealNameResponse{ message RealNameResponse{
uint64 id = 1; uint64 id = 1;
@ -487,6 +489,7 @@ message UpdateRequest {
uint64 ID = 1 [json_name = "ID"]; //ID uint64 ID = 1 [json_name = "ID"]; //ID
string Domain = 2 [json_name = "domain"]; string Domain = 2 [json_name = "domain"];
string Language = 3 [json_name = "language"]; string Language = 3 [json_name = "language"];
string NickName = 4 [json_name = "nickName"];
} }
message Operator { message Operator {
@ -577,6 +580,7 @@ message RegistRequest {
string address = 4; string address = 4;
string telAreaCode = 5; string telAreaCode = 5;
string language = 6; string language = 6;
string nickName = 7;
} }
message LoginRequest { message LoginRequest {

View File

@ -103,6 +103,7 @@ func BuildUserList(user []*model.User) []*account.UserListInfo {
TelAreaCode: i.TelAreaCode, TelAreaCode: i.TelAreaCode,
Language: i.Language, Language: i.Language,
SubscriberNumber: i.SubscriberNumber, SubscriberNumber: i.SubscriberNumber,
NickName: i.Nickname,
}) })
} }
return userList return userList

View File

@ -517,6 +517,11 @@ func (a *AccountProvider) Register(_ context.Context, in *account.RegistRequest)
rand2.Seed(time.Now().UnixNano()) rand2.Seed(time.Now().UnixNano())
randomNum := rand2.Intn(90000) + 10000 randomNum := rand2.Intn(90000) + 10000
SubscriberNumber := fmt.Sprintf("FiEE%s%05d", date, randomNum) SubscriberNumber := fmt.Sprintf("FiEE%s%05d", date, randomNum)
if in.NickName == "" {
telStr := strconv.FormatInt(in.TelNum, 10)
lastFourDigits := telStr[len(telStr)-4:]
in.NickName = fmt.Sprintf("访客_%s", lastFourDigits)
}
user := model.User{ user := model.User{
Domain: &in.Domain, Domain: &in.Domain,
TelNum: in.TelNum, TelNum: in.TelNum,
@ -527,6 +532,7 @@ func (a *AccountProvider) Register(_ context.Context, in *account.RegistRequest)
RealNameID: nil, RealNameID: nil,
SubscriberNumber: SubscriberNumber, SubscriberNumber: SubscriberNumber,
Language: in.Language, Language: in.Language,
Nickname: in.NickName,
} }
if err = model.DB.Create(&user).Error; err != nil { if err = model.DB.Create(&user).Error; err != nil {
return &account.RegisterResponse{Status: 0}, err return &account.RegisterResponse{Status: 0}, err
@ -631,6 +637,7 @@ func (a *AccountProvider) Info(ctx context.Context, in *account.InfoRequest) (*a
NotPassRemarks: user.NotPassRemarks, NotPassRemarks: user.NotPassRemarks,
Language: user.Language, Language: user.Language,
SubscriberNumber: user.SubscriberNumber, SubscriberNumber: user.SubscriberNumber,
NickName: user.Nickname,
} }
return response, nil return response, nil
@ -1019,7 +1026,7 @@ func (a *AccountProvider) Update(_ context.Context, in *account.UpdateRequest) (
if err := model.DB.First(&user, in.ID).Error; err != nil { if err := model.DB.First(&user, in.ID).Error; err != nil {
return response, errors.New(m.Not_Found) return response, errors.New(m.Not_Found)
} }
err := model.DB.Model(&model.User{}).Where("id = ?", in.ID).Updates(&model.User{Language: in.Language}).Error err := model.DB.Model(&model.User{}).Where("id = ?", in.ID).Updates(&model.User{Language: in.Language, Nickname: in.NickName}).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }