merge cms into v2.3.0release

pkg/base_info/common.go

@@ -0,0 +1,11 @@
+package base_info
+
+type RequestPagination struct {
+	PageNumber int `json:"pageNumber"  binding:"required"`
+	ShowNumber int `json:"showNumber"  binding:"required"`
+}
+
+type ResponsePagination struct {
+	CurrentPage int `json:"currentPage"`
+	ShowNumber  int `json:"showNumber"`
+}

pkg/base_info/manage_api_struct.go

@@ -93,3 +93,39 @@ type CheckMsgIsSendSuccessResp struct {
 	CommResp
 	Status int32 `json:"status"`
 }
+
+type GetUsersReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+	UserName    string `json:"userName"`
+	UserID      string `json:"userID"`
+	PageNumber  int32  `json:"pageNumber" binding:"required"`
+	ShowNumber  int32  `json:"showNumber" binding:"required"`
+}
+
+type CMSUser struct {
+	UserID           string `json:"userID"`
+	Nickname         string `json:"nickname"`
+	FaceURL          string `json:"faceURL"`
+	Gender           int32  `json:"gender"`
+	PhoneNumber      string `json:"phoneNumber"`
+	Birth            uint32 `json:"birth"`
+	Email            string `json:"email"`
+	Ex               string `json:"ex"`
+	CreateIp         string `json:"createIp"`
+	CreateTime       uint32 `json:"createTime"`
+	LastLoginIp      string `json:"LastLoginIp"`
+	LastLoginTime    uint32 `json:"LastLoginTime"`
+	AppMangerLevel   int32  `json:"appMangerLevel"`
+	GlobalRecvMsgOpt int32  `json:"globalRecvMsgOpt"`
+	IsBlock          bool   `json:"isBlock"`
+}
+
+type GetUsersResp struct {
+	CommResp
+	Data struct {
+		UserList    []*CMSUser `json:"userList"`
+		TotalNum    int32      `json:"totalNum"`
+		CurrentPage int32      `json:"currentPage"`
+		ShowNumber  int32      `json:"showNumber"`
+	} `json:"data"`
+}

pkg/base_info/public_struct.go

@@ -7,21 +7,16 @@ import (
 )
 
 type ApiUserInfo struct {
-	UserID         string `json:"userID" binding:"required,min=1,max=64" swaggo:"true,用户ID,"`
-	Nickname       string `json:"nickname" binding:"omitempty,min=1,max=64" swaggo:"true,my id,19"`
-	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          uint32 `json:"birth" binding:"omitempty"`
-	Email          string `json:"email" binding:"omitempty,max=64"`
-	CreateIp       string `json:"createIp" binding:"omitempty,max=15"`
-	CreateTime     int64  `json:"createTime"`
-	LastLoginIp    string `json:"LastLoginIp" binding:"omitempty,max=15"`
-	LastLoginTime  int64  `json:"lastLoginTime"`
-	LoginTimes     int32  `json:"loginTimes" binding:"omitempty"`
-	LoginLimit     int32  `json:"loginLimit" binding:"omitempty"`
-	Ex             string `json:"ex" binding:"omitempty,max=1024"`
-	InvitationCode string `json:"invitationCode" binding:"omitempty"`
+	UserID      string `json:"userID" binding:"required,min=1,max=64" swaggo:"true,用户ID,"`
+	Nickname    string `json:"nickname" binding:"omitempty,min=1,max=64" swaggo:"true,my id,19"`
+	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       uint32 `json:"birth" binding:"omitempty"`
+	Email       string `json:"email" binding:"omitempty,max=64"`
+	CreateTime  int64  `json:"createTime"`
+	LoginLimit  int32  `json:"loginLimit" binding:"omitempty"`
+	Ex          string `json:"ex" binding:"omitempty,max=1024"`
 }
 
 //type Conversation struct {