Merge branch 'jng' into dev
This commit is contained in:
commit
883a0c8f7c
File diff suppressed because it is too large
Load Diff
@ -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 {
|
||||||
|
@ -67,6 +67,7 @@ func UserUpdate(c *gin.Context) {
|
|||||||
ID: req.ID,
|
ID: req.ID,
|
||||||
Domain: req.Domain,
|
Domain: req.Domain,
|
||||||
Language: req.Language,
|
Language: req.Language,
|
||||||
|
NickName: req.NickName,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
|
Loading…
Reference in New Issue
Block a user