cms

pkg/cms_api_struct/common.go

@@ -1,10 +1,6 @@
 package cms_api_struct
 
-
 type RequestPagination struct {
-	PageNumber int `json:"page_number"`
-	ShowNumber int `json:"show_number"`
+	PageNumber int `form:"page_number" binding:"required"`
+	ShowNumber int `form:"show_number" binding:"required"`
 }
-
-
-

pkg/cms_api_struct/user.go

@@ -1,7 +1,65 @@
 package cms_api_struct
 
-type GetUsersResponse struct {
-
+type UserResponse struct {
+	ProfilePhoto string `json:"profile_photo"`
+	Nickname     string `json:"nick_name"`
+	UserId       string `json:"user_id"`
+	CreateTime   string `json:"create_time"`
 }
 
+type GetUserRequest struct {
+	UserId string `form:"user_id"`
+}
 
+type GetUserResponse struct {
+	UserResponse
+}
+
+type GetUsersRequest struct {
+	RequestPagination
+}
+
+type GetUsersResponse struct {
+	Users []*UserResponse `json:"users"`
+}
+
+type ResignUserRequest struct {
+	UserId string `json:"user_id"`
+}
+
+type ResignUserResponse struct {
+}
+
+type AlterUserRequest struct {
+	UserId string `json:"user_id"`
+}
+
+type AlterUserResponse struct {
+}
+
+type AddUserRequest struct {
+}
+
+type AddUserResponse struct {
+}
+
+type BlockUserRequest struct {
+	UserId string `json:"user_id"`
+}
+
+type BlockUserResponse struct {
+}
+
+type UnblockUserRequest struct {
+	UserId string `json:"user_id"`
+}
+
+type UnBlockUserResponse struct {
+}
+
+type GetBlockUsersRequest struct {
+	RequestPagination
+}
+
+type GetBlockUsersResponse struct {
+}

pkg/common/constant/error.go

@@ -78,6 +78,10 @@ const (
 	IntentionalError = 10007
 )
 
-func (e *ErrInfo) Error() string {
+func (e ErrInfo) Error() string {
 	return e.ErrMsg
 }
+
+func (e *ErrInfo) Code() int32 {
+	return e.ErrCode
+}

pkg/common/db/mysql_model/im_mysql_model/user_model.go

@@ -6,8 +6,9 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
 	"fmt"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
 	"time"
+
+	_ "github.com/jinzhu/gorm/dialects/mysql"
 )
 
 func init() {
@@ -50,17 +51,17 @@ func UserRegister(user db.User) error {
 	return nil
 }
 
-//type User struct {
-//	UserID      string    `gorm:"column:user_id;primaryKey;"`
-//	Nickname    string    `gorm:"column:name"`
-//	FaceUrl     string    `gorm:"column:icon"`
-//	Gender      int32     `gorm:"column:gender"`
-//	PhoneNumber string    `gorm:"column:phone_number"`
-//	Birth       string    `gorm:"column:birth"`
-//	Email       string    `gorm:"column:email"`
-//	Ex          string    `gorm:"column:ex"`
-//	CreateTime  time.Time `gorm:"column:create_time"`
-//}
+type User struct {
+	UserID      string    `gorm:"column:user_id;primaryKey;"`
+	Nickname    string    `gorm:"column:name"`
+	FaceUrl     string    `gorm:"column:icon"`
+	Gender      int32     `gorm:"column:gender"`
+	PhoneNumber string    `gorm:"column:phone_number"`
+	Birth       string    `gorm:"column:birth"`
+	Email       string    `gorm:"column:email"`
+	Ex          string    `gorm:"column:ex"`
+	CreateTime  time.Time `gorm:"column:create_time"`
+}
 
 func DeleteUser(userID string) (i int64) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
@@ -121,3 +122,17 @@ func SelectSomeUserID(userIDList []string) ([]string, error) {
 	}
 	return resultArr, nil
 }
+
+func GetUsers(showNumber, pageNumber int32) ([]User, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	dbConn.LogMode(true)
+	var users []User
+	if err != nil {
+		return users, err
+	}
+	err = dbConn.Limit(showNumber).Offset(pageNumber).Find(&users).Error
+	if err != nil {
+		return users, err
+	}
+	return users, nil
+}

pkg/common/http/http_resp.go

@@ -1 +1,23 @@
 package http
+
+import (
+	"Open_IM/pkg/common/constant"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+type BaseResp struct {
+	Code   int32       `json:"code"`
+	ErrMsg string      `json:"err_msg"`
+	Data   interface{} `json:"data"`
+}
+
+func RespHttp200(ctx *gin.Context, err constant.ErrInfo, data interface{}) {
+	resp := BaseResp{
+		Code:   err.Code(),
+		ErrMsg: err.Error(),
+		Data:   data,
+	}
+	ctx.JSON(http.StatusOK, resp)
+}

pkg/proto/auto_proto.sh

@@ -7,7 +7,7 @@ for ((i = 0; i < ${#all_proto[*]}; i++)); do
   protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto
   s=`echo $proto | sed 's/ //g'`
   v=${s//proto/pb.go}
-  protoc-go-inject-tag -input=./$v
+  # protoc-go-inject-tag -input=./$v
   echo "protoc --go_out=plugins=grpc:." $proto
 done
 echo "proto file generate success..."

pkg/proto/proto_dir.cfg

@@ -1,11 +1,11 @@
 
 all_proto=(
-            auth/auth.proto
-            friend/friend.proto
-            group/group.proto
+            # auth/auth.proto
+            # friend/friend.proto
+            # group/group.proto
             user/user.proto
-            chat/chat.proto
-            push/push.proto
-            relay/relay.proto
+            # chat/chat.proto
+            # push/push.proto
+            # relay/relay.proto
             sdk_ws/ws.proto
 )

pkg/proto/sdk_ws/ws.proto

@@ -1,4 +1,5 @@
 syntax = "proto3";
+option go_package = "./sdk_ws;server_api_params";
 package server_api_params;//The package name to which the proto file belongs
 //option go_package = "./sdk_ws;open_im_sdk";//The generated go pb file is in the current directory, and the package name is open_im_sdk
 
@@ -330,3 +331,9 @@ message FriendInfoChangedTips{
 message UserInfoUpdatedTips{
   string userID = 1;
 }
+
+///cms
+message RequestPagination {
+  int32 pageNumber = 1;
+  int32 showNumber = 2;
+}

pkg/proto/user/user.proto

@@ -13,6 +13,7 @@ message DeleteUsersReq{
   string OpUserID = 3;
   string OperationID = 4;
 }
+
 message DeleteUsersResp{
   CommonResp  CommonResp = 1;
   repeated string FailedUserIDList = 2;
@@ -107,53 +108,84 @@ message GetAllConversationMsgOptResp{
 }
 
 message ResignUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message ResignUserResp{
-    CommonResp  commonResp = 1;
+  CommonResp  commonResp = 1;
 }
 
 message GetUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message User{
-
+  string ProfilePhoto = 1;
+  string Nickname = 2;
+  string UserID = 3;
+  string CreateTime = 4; 
 }
 
 message GetUserResp{
-    User user = 1
+  User user = 1;
 }
 
 message AlterUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message AlterUserResp{
-    CommonResp  commonResp = 1;
+  CommonResp  CommonResp = 1;
 }
 
-message GetUserReq{
-    string OperationID = 1;
+message GetUsersReq {
+  string OperationID = 1;
+  server_api_params.RequestPagination Pagination = 2;
 }
 
 message GetUsersResp{
-    string OperationID = 1;
-    repeated Users User = 2;
+  string OperationID = 1;
+  repeated User user = 2;
 }
 
 message AddUserReq{
-    string OperationID = 1;
+  string OperationID = 1;
 }
 
 message AddUserResp{
-    CommonResp  commonResp = 1;
 }
 
+
+message BlockUserReq{
+  string UserID = 1;
+  string OperationID = 2;
+}
+
+message BlockUserResp{
+}
+
+message UnBlockUserReq{
+  string UserID = 1;
+  string OperationID = 2;
+}
+
+message UnBlockUserResp{
+
+}
+
+message GetBlockUsersReq{
+  server_api_params.RequestPagination Pagination =1;
+  string OperationID = 2;
+}
+
+message GetBlockUsersResp{
+  repeated User user = 2;
+}
+
+
 service user {
   rpc GetUserInfo(GetUserInfoReq) returns(GetUserInfoResp);
   rpc UpdateUserInfo(UpdateUserInfoReq) returns(UpdateUserInfoResp);
@@ -164,8 +196,8 @@ service user {
   rpc GetAllConversationMsgOpt(GetAllConversationMsgOptReq)returns(GetAllConversationMsgOptResp);
   rpc AccountCheck(AccountCheckReq)returns(AccountCheckResp);
 
-  rpc ResignUser(ResignUserReq) returns (ResignUserResp);
   rpc GetUser(GetUserReq) returns (GetUserResp);
+  rpc ResignUser(ResignUserReq) returns (ResignUserResp);
   rpc AlterUser(AlterUserReq) returns (AlterUserResp);
   rpc GetUsers(GetUsersReq) returns (GetUsersResp);
   rpc AddUser(AddUserReq) returns (AddUserResp);