blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-01-20 10:02:41 +08:00
commit 9ca83b7349
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/api/user/user.go
View File

@ -63,6 +63,7 @@ func UpdateUserInfo(c *gin.Context) {
}
req := &rpc.UpdateUserInfoReq{UserInfo: &open_im_sdk.UserInfo{}}
utils.CopyStructFields(req.UserInfo, &params)
req.OperationID = params.OperationID
var ok bool
ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"))

2
pkg/base_info/auth_api_struct.go
View File

@ -12,7 +12,7 @@ package base_info
type UserRegisterReq struct {
Secret string `json:"secret" binding:"required,max=32"`
Platform int32 `json:"platform" binding:"required,min=1,max=7"`
UserInfo
ApiUserInfo
OperationID string `json:"operationID" binding:"required"`
}

6
pkg/base_info/public_struct.go
View File

@ -5,13 +5,13 @@ import (
"net/http"
)
type UserInfo struct {
type ApiUserInfo struct {
UserID string `json:"userID" binding:"required,min=1,max=64"`
Nickname string `json:"nickname" binding:"omitempty,min=1,max=64"`
FaceUrl string `json:"faceUrl" binding:"omitempty,max=1024"`
FaceURL string `json:"faceURL" binding:"omitempty,max=1024"`
Gender int32 `json:"gender" binding:"omitempty,oneof=0 1 2"`
PhoneNumber string `json:"phoneNumber" binding:"omitempty,max=32"`
Birth int64 `json:"birth" binding:"omitempty"`
Birth uint32 `json:"birth" binding:"omitempty"`
Email string `json:"email" binding:"omitempty,max=64"`
Ex string `json:"ex" binding:"omitempty,max=1024"`
}

2
pkg/base_info/user_api_struct.go
View File

@ -15,7 +15,7 @@ type GetUsersInfoResp struct {
}
type UpdateSelfUserInfoReq struct {
UserInfo
ApiUserInfo
OperationID string `json:"operationID" binding:"required"`
}

5
pkg/proto/sdk_ws/ws.proto
View File

@ -110,10 +110,7 @@ message FriendRequest{
message PullMessageBySeqListResp {
int32 errCode = 1;
string errMsg = 2;
int64 maxSeq = 3;
int64 minSeq = 4;
repeated GatherFormat singleUserMsg = 5;
repeated GatherFormat groupUserMsg = 6;
repeated MsgData list = 3;
}
message PullMessageBySeqListReq{
string userID = 1;