add

internal/cms_api/middleware/jwt_auth.go

@@ -12,7 +12,7 @@ import (
 func JWTAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), "")
-		log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID)
+		// log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID)
 		c.Set("userID", userID)
 		if !ok {
 			log.NewError("", "GetUserIDFromToken false ", c.Request.Header.Get("token"))

internal/cms_api/router.go

@@ -7,6 +7,7 @@ import (
 	"Open_IM/internal/cms_api/middleware"
 	"Open_IM/internal/cms_api/statistics"
 	"Open_IM/internal/cms_api/user"
+	"Open_IM/internal/demo/register"
 
 	"github.com/gin-gonic/gin"
 )
@@ -23,6 +24,18 @@ func NewGinRouter() *gin.Engine {
 		adminRouterGroup.POST("/add_user_register_add_friend_id", admin.AddUserRegisterAddFriendIDList)
 		adminRouterGroup.POST("/reduce_user_register_reduce_friend_id", admin.ReduceUserRegisterAddFriendIDList)
 		adminRouterGroup.POST("/get_user_register_reduce_friend_id_list", admin.GetUserRegisterAddFriendIDList)
+
+		adminRouterGroup.POST("/generate_invitation_code", register.GenerateInvitationCode)
+		adminRouterGroup.POST("/query_invitation_code", register.QueryInvitationCode)
+		adminRouterGroup.POST("/get_invitation_codes", register.GetInvitationCodes)
+
+		adminRouterGroup.POST("/query_user_ip_limit_login", register.QueryUserIDLimitLogin)
+		adminRouterGroup.POST("/add_user_ip_limit_login", register.AddUserIPLimitLogin)
+		adminRouterGroup.POST("/remove_user_ip_limit_login", register.RemoveUserIPLimitLogin)
+
+		adminRouterGroup.POST("/query_ip_register", register.QueryIPRegister)
+		adminRouterGroup.POST("/add_ip_limit", register.AddIPLimit)
+		adminRouterGroup.POST("/remove_ip_Limit", register.RemoveIPLimit)
 	}
 	r2 := router.Group("")
 	r2.Use(middleware.JWTAuth())

internal/cms_api/statistics/statistics.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -37,7 +38,9 @@ func GetMessagesStatistics(c *gin.Context) {
 		return
 	}
 	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetMessageStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetMessageStatistics(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetMessageStatistics failed", err.Error())
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 400, "errMsg": err.Error()})
@@ -91,7 +94,9 @@ func GetUserStatistics(c *gin.Context) {
 		return
 	}
 	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetUserStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetUserStatistics(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetUserStatistics failed", err.Error(), reqPb.String())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
@@ -154,7 +159,9 @@ func GetGroupStatistics(c *gin.Context) {
 		return
 	}
 	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetGroupStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetGroupStatistics(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetGroupStatistics failed", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
@@ -211,7 +218,9 @@ func GetActiveUser(c *gin.Context) {
 		return
 	}
 	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetActiveUser(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetActiveUser(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetActiveUser failed ", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
@@ -245,7 +254,9 @@ func GetActiveGroup(c *gin.Context) {
 		return
 	}
 	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetActiveGroup(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetActiveGroup(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetActiveGroup failed ", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})

internal/rpc/admin_cms/admin_cms.go

@@ -110,7 +110,7 @@ func (s *adminCMSServer) AdminLogin(_ context.Context, req *pbAdminCMS.AdminLogi
 
 func (s *adminCMSServer) AddUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.AddUserRegisterAddFriendIDListReq) (*pbAdminCMS.AddUserRegisterAddFriendIDListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp := &pbAdminCMS.AddUserRegisterAddFriendIDListResp{}
+	resp := &pbAdminCMS.AddUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
 	if err := imdb.AddUserRegisterAddFriendIDList(req.UserIDList...); err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
@@ -123,7 +123,7 @@ func (s *adminCMSServer) AddUserRegisterAddFriendIDList(_ context.Context, req *
 
 func (s *adminCMSServer) ReduceUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.ReduceUserRegisterAddFriendIDListReq) (*pbAdminCMS.ReduceUserRegisterAddFriendIDListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp := &pbAdminCMS.ReduceUserRegisterAddFriendIDListResp{}
+	resp := &pbAdminCMS.ReduceUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
 	if req.Operation == 0 {
 		if err := imdb.ReduceUserRegisterAddFriendIDList(req.UserIDList...); err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
@@ -145,7 +145,7 @@ func (s *adminCMSServer) ReduceUserRegisterAddFriendIDList(_ context.Context, re
 
 func (s *adminCMSServer) GetUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.GetUserRegisterAddFriendIDListReq) (*pbAdminCMS.GetUserRegisterAddFriendIDListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp := &pbAdminCMS.GetUserRegisterAddFriendIDListResp{}
+	resp := &pbAdminCMS.GetUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
 	userIDList, err := imdb.GetRegisterAddFriendList(req.Pagination.ShowNumber, req.Pagination.PageNumber)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())

internal/rpc/user/user.go

@@ -565,6 +565,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
 
 		user := pbUser.CmsUser{User: &sdkws.UserInfo{}}
 		utils.CopyStructFields(&user.User, userDB)
+		user.User.CreateTime = uint32(userDB.CreateTime.Unix())
 		resp.UserList = append(resp.UserList, &user)
 		resp.TotalNums = 1
 	} else if req.UserName != "" {
@@ -585,6 +586,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
 		for _, userDB := range usersDB {
 			var user sdkws.UserInfo
 			utils.CopyStructFields(&user, userDB)
+			user.CreateTime = uint32(userDB.CreateTime.Unix())
 			resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user})
 		}
 	} else {
@@ -605,6 +607,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
 		for _, userDB := range usersDB {
 			var user sdkws.UserInfo
 			utils.CopyStructFields(&user, userDB)
+			user.CreateTime = uint32(userDB.CreateTime.Unix())
 			resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user})
 		}
 	}