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

pkg/base_info/friend_api_struct.go

@@ -54,7 +54,7 @@ type GetBlackListReq struct {
 }
 type GetBlackListResp struct {
 	CommResp
-	BlackUserInfoList []*blackUserInfo `json:"data"`
+	BlackUserInfoList []*BlackUserInfo `json:"data"`
 }
 
 //type PublicUserInfo struct {
@@ -64,7 +64,7 @@ type GetBlackListResp struct {
 //	Gender   int32  `json:"gender"`
 //}
 
-type blackUserInfo struct {
+type BlackUserInfo struct {
 	open_im_sdk.PublicUserInfo
 }
 

pkg/base_info/public_struct.go

@@ -7,11 +7,11 @@ import (
 
 type UserInfo struct {
 	UserID      string `json:"userID" binding:"required,min=1,max=64"`
-	Nickname    string `json:"nickname" binding:"required,min=1,max=64"`
+	Nickname    string `json:"nickname" binding:"omitempty,min=1,max=64"`
 	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       string `json:"birth" binding:"omitempty,max=16"`
+	Birth       int64  `json:"birth" binding:"omitempty"`
 	Email       string `json:"email" binding:"omitempty,max=64"`
 	Ex          string `json:"ex" binding:"omitempty,max=1024"`
 }

pkg/base_info/user_api_struct.go

@@ -12,3 +12,12 @@ type GetUserInfoResp struct {
 	CommResp
 	UserInfoList []*open_im_sdk.UserInfo `json:"data"`
 }
+
+type UpdateUserInfoReq struct {
+	UserInfo
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type UpdateUserInfoResp struct {
+	CommResp
+}