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

internal/api/auth/auth.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/auth"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -165,7 +165,7 @@ func ParseToken(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var expireTime int64
-	ok, _, errInfo, expireTime = token_verify.GetUserIDFromTokenExpireTime(c.Request.Header.Get("token"), params.OperationID)
+	ok, _, errInfo, expireTime = tokenverify.GetUserIDFromTokenExpireTime(c.Request.Header.Get("token"), params.OperationID)
 	if !ok {
 		errMsg := params.OperationID + " " + "GetUserIDFromTokenExpireTime failed " + errInfo
 		log.NewError(params.OperationID, errMsg)
@@ -204,7 +204,7 @@ func ForceLogout(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/client_init/init_config.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"net/http"
 
@@ -20,7 +20,7 @@ func SetClientInitConfig(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	err, _ := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
+	err, _ := tokenverify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
 	if err != nil {
 		errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg, errMsg)
@@ -52,7 +52,7 @@ func GetClientInitConfig(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	err, _ := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
+	err, _ := tokenverify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
 	if err != nil {
 		errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg, errMsg)

internal/api/friend/friend.go

@@ -5,7 +5,7 @@ package friend
 //	api "Open_IM/pkg/api_struct"
 //	"Open_IM/pkg/common/config"
 //	"Open_IM/pkg/common/log"
-//	"Open_IM/pkg/common/token_verify"
+//	"Open_IM/pkg/common/tokenverify"
 //	"Open_IM/pkg/getcdv3"
 //	rpc "Open_IM/pkg/proto/friend"
 //	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -39,7 +39,7 @@ package friend
 //	utils.CopyStructFields(req.CommID, &params)
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -84,7 +84,7 @@ package friend
 //	utils.CopyStructFields(req, &params)
 //	var ok bool
 //	var errInfo string
-//	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+//	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 //	if !ok {
 //		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.OperationID, errMsg)
@@ -146,7 +146,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -202,7 +202,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -258,7 +258,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -312,7 +312,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -373,7 +373,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -427,7 +427,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -480,7 +480,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -535,7 +535,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -591,7 +591,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)
@@ -647,7 +647,7 @@ package friend
 //
 //	var ok bool
 //	var errInfo string
-//	ok, req.CommID.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
+//	ok, req.CommID.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.CommID.OperationID)
 //	if !ok {
 //		errMsg := req.CommID.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 //		log.NewError(req.CommID.OperationID, errMsg)

internal/api/group/group.go

@@ -8,6 +8,7 @@ package group
 //	"Open_IM/pkg/common/log"
 //	"Open_IM/pkg/common/token_verify"
 //	"Open_IM/pkg/common/tracelog"
+//	"Open_IM/pkg/getcdv3"
 //	rpc "Open_IM/pkg/proto/group"
 //	"Open_IM/pkg/utils"
 //	"context"
@@ -18,92 +19,22 @@ package group
 //
 //	"net/http"
 //	"strings"
+//
+//	jsonData "Open_IM/internal/utils"
 //)
 
-//func NewApiNotReqData[B any](c *gin.Context, name string) *ApiRpc[struct{}, B] {
-//	return NewApiRpc[struct{}, B](c, name).IgnoreRequest()
-//}
-//
-//func NewApiNotRespData[B any](c *gin.Context, name string) *ApiRpc[struct{}, B] {
-//	return NewApiRpc[struct{}, B](c, name).IgnoreResponse()
-//}
-//
-//func NewApiNotReqRespData(c *gin.Context, name string) *ApiRpc[struct{}, struct{}] {
-//	return NewApiRpc[struct{}, struct{}](c, name).IgnoreRequest().IgnoreResponse()
-//}
-
-//func NewApiRpc[A, B any, C, D any, Z any](c *gin.Context, name string, client func(conn *grpc.ClientConn) Z, rpc func(client Z, ctx context.Context, req A, options ...grpc.CallOption) (B, error)) *ApiRpc[A, B, C, D, Z] {
-//	return &ApiRpc[A, B, C, D, Z]{
-//		c:      c,
-//		name:   name,
-//		client: client,
-//		rpc:    rpc,
-//	}
-//}
-//
-//type ApiRpc[A, B any, C, D any, Z any] struct {
-//	c      *gin.Context
-//	name   string
-//	client func(conn *grpc.ClientConn) Z
-//	rpc    func(client Z, ctx context.Context, req A, options ...grpc.CallOption) (B, error)
-//	before func(apiReq *C, rpcReq *C, bind func() error) error
-//	after  func(rpcResp *B, apiResp *D, bind func() error) error
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) Before(fn func(apiReq *C, rpcReq *C, bind func() error) error) {
-//	a.before = fn
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) After(fn func(rpcResp *B, apiResp *D, bind func() error) error) {
-//	a.after = fn
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) Execute() {
-//
-//}
-
-//func NewApiRpc[A, B any, C, D any, Z any](c *gin.Context, name string, client func(conn *grpc.ClientConn) Z, rpc func(client Z, ctx context.Context, req A, options ...grpc.CallOption) (B, error)) *ApiRpc[A, B, C, D, Z] {
-//	return &ApiRpc[A, B, C, D, Z]{
-//		c:      c,
-//		name:   name,
-//		client: client,
-//		rpc:    rpc,
-//	}
-//}
-//
-//type ApiRpc[A, B any, C, D any, Z any] struct {
-//	c      *gin.Context
-//	name   string
-//	client func(conn *grpc.ClientConn) Z
-//	rpc    func(client Z, ctx context.Context, req A, options ...grpc.CallOption) (B, error)
-//	before func(apiReq *C, rpcReq *C, bind func() error) error
-//	after  func(rpcResp *B, apiResp *D, bind func() error) error
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) Before(fn func(apiReq *C, rpcReq *C, bind func() error) error) {
-//	a.before = fn
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) After(fn func(rpcResp *B, apiResp *D, bind func() error) error) {
-//	a.after = fn
-//}
-//
-//func (a *ApiRpc[A, B, C, D, Z]) Execute() {
-//
-//}
-
-//func KickGroupMember(c *gin.Context) {
-//	//bind := NewApiBind[Ignore, Ignore](c)
-//
-//	//bind:= ApiBind[Ignore, Ignore](nil)
-//
-//	//var bind ApiBind[int, int]
-//	//
-//	//NewRpc(bind, "", group.NewGroupClient, group.GroupClient.KickGroupMember)
-//
-//	//common.ApiToRpc(c, &api.KickGroupMemberReq{}, nil, config.Config.RpcRegisterName.OpenImGroupName, rpc.NewGroupClient, utils.GetFuncName())
-//}
-
+// @Summary 把用户踢出群组
+// @Description 把用户踢出群组
+// @Tags 群组相关
+// @ID KickGroupMember
+// @Accept json
+// @Param token header string true "im token"
+// @Param req body api.KickGroupMemberReq true "GroupID为要操作的群ID <br> kickedUserIDList为要踢出的群用户ID <br> reason为原因"
+// @Produce json
+// @Success 0 {object} api.KickGroupMemberResp "result为结果码, -1为失败, 0为成功"
+// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+// @Router /group/kick_group [post]
 //func KickGroupMember(c *gin.Context) {
 //	params := api.KickGroupMemberReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -160,6 +91,18 @@ package group
 //	c.JSON(http.StatusOK, memberListResp)
 //}
 //
+//// @Summary 获取群成员信息
+//// @Description 获取群成员信息
+//// @Tags 群组相关
+//// @ID GetGroupMembersInfo
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetGroupMembersInfoReq true "groupID为要获取的群ID <br> memberList为要获取群成员的群ID列表"
+//// @Produce json
+//// @Success 0 {object} api.GetGroupMembersInfoResp{data=[]open_im_sdk.GroupMemberFullInfo}
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_group_members_info [post]
 //func GetGroupMembersInfo(c *gin.Context) {
 //	params := api.GetGroupMembersInfoReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -249,6 +192,18 @@ package group
 //	c.JSON(http.StatusOK, memberListResp)
 //}
 //
+//// @Summary 获取全部群成员列表
+//// @Description 获取全部群成员列表
+//// @Tags 群组相关
+//// @ID GetGroupAllMemberList
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetGroupAllMemberReq true "GroupID为要获取群成员的群ID"
+//// @Produce json
+//// @Success 0 {object} api.GetGroupAllMemberResp{data=[]open_im_sdk.GroupMemberFullInfo}
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_group_all_member_list [post]
 //func GetGroupAllMemberList(c *gin.Context) {
 //	params := api.GetGroupAllMemberReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -293,6 +248,18 @@ package group
 //	c.JSON(http.StatusOK, memberListResp)
 //}
 //
+//// @Summary 获取用户加入群列表
+//// @Description 获取用户加入群列表
+//// @Tags 群组相关
+//// @ID GetJoinedGroupList
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetJoinedGroupListReq true "fromUserID为要获取的用户ID"
+//// @Produce json
+//// @Success 0 {object} api.GetJoinedGroupListResp{data=[]open_im_sdk.GroupInfo}
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_joined_group_list [post]
 //func GetJoinedGroupList(c *gin.Context) {
 //	params := api.GetJoinedGroupListReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -336,6 +303,18 @@ package group
 //	c.JSON(http.StatusOK, GroupListResp)
 //}
 //
+//// @Summary 将用户拉入群组
+//// @Description 将用户拉入群组
+//// @Tags 群组相关
+//// @ID InviteUserToGroup
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.InviteUserToGroupReq true "groupID为要拉进的群组ID <br> invitedUserIDList为要获取群成员的群ID列表 <br> reason为原因"
+//// @Produce json
+//// @Success 0 {object} api.InviteUserToGroupResp "result为结果码, -1为失败, 0为成功""
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/invite_user_to_group [post]
 //func InviteUserToGroup(c *gin.Context) {
 //	params := api.InviteUserToGroupReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -469,6 +448,18 @@ package group
 //		config.Config.RpcRegisterName.OpenImGroupName, rpc.NewGroupClient, "CreateGroup")
 //}
 //
+//// @Summary 获取用户收到的加群信息列表
+//// @Description 获取用户收到的加群信息列表
+//// @Tags 群组相关
+//// @ID GetRecvGroupApplicationList
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetGroupApplicationListReq true "fromUserID为要获取的用户ID"
+//// @Produce json
+//// @Success 0 {object} api.GetGroupApplicationListResp{data=[]open_im_sdk.GroupRequest}
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_recv_group_applicationList [post]
 //func GetRecvGroupApplicationList(c *gin.Context) {
 //	params := api.GetGroupApplicationListReq{}
 //	if err := c.BindJSON(&params); err != nil {
@@ -510,11 +501,35 @@ package group
 //	c.JSON(http.StatusOK, resp)
 //}
 //
+//// @Summary 获取用户加群申请列表
+//// @Description 获取用户加群申请列表
+//// @Tags 群组相关
+//// @ID GetUserReqGroupApplicationList
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetUserReqGroupApplicationListReq true "userID为要获取的用户ID"
+//// @Produce json
+//// @Success 0 {object} api.GetGroupApplicationListResp{data=[]open_im_sdk.GroupRequest}
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_user_req_group_applicationList [post]
 //func GetUserReqGroupApplicationList(c *gin.Context) {
 //	common.ApiToRpc(c, &api.GetUserReqGroupApplicationListReq{}, &api.GetUserRespGroupApplicationResp{},
 //		config.Config.RpcRegisterName.OpenImGroupName, rpc.NewGroupClient, "GetGroupApplicationList")
 //}
 //
+//// @Summary 通过群ID列表获取群信息
+//// @Description 通过群ID列表获取群信息
+//// @Tags 群组相关
+//// @ID GetGroupsInfo
+//// @Accept json
+//// @Param token header string true "im token"
+//// @Param req body api.GetGroupInfoReq true "groupIDList为群ID列表"
+//// @Produce json
+//// @Success 0 {object} api.GetGroupInfoResp
+//// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+//// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+//// @Router /group/get_groups_info [post]
 //func GetGroupsInfo(c *gin.Context) {
 //	params := api.GetGroupInfoReq{}
 //	if err := c.BindJSON(&params); err != nil {

internal/api/group/group_test.go

@@ -61,13 +61,13 @@ func TestName(t *testing.T) {
 	//NewRpc(bind, "", group.NewGroupClient, temp)
 
 	var c *gin.Context
-	NewRpc(NewApiBind[api_struct.KickGroupMemberReq, api_struct.KickGroupMemberResp](c), "", group.NewGroupClient, group.GroupClient.KickGroupMember)
+	NewRpc(NewApiBind[apistruct.KickGroupMemberReq, apistruct.KickGroupMemberResp](c), "", group.NewGroupClient, group.GroupClient.KickGroupMember)
 
 }
 
 func KickGroupMember(c *gin.Context) {
 	// 默认 全部自动
-	NewRpc(NewApiBind[api_struct.KickGroupMemberReq, api_struct.KickGroupMemberResp](c), "", group.NewGroupClient, group.GroupClient.KickGroupMember).Execute()
+	NewRpc(NewApiBind[apistruct.KickGroupMemberReq, apistruct.KickGroupMemberResp](c), "", group.NewGroupClient, group.GroupClient.KickGroupMember).Execute()
 	// 可以自定义编辑请求和响应
 	a := NewRpc(NewApiBind[api_struct.KickGroupMemberReq, api_struct.KickGroupMemberResp](c), "", group.NewGroupClient, group.GroupClient.KickGroupMember)
 	a.Before(func(apiReq *api_struct.KickGroupMemberReq, rpcReq *group.KickGroupMemberReq, bind func() error) error {

internal/api/manage/management_chat.go

@@ -12,7 +12,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -174,7 +174,7 @@ func ManagementSendMsg(c *gin.Context) {
 	}
 	log.NewInfo(params.OperationID, data, params)
 	token := c.Request.Header.Get("token")
-	claims, err := token_verify.ParseToken(token, params.OperationID)
+	claims, err := tokenverify.ParseToken(token, params.OperationID)
 	if err != nil {
 		log.NewError(params.OperationID, "parse token failed", err.Error(), token)
 		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""})
@@ -307,7 +307,7 @@ func ManagementBatchSendMsg(c *gin.Context) {
 	}
 	log.NewInfo(params.OperationID, data, params)
 	token := c.Request.Header.Get("token")
-	claims, err := token_verify.ParseToken(token, params.OperationID)
+	claims, err := tokenverify.ParseToken(token, params.OperationID)
 	if err != nil {
 		log.NewError(params.OperationID, "parse token failed", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""})

internal/api/manage/management_user.go

@@ -11,7 +11,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	rpc "Open_IM/pkg/proto/user"
@@ -46,7 +46,7 @@ func GetAllUsersUid(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -101,7 +101,7 @@ func AccountCheck(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -144,7 +144,7 @@ func GetUsersOnlineStatus(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/msg/del_msg.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
@@ -46,7 +46,7 @@ func DelMsg(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -88,7 +88,7 @@ func DelSuperGroupMsg(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
 	var ok bool
 	var errInfo string
-	ok, rpcReq.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, rpcReq.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + rpcReq.OpUserID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -194,7 +194,7 @@ func ClearMsg(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -244,7 +244,7 @@ func SetMsgMinSeq(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/msg/extend_msg.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
@@ -33,7 +33,7 @@ func SetMessageReactionExtensions(c *gin.Context) {
 	}
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -82,7 +82,7 @@ func GetMessageListReactionExtensions(c *gin.Context) {
 	}
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -128,7 +128,7 @@ func AddMessageReactionExtensions(c *gin.Context) {
 	}
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -173,7 +173,7 @@ func DeleteMessageReactionExtensions(c *gin.Context) {
 	}
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/msg/get_max_min_seq.go

@@ -3,7 +3,7 @@ package msg
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
@@ -28,7 +28,7 @@ func GetSeq(c *gin.Context) {
 	}
 
 	token := c.Request.Header.Get("token")
-	if ok, err := token_verify.VerifyToken(token, params.SendID); !ok {
+	if ok, err := tokenverify.VerifyToken(token, params.SendID); !ok {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "token validate err" + err.Error()})
 		return
 	}

internal/api/msg/pull_msg.go

@@ -3,7 +3,7 @@ package msg
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	"Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -39,7 +39,7 @@ func PullMsgBySeqList(c *gin.Context) {
 	}
 
 	token := c.Request.Header.Get("token")
-	if ok, err := token_verify.VerifyToken(token, params.SendID); !ok {
+	if ok, err := tokenverify.VerifyToken(token, params.SendID); !ok {
 		if err != nil {
 			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error(), token, params.SendID)
 		}

internal/api/office/tag.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbOffice "Open_IM/pkg/proto/office"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
@@ -44,7 +44,7 @@ func GetUserTags(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -110,7 +110,7 @@ func CreateTag(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -170,7 +170,7 @@ func DeleteTag(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -230,7 +230,7 @@ func SetTag(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -290,7 +290,7 @@ func SendMsg2Tag(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -347,7 +347,7 @@ func GetTagSendLogs(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -417,7 +417,7 @@ func GetUserTagByID(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/office/work_moments.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbOffice "Open_IM/pkg/proto/office"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
@@ -44,7 +44,7 @@ func CreateOneWorkMoment(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -108,7 +108,7 @@ func DeleteOneWorkMoment(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -171,7 +171,7 @@ func LikeOneWorkMoment(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -233,7 +233,7 @@ func CommentOneWorkMoment(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -297,7 +297,7 @@ func DeleteComment(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -355,7 +355,7 @@ func GetWorkMomentByID(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -421,7 +421,7 @@ func GetUserWorkMoments(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var opUserID string
-	ok, opUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, opUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -534,7 +534,7 @@ func GetUserFriendWorkMoments(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -637,7 +637,7 @@ func SetUserWorkMomentsLevel(c *gin.Context) {
 	var ok bool
 	var errInfo string
 	var userID string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/ali_oss_credential.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"fmt"
 	openapi "github.com/alibabacloud-go/darabonba-openapi/client"
 	sts20150401 "github.com/alibabacloud-go/sts-20150401/client"
@@ -58,7 +58,7 @@ func AliOSSCredential(c *gin.Context) {
 	var ok bool
 	var userID string
 	var errInfo string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/aws_storage_credential.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"context"
 	"net/http"
@@ -30,7 +30,7 @@ func AwsStorageCredential(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	var ok bool
 	var errInfo string
-	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, _, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/fcm_update_token.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"net/http"
 
@@ -23,7 +23,7 @@ func FcmUpdateToken(c *gin.Context) {
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
 
-	ok, UserId, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, UserId, errInfo := tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/minio_storage_credential.go

@@ -6,8 +6,8 @@ import (
 	"Open_IM/pkg/common/constant"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
-	_ "Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
+	_ "Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/gin-gonic/gin"
@@ -53,7 +53,7 @@ func MinioUploadFile(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
 	var ok bool
 	var errInfo string
-	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, _, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -127,7 +127,7 @@ func MinioStorageCredential(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	var ok bool
 	var errInfo string
-	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, _, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/rtc.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"github.com/gin-gonic/gin"
 	"net/http"
@@ -21,7 +21,7 @@ func GetRTCInvitationInfo(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo := tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -66,7 +66,7 @@ func GetRTCInvitationInfoStartApp(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	var ok bool
 	var errInfo string
-	ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo := tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/third/set_app_badge.go

@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"
 	"github.com/gin-gonic/gin"
 	"net/http"
@@ -24,14 +24,14 @@ func SetAppBadge(c *gin.Context) {
 
 	var ok bool
 	var errInfo, opUserID string
-	ok, opUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, opUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": errMsg})
 		return
 	}
-	if !token_verify.CheckAccess(c, opUserID, req.FromUserID) {
+	if !tokenverify.CheckAccess(c, opUserID, req.FromUserID) {
 		log.NewError(req.OperationID, "CheckAccess false ", opUserID, req.FromUserID)
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "no permission"})
 	}

internal/api/third/tencent_cloud_storage_credential.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"github.com/fatih/structs"
 
 	//"github.com/fatih/structs"
@@ -26,7 +26,7 @@ func TencentCloudStorageCredential(c *gin.Context) {
 	var ok bool
 	var userID string
 	var errInfo string
-	ok, userID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, userID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api/user/user.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	cacheRpc "Open_IM/pkg/proto/cache"
 	pbRelay "Open_IM/pkg/proto/relay"
@@ -32,7 +32,7 @@ func GetUsersInfoFromCache(c *gin.Context) {
 	utils.CopyStructFields(req, &params)
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -80,7 +80,7 @@ func GetFriendIDListFromCache(c *gin.Context) {
 	reqPb.OperationID = req.OperationID
 	var ok bool
 	var errInfo string
-	ok, reqPb.UserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.UserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -122,7 +122,7 @@ func GetBlackIDListFromCache(c *gin.Context) {
 	reqPb.OperationID = req.OperationID
 	var ok bool
 	var errInfo string
-	ok, reqPb.UserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, reqPb.UserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -172,7 +172,7 @@ func GetUsersPublicInfo(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -232,7 +232,7 @@ func UpdateUserInfo(c *gin.Context) {
 	req.OperationID = params.OperationID
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -283,7 +283,7 @@ func SetGlobalRecvMessageOpt(c *gin.Context) {
 	req.OperationID = params.OperationID
 	var ok bool
 	var errInfo string
-	ok, req.UserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.UserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -336,7 +336,7 @@ func GetSelfUserInfo(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(params.OperationID, errMsg)
@@ -397,7 +397,7 @@ func GetUsersOnlineStatus(c *gin.Context) {
 
 	var ok bool
 	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, req.OpUserID, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
@@ -471,7 +471,7 @@ func GetUsers(c *gin.Context) {
 	}
 	var ok bool
 	var errInfo string
-	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	ok, _, errInfo = tokenverify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)

internal/api2rpc/api.go

@@ -4,7 +4,6 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/getcdv3"
 	utils2 "Open_IM/pkg/utils"
 	"context"
 	"fmt"

internal/cmsapi/group/group.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/getcdv3"
-	commonPb "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"net/http"
@@ -29,7 +29,7 @@ func GetGroups(c *gin.Context) {
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.Pagination = &commonPb.RequestPagination{}
+	reqPb.Pagination = &common.RequestPagination{}
 	utils.CopyStructFields(&reqPb.Pagination, req)
 	etcdConn := rpc.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
 	if etcdConn == nil {
@@ -74,7 +74,7 @@ func GetGroupMembers(c *gin.Context) {
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.Pagination = &commonPb.RequestPagination{
+	reqPb.Pagination = &common.RequestPagination{
 		PageNumber: int32(req.PageNumber),
 		ShowNumber: int32(req.ShowNumber),
 	}

internal/cmsapi/router.go

@@ -1,4 +1,4 @@
-package cms_api
+package cmsapi
 
 import (
 	"Open_IM/internal/cms_api/admin"

internal/cmsapi/user/user.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/getcdv3"
 	pbAdminCms "Open_IM/pkg/proto/admin_cms"
-	commonPb "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdk_ws"
 	pb "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
@@ -19,8 +19,8 @@ import (
 
 func GetUserIDByEmailAndPhoneNumber(c *gin.Context) {
 	var (
-		req    cms_struct.GetUserIDByEmailAndPhoneNumberRequest
-		resp   cms_struct.GetUserIDByEmailAndPhoneNumberResponse
+		req    cmsstruct.GetUserIDByEmailAndPhoneNumberRequest
+		resp   cmsstruct.GetUserIDByEmailAndPhoneNumberResponse
 		reqPb  pbAdminCms.GetUserIDByEmailAndPhoneNumberReq
 		respPb *pbAdminCms.GetUserIDByEmailAndPhoneNumberResp
 	)

internal/common/check/access.go

@@ -1,7 +1,7 @@
 package check
 
 import (
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"context"
 )
 
@@ -10,5 +10,5 @@ func Access(ctx context.Context, ownerUserID string) (err error) {
 	if err != nil {
 		return err
 	}
-	return token_verify.CheckAccessV3(ctx, ownerUserID)
+	return tokenverify.CheckAccessV3(ctx, ownerUserID)
 }

internal/common/rpc_server/a.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/internal/common/network"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	discoveryRegistry "Open_IM/pkg/discovery_registry"
+	discoveryRegistry "Open_IM/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/openKeeper"
 	"net"
 	"strconv"

internal/crontask/cron_task.go

@@ -45,7 +45,6 @@ func StartCronTask(userID, workingGroupID string) {
 	}
 }
 
-
 func getCronTaskOperationID() string {
 	return cronTaskOperationID + utils.OperationIDGenerator()
 }

internal/demo/register/CreateTencentSMSClient_test.go

@@ -1,14 +0,0 @@
-package register
-
-import (
-	"fmt"
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func Test_CreateTencentSMSClient(t *testing.T) {
-	result, err := CreateTencentSMSClient()
-	assert.Nil(t, err)
-	fmt.Println("return result is ", result)
-
-}

internal/demo/register/ali_sms.go

@@ -1,59 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	"errors"
-	"fmt"
-	openapi "github.com/alibabacloud-go/darabonba-openapi/client"
-	dysmsapi20170525 "github.com/alibabacloud-go/dysmsapi-20170525/v2/client"
-	"github.com/alibabacloud-go/tea/tea"
-)
-
-type AliSMS struct {
-	client *dysmsapi20170525.Client
-}
-
-func (a AliSMS) SendSms(code int, phoneNumber string) (resp interface{}, err error) {
-	sendSmsRequest := &dysmsapi20170525.SendSmsRequest{
-		PhoneNumbers:  tea.String(phoneNumber),
-		SignName:      tea.String(config.Config.Demo.AliSMSVerify.SignName),
-		TemplateCode:  tea.String(config.Config.Demo.AliSMSVerify.VerificationCodeTemplateCode),
-		TemplateParam: tea.String(fmt.Sprintf("{\"code\":\"%d\"}", code)),
-	}
-	response, err := a.client.SendSms(sendSmsRequest)
-	if err != nil {
-		//log.NewError(params.OperationID, "sendSms error", account, "err", err.Error())
-		//c.JSON(http.StatusOK, gin.H{"errCode": constant.SmsSendCodeErr, "errMsg": "Enter the superCode directly in the verification code box, SuperCode can be configured in config.xml"})
-		return resp, err
-	}
-	if *response.Body.Code != "OK" {
-		//log.NewError(params.OperationID, "alibabacloud sendSms error", account, "err", response.Body.Code, response.Body.Message)
-		//c.JSON(http.StatusOK, gin.H{"errCode": constant.SmsSendCodeErr, "errMsg": "Enter the superCode directly in the verification code box, SuperCode can be configured in config.xml"})
-		//return
-		return resp, errors.New("alibabacloud sendSms error")
-	}
-	return resp, nil
-}
-
-func NewAliSMS() (*AliSMS, error) {
-	var a AliSMS
-	client, err := createClient(tea.String(config.Config.Demo.AliSMSVerify.AccessKeyID), tea.String(config.Config.Demo.AliSMSVerify.AccessKeySecret))
-	if err != nil {
-		return &a, err
-	}
-	a.client = client
-	return &a, nil
-}
-func createClient(accessKeyId *string, accessKeySecret *string) (result *dysmsapi20170525.Client, err error) {
-	c := &openapi.Config{
-		// 您的AccessKey ID
-		AccessKeyId: accessKeyId,
-		// 您的AccessKey Secret
-		AccessKeySecret: accessKeySecret,
-	}
-	// 访问的域名
-	c.Endpoint = tea.String("dysmsapi.aliyuncs.com")
-	result = &dysmsapi20170525.Client{}
-	result, err = dysmsapi20170525.NewClient(c)
-	return result, err
-}

internal/demo/register/login.go

@@ -1,94 +0,0 @@
-package register
-
-import (
-	api "Open_IM/pkg/api_struct"
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	http2 "Open_IM/pkg/common/http"
-	"Open_IM/pkg/common/log"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-)
-
-type ParamsLogin struct {
-	UserID      string `json:"userID"`
-	Email       string `json:"email"`
-	PhoneNumber string `json:"phoneNumber"`
-	Password    string `json:"password"`
-	Platform    int32  `json:"platform"`
-	OperationID string `json:"operationID" binding:"required"`
-	AreaCode    string `json:"areaCode"`
-}
-
-func Login(c *gin.Context) {
-	params := ParamsLogin{}
-	if err := c.BindJSON(&params); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
-		return
-	}
-	var account string
-	if params.Email != "" {
-		account = params.Email
-	} else if params.PhoneNumber != "" {
-		account = params.PhoneNumber
-	} else {
-		account = params.UserID
-	}
-
-	r, err := im_mysql_model.GetRegister(account, params.AreaCode, params.UserID)
-	if err != nil {
-		log.NewError(params.OperationID, "user have not register", params.Password, account, err.Error())
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "Mobile phone number is not registered"})
-		return
-	}
-	if r.Password != params.Password {
-		log.NewError(params.OperationID, "password  err", params.Password, account, r.Password, r.Account)
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.PasswordErr, "errMsg": "password err"})
-		return
-	}
-	var userID string
-	if r.UserID != "" {
-		userID = r.UserID
-	} else {
-		userID = r.Account
-	}
-	ip := c.Request.Header.Get("X-Forward-For")
-	if ip == "" {
-		ip = c.ClientIP()
-	}
-	url := fmt.Sprintf("%s/auth/user_token", config.Config.Demo.ImAPIURL)
-	openIMGetUserToken := api.UserTokenReq{}
-	openIMGetUserToken.OperationID = params.OperationID
-	openIMGetUserToken.Platform = params.Platform
-	openIMGetUserToken.Secret = config.Config.Secret
-	openIMGetUserToken.UserID = userID
-	openIMGetUserToken.LoginIp = ip
-	loginIp := c.Request.Header.Get("X-Forward-For")
-	if loginIp == "" {
-		loginIp = c.ClientIP()
-	}
-	openIMGetUserToken.LoginIp = loginIp
-	openIMGetUserTokenResp := api.UserTokenResp{}
-	bMsg, err := http2.Post(url, openIMGetUserToken, 2)
-	if err != nil {
-		log.NewError(params.OperationID, "request openIM get user token error", account, "err", err.Error())
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.GetIMTokenErr, "errMsg": err.Error()})
-		return
-	}
-	err = json.Unmarshal(bMsg, &openIMGetUserTokenResp)
-	if err != nil || openIMGetUserTokenResp.ErrCode != 0 {
-		log.NewError(params.OperationID, "request get user token", account, "err", "")
-		if openIMGetUserTokenResp.ErrCode == constant.LoginLimit {
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.LoginLimit, "errMsg": "用户登录被限制"})
-		} else {
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.GetIMTokenErr, "errMsg": ""})
-		}
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMGetUserTokenResp.UserToken})
-
-}

internal/demo/register/register_import_friend.go

@@ -1,52 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/getcdv3"
-	pbFriend "Open_IM/pkg/proto/friend"
-	"Open_IM/pkg/utils"
-	"context"
-	"strings"
-)
-
-var ChImportFriend chan *pbFriend.ImportFriendReq
-
-func init() {
-	ChImportFriend = make(chan *pbFriend.ImportFriendReq, 1000)
-}
-
-func ImportFriendRoutine() {
-	for {
-		req := <-ChImportFriend
-		go func() {
-			friendUserIDList, err := imdb.GetRegisterAddFriendList(0, 0)
-			if err != nil {
-				log.NewError(req.OperationID, utils.GetSelfFuncName(), req, err.Error())
-				return
-			}
-			log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "ImportFriendRoutine IDList", friendUserIDList)
-			if len(friendUserIDList) == 0 {
-				log.NewError(req.OperationID, utils.GetSelfFuncName(), "len==0")
-				return
-			}
-			req.FriendUserIDList = friendUserIDList
-			etcdConn := rpc.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.OperationID)
-			if etcdConn == nil {
-				errMsg := req.OperationID + "getcdv3.GetConn == nil"
-				log.NewError(req.OperationID, errMsg)
-				return
-			}
-			client := pbFriend.NewFriendClient(etcdConn)
-			rpcResp, err := client.ImportFriend(context.Background(), req)
-			if err != nil {
-				log.NewError(req.OperationID, "ImportFriend failed ", err.Error(), req.String())
-				return
-			}
-			if rpcResp.CommonResp.ErrCode != 0 {
-				log.NewError(req.OperationID, "ImportFriend failed ", rpcResp)
-			}
-		}()
-	}
-}

internal/demo/register/reset_password.go

@@ -1,60 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
-	"github.com/gin-gonic/gin"
-	"net/http"
-)
-
-type resetPasswordRequest struct {
-	VerificationCode string `json:"verificationCode" binding:"required"`
-	Email            string `json:"email"`
-	PhoneNumber      string `json:"phoneNumber"`
-	NewPassword      string `json:"newPassword" binding:"required"`
-	AreaCode         string `json:"areaCode"`
-	OperationID      string `json:"operationID"`
-}
-
-func ResetPassword(c *gin.Context) {
-	var (
-		req resetPasswordRequest
-	)
-	if err := c.BindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
-		return
-	}
-	var account string
-	if req.Email != "" {
-		account = req.Email
-	} else {
-		account = req.PhoneNumber
-	}
-
-	if (config.Config.Demo.UseSuperCode && req.VerificationCode != config.Config.Demo.SuperCode) || !config.Config.Demo.UseSuperCode {
-		accountKey := req.AreaCode + account + "_" + constant.VerificationCodeForResetSuffix
-		v, err := db.DB.GetAccountCode(accountKey)
-		if err != nil || v != req.VerificationCode {
-			log.NewError(req.OperationID, "password Verification code error", account, req.VerificationCode, v)
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code error!"})
-			return
-		}
-	}
-	user, err := im_mysql_model.GetRegister(account, req.AreaCode, "")
-	if err != nil || user.Account == "" {
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "get register error", err.Error())
-		}
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "user not register!"})
-		return
-	}
-	if err := im_mysql_model.ResetPassword(account, req.NewPassword); err != nil {
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.ResetPasswordFailed, "errMsg": "reset password failed: " + err.Error()})
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "reset password success"})
-}

internal/demo/register/send_code.go

@@ -1,195 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/utils"
-	"fmt"
-	"math/rand"
-	"net/http"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"gopkg.in/gomail.v2"
-)
-
-var sms SMS
-
-func init() {
-	var err error
-	if config.Config.Demo.AliSMSVerify.Enable {
-		sms, err = NewAliSMS()
-		if err != nil {
-			panic(err)
-		}
-	} else {
-		sms, err = NewTencentSMS()
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-type paramsVerificationCode struct {
-	Email          string `json:"email"`
-	PhoneNumber    string `json:"phoneNumber"`
-	OperationID    string `json:"operationID" binding:"required"`
-	UsedFor        int    `json:"usedFor"`
-	AreaCode       string `json:"areaCode"`
-	InvitationCode string `json:"invitationCode"`
-}
-
-func SendVerificationCode(c *gin.Context) {
-	params := paramsVerificationCode{}
-
-	if err := c.BindJSON(&params); err != nil {
-		log.NewError("", "BindJSON failed", "err:", err.Error(), "phoneNumber", params.PhoneNumber, "email", params.Email)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
-		return
-	}
-	operationID := params.OperationID
-	if operationID == "" {
-		operationID = utils.OperationIDGenerator()
-	}
-	log.Info(operationID, "SendVerificationCode args: ", "area code: ", params.AreaCode, "Phone Number: ", params.PhoneNumber)
-	var account string
-	if params.Email != "" {
-		account = params.Email
-	} else {
-		account = params.PhoneNumber
-	}
-	var accountKey = params.AreaCode + account
-	if params.UsedFor == 0 {
-		params.UsedFor = constant.VerificationCodeForRegister
-	}
-	switch params.UsedFor {
-	case constant.VerificationCodeForRegister:
-		_, err := im_mysql_model.GetRegister(account, params.AreaCode, "")
-		if err == nil {
-			log.NewError(params.OperationID, "The phone number has been registered", params)
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"})
-			return
-		}
-		//需要邀请码
-		if config.Config.Demo.NeedInvitationCode {
-			err = im_mysql_model.CheckInvitationCode(params.InvitationCode)
-			if err != nil {
-				log.NewError(params.OperationID, "邀请码错误", params)
-				c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "邀请码错误"})
-				return
-			}
-		}
-		accountKey = accountKey + "_" + constant.VerificationCodeForRegisterSuffix
-		ok, err := db.DB.JudgeAccountEXISTS(accountKey)
-		if ok || err != nil {
-			log.NewError(params.OperationID, "Repeat send code", params, accountKey)
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.RepeatSendCode, "errMsg": "Repeat send code"})
-			return
-		}
-
-	case constant.VerificationCodeForReset:
-		accountKey = accountKey + "_" + constant.VerificationCodeForResetSuffix
-		ok, err := db.DB.JudgeAccountEXISTS(accountKey)
-		if ok || err != nil {
-			log.NewError(params.OperationID, "Repeat send code", params, accountKey)
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.RepeatSendCode, "errMsg": "Repeat send code"})
-			return
-		}
-	}
-	rand.Seed(time.Now().UnixNano())
-	code := 100000 + rand.Intn(900000)
-	log.NewInfo(params.OperationID, params.UsedFor, "begin store redis", accountKey, code)
-	err := db.DB.SetAccountCode(accountKey, code, config.Config.Demo.CodeTTL)
-	if err != nil {
-		log.NewError(params.OperationID, "set redis error", accountKey, "err", err.Error())
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.SmsSendCodeErr, "errMsg": "Enter the superCode directly in the verification code box, SuperCode can be configured in config.xml"})
-		return
-	}
-	log.NewDebug(params.OperationID, config.Config.Demo)
-	if params.Email != "" {
-		m := gomail.NewMessage()
-		m.SetHeader(`From`, config.Config.Demo.Mail.SenderMail)
-		m.SetHeader(`To`, []string{account}...)
-		m.SetHeader(`Subject`, config.Config.Demo.Mail.Title)
-		m.SetBody(`text/html`, fmt.Sprintf("%d", code))
-		if err := gomail.NewDialer(config.Config.Demo.Mail.SmtpAddr, config.Config.Demo.Mail.SmtpPort, config.Config.Demo.Mail.SenderMail, config.Config.Demo.Mail.SenderAuthorizationCode).DialAndSend(m); err != nil {
-			log.Error(params.OperationID, "send mail error", account, err.Error())
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.MailSendCodeErr, "errMsg": ""})
-			return
-		}
-	} else {
-		//client, err := CreateClient(tea.String(config.Config.Demo.AliSMSVerify.AccessKeyID), tea.String(config.Config.Demo.AliSMSVerify.AccessKeySecret))
-		//if err != nil {
-		//	log.NewError(params.OperationID, "create sendSms client err", "err", err.Error())
-		//	c.JSON(http.StatusOK, gin.H{"errCode": constant.SmsSendCodeErr, "errMsg": "Enter the superCode directly in the verification code box, SuperCode can be configured in config.xml"})
-		//	return
-		//}
-
-		//sendSmsRequest := &dysmsapi20170525.SendSmsRequest{
-		//	PhoneNumbers:  tea.String(accountKey),
-		//	SignName:      tea.String(config.Config.Demo.AliSMSVerify.SignName),
-		//	TemplateCode:  tea.String(config.Config.Demo.AliSMSVerify.VerificationCodeTemplateCode),
-		//	TemplateParam: tea.String(fmt.Sprintf("{\"code\":\"%d\"}", code)),
-		//}
-		response, err := sms.SendSms(code, params.AreaCode+params.PhoneNumber)
-		//response, err := client.SendSms(sendSmsRequest)
-		if err != nil {
-			log.NewError(params.OperationID, "sendSms error", account, "err", err.Error(), response)
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.SmsSendCodeErr, "errMsg": "Enter the superCode directly in the verification code box, SuperCode can be configured in config.xml"})
-			return
-		}
-	}
-	log.Debug(params.OperationID, "send sms success", code, accountKey)
-	data := make(map[string]interface{})
-	data["account"] = account
-	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "Verification code has been set!", "data": data})
-}
-
-//func CreateClient(accessKeyId *string, accessKeySecret *string) (result *dysmsapi20170525.Client, err error) {
-//	c := &openapi.Config{
-//		// 您的AccessKey ID
-//		AccessKeyId: accessKeyId,
-//		// 您的AccessKey Secret
-//		AccessKeySecret: accessKeySecret,
-//	}
-//
-//	// 访问的域名
-//	c.Endpoint = tea.String("dysmsapi.aliyuncs.com")
-//	result = &dysmsapi20170525.Client{}
-//	result, err = dysmsapi20170525.NewClient(c)
-//	return result, err
-//}
-//func CreateTencentSMSClient() (string, error) {
-//	credential := common.NewCredential(
-//		config.Config.Demo.TencentSMS.SecretID,
-//		config.Config.Demo.TencentSMS.SecretKey,
-//	)
-//	cpf := profile.NewClientProfile()
-//	client, err := sms.NewClient(credential, config.Config.Demo.TencentSMS.Region, cpf)
-//	if err != nil {
-//		return "", err
-//	}
-//	request := sms.NewSendSmsRequest()
-//	request.SmsSdkAppId = common.StringPtr(config.Config.Demo.TencentSMS.AppID)
-//	request.SignName = common.StringPtr(config.Config.Demo.TencentSMS.SignName)
-//	request.TemplateId = common.StringPtr(config.Config.Demo.TencentSMS.VerificationCodeTemplateCode)
-//	request.TemplateParamSet = common.StringPtrs([]string{"666666"})
-//	request.PhoneNumberSet = common.StringPtrs([]string{"+971588232183"})
-//	// 通过client对象调用想要访问的接口，需要传入请求对象
-//	response, err := client.SendSms(request)
-//	// 非SDK异常，直接失败。实际代码中可以加入其他的处理。
-//	if err != nil {
-//		log.Error("test", "send code to tencent err", err.Error())
-//	}
-//	// 处理异常
-//	if _, ok := err.(*errors.TencentCloudSDKError); ok {
-//		log.Error("test", "An API error has returned:", err.Error())
-//		return "", err
-//	}
-//
-//	b, _ := json.Marshal(response.Response)
-//	return string(b), nil
-//}

internal/demo/register/set_password.go

@@ -1,189 +0,0 @@
-package register
-
-import (
-	api "Open_IM/pkg/api_struct"
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	http2 "Open_IM/pkg/common/http"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
-	pbFriend "Open_IM/pkg/proto/friend"
-	"Open_IM/pkg/utils"
-	"encoding/json"
-	"math/big"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-type ParamsSetPassword struct {
-	UserID           string `json:"userID"`
-	Email            string `json:"email"`
-	Nickname         string `json:"nickname"`
-	PhoneNumber      string `json:"phoneNumber"`
-	Password         string `json:"password" binding:"required"`
-	VerificationCode string `json:"verificationCode"`
-	Platform         int32  `json:"platform" binding:"required,min=1,max=12"`
-	Ex               string `json:"ex"`
-	FaceURL          string `json:"faceURL"`
-	OperationID      string `json:"operationID" binding:"required"`
-	AreaCode         string `json:"areaCode"`
-	InvitationCode   string `json:"invitationCode"`
-	Gender           int32  `json:"gender"`
-	Birth            int32  `json:"birth"`
-}
-
-func SetPassword(c *gin.Context) {
-	params := ParamsSetPassword{}
-	if err := c.BindJSON(&params); err != nil {
-		log.NewError(params.OperationID, utils.GetSelfFuncName(), "bind json failed", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
-		return
-	}
-	ip := c.Request.Header.Get("X-Forward-For")
-	if ip == "" {
-		ip = c.ClientIP()
-	}
-	log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "ip:", ip)
-
-	ok, opUserID, _ := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), params.OperationID)
-	if !ok || !utils.IsContain(opUserID, config.Config.Manager.AppManagerUid) {
-		Limited, LimitError := imdb.IsLimitRegisterIp(ip)
-		if LimitError != nil {
-			log.Error(params.OperationID, utils.GetSelfFuncName(), LimitError, ip)
-			c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError.Error()})
-			return
-		}
-		if Limited {
-			log.NewInfo(params.OperationID, utils.GetSelfFuncName(), "is limited", ip, "params:", params)
-			c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.RegisterLimit, "errMsg": "limited"})
-			return
-		}
-	}
-	openIMRegisterReq := api.UserRegisterReq{}
-	var account string
-	if params.Email != "" {
-		account = params.Email
-		openIMRegisterReq.Email = params.Email
-	} else if params.PhoneNumber != "" {
-		account = params.PhoneNumber
-		openIMRegisterReq.PhoneNumber = params.PhoneNumber
-	} else {
-		account = params.UserID
-	}
-	if params.Nickname == "" {
-		params.Nickname = account
-	}
-	if params.UserID == "" {
-		if (config.Config.Demo.UseSuperCode && params.VerificationCode != config.Config.Demo.SuperCode) || !config.Config.Demo.UseSuperCode {
-			accountKey := params.AreaCode + account + "_" + constant.VerificationCodeForRegisterSuffix
-			v, err := db.DB.GetAccountCode(accountKey)
-			if err != nil || v != params.VerificationCode {
-				log.NewError(params.OperationID, "password Verification code error", account, params.VerificationCode)
-				data := make(map[string]interface{})
-				data["PhoneNumber"] = account
-				c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code error!", "data": data})
-				return
-			}
-		}
-		if config.Config.Demo.NeedInvitationCode && params.InvitationCode != "" {
-			err := imdb.CheckInvitationCode(params.InvitationCode)
-			if err != nil {
-				c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "InvitationCode error"})
-				return
-			}
-		}
-	}
-	//userID := utils.Base64Encode(account)
-	var userID string
-	if params.UserID == "" {
-		userID = utils.Md5(params.OperationID + strconv.FormatInt(time.Now().UnixNano(), 10))
-		bi := big.NewInt(0)
-		bi.SetString(userID[0:8], 16)
-		userID = bi.String()
-	} else {
-		userID = params.UserID
-	}
-	url := config.Config.Demo.ImAPIURL + "/auth/user_register"
-	openIMRegisterReq.OperationID = params.OperationID
-	openIMRegisterReq.Platform = params.Platform
-	openIMRegisterReq.UserID = userID
-	openIMRegisterReq.Nickname = params.Nickname
-	openIMRegisterReq.Secret = config.Config.Secret
-	openIMRegisterReq.FaceURL = params.FaceURL
-	openIMRegisterReq.Gender = params.Gender
-	openIMRegisterReq.Birth = uint32(params.Birth)
-	openIMRegisterResp := api.UserRegisterResp{}
-	log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "register req:", openIMRegisterReq)
-	bMsg, err := http2.Post(url, openIMRegisterReq, 2)
-	if err != nil {
-		log.NewError(params.OperationID, "request openIM register error", account, "err", err.Error())
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()})
-		return
-	}
-	err = json.Unmarshal(bMsg, &openIMRegisterResp)
-	if err != nil || openIMRegisterResp.ErrCode != 0 {
-		log.NewError(params.OperationID, "request openIM register error", account, "err", "resp: ", openIMRegisterResp.ErrCode)
-		if err != nil {
-			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": "register limit"})
-			return
-		}
-		if openIMRegisterResp.ErrCode != 0 {
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": "register failed: " + openIMRegisterResp.ErrMsg})
-			return
-		}
-	}
-	log.Info(params.OperationID, "begin store mysql", account, params.Password, "info", params.FaceURL, params.Nickname)
-	err = imdb.SetPassword(account, params.Password, params.Ex, userID, params.AreaCode, ip)
-	if err != nil {
-		log.NewError(params.OperationID, "set phone number password error", account, "err", err.Error())
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()})
-		return
-	}
-	if config.Config.Demo.NeedInvitationCode && params.InvitationCode != "" {
-		//判断一下验证码的使用情况
-		LockSucc := imdb.TryLockInvitationCode(params.InvitationCode, userID)
-		if LockSucc {
-			imdb.FinishInvitationCode(params.InvitationCode, userID)
-		}
-	}
-	if err := imdb.InsertIpRecord(userID, ip); err != nil {
-		log.NewError(params.OperationID, utils.GetSelfFuncName(), userID, ip, err.Error())
-	}
-
-	log.Info(params.OperationID, "end  setuserInfo", account, params.Password)
-	// demo onboarding
-	if params.UserID == "" && config.Config.Demo.OnboardProcess {
-		select {
-		case Ch <- OnboardingProcessReq{
-			OperationID: params.OperationID,
-			UserID:      userID,
-			NickName:    params.Nickname,
-			FaceURL:     params.FaceURL,
-			PhoneNumber: params.AreaCode + params.PhoneNumber,
-			Email:       params.Email,
-		}:
-		case <-time.After(time.Second * 2):
-			log.NewWarn(params.OperationID, utils.GetSelfFuncName(), "to ch timeOut")
-		}
-	}
-
-	// register add friend
-	select {
-	case ChImportFriend <- &pbFriend.ImportFriendReq{
-		OperationID: params.OperationID,
-		FromUserID:  userID,
-		OpUserID:    config.Config.Manager.AppManagerUid[0],
-	}:
-	case <-time.After(time.Second * 2):
-		log.NewWarn(params.OperationID, utils.GetSelfFuncName(), "to ChImportFriend timeOut")
-	}
-
-	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken})
-	return
-}

internal/demo/register/sms_interface.go

@@ -1,5 +0,0 @@
-package register
-
-type SMS interface {
-	SendSms(code int, phoneNumber string) (resp interface{}, err error)
-}

internal/demo/register/tencent_sms.go

@@ -1,54 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
-	"encoding/json"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
-	v20210111 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms/v20210111"
-)
-
-type TencentSMS struct {
-	client *v20210111.Client
-}
-
-func (t TencentSMS) SendSms(code int, phoneNumber string) (resp interface{}, err error) {
-	request := v20210111.NewSendSmsRequest()
-	request.SmsSdkAppId = common.StringPtr(config.Config.Demo.TencentSMS.AppID)
-	request.SignName = common.StringPtr(config.Config.Demo.TencentSMS.SignName)
-	request.TemplateId = common.StringPtr(config.Config.Demo.TencentSMS.VerificationCodeTemplateCode)
-	request.TemplateParamSet = common.StringPtrs([]string{utils.IntToString(code)})
-	request.PhoneNumberSet = common.StringPtrs([]string{phoneNumber})
-	// 通过client对象调用想要访问的接口，需要传入请求对象
-	response, err := t.client.SendSms(request)
-	// 非SDK异常，直接失败。实际代码中可以加入其他的处理。
-	if err != nil {
-		return response, err
-	}
-	// 处理异常
-	if _, ok := err.(*errors.TencentCloudSDKError); ok {
-		return response, err
-	}
-	b, _ := json.Marshal(response.Response)
-	log.Debug("tencent send message is ", code, phoneNumber, string(b))
-	return response, nil
-}
-
-func NewTencentSMS() (*TencentSMS, error) {
-	var a TencentSMS
-	credential := common.NewCredential(
-		config.Config.Demo.TencentSMS.SecretID,
-		config.Config.Demo.TencentSMS.SecretKey,
-	)
-	cpf := profile.NewClientProfile()
-	client, err := v20210111.NewClient(credential, config.Config.Demo.TencentSMS.Region, cpf)
-	if err != nil {
-		return &a, err
-	}
-	a.client = client
-	return &a, nil
-
-}

internal/demo/register/verify.go

@@ -1,86 +0,0 @@
-package register
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/utils"
-	"github.com/gin-gonic/gin"
-	"net/http"
-)
-
-type paramsCertification struct {
-	Email            string `json:"email"`
-	PhoneNumber      string `json:"phoneNumber"`
-	VerificationCode string `json:"verificationCode"`
-	OperationID      string `json:"operationID" binding:"required"`
-	UsedFor          int    `json:"usedFor"`
-	AreaCode         string `json:"areaCode"`
-}
-
-func Verify(c *gin.Context) {
-	params := paramsCertification{}
-	operationID := params.OperationID
-
-	if err := c.BindJSON(&params); err != nil {
-		log.NewError(operationID, "request params json parsing failed", "", "err", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
-		return
-	}
-	if operationID == "" {
-		operationID = utils.OperationIDGenerator()
-	}
-	log.NewInfo(operationID, "recv req: ", params)
-
-	var account string
-	if params.Email != "" {
-		account = params.Email
-	} else {
-		account = params.AreaCode + params.PhoneNumber
-	}
-
-	if config.Config.Demo.UseSuperCode && params.VerificationCode == config.Config.Demo.SuperCode {
-		log.NewInfo(params.OperationID, "Super Code Verified successfully", account)
-		data := make(map[string]interface{})
-		data["account"] = account
-		data["verificationCode"] = params.VerificationCode
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "Verified successfully!", "data": data})
-		return
-	}
-	log.NewInfo(params.OperationID, " params.VerificationCode != config.Config.Demo.SuperCode", params.VerificationCode, config.Config.Demo)
-	log.NewInfo(params.OperationID, "begin get form redis", account)
-	if params.UsedFor == 0 {
-		params.UsedFor = constant.VerificationCodeForRegister
-	}
-	var accountKey string
-	switch params.UsedFor {
-	case constant.VerificationCodeForRegister:
-		accountKey = account + "_" + constant.VerificationCodeForRegisterSuffix
-	case constant.VerificationCodeForReset:
-		accountKey = account + "_" + constant.VerificationCodeForResetSuffix
-	}
-
-	code, err := db.DB.GetAccountCode(accountKey)
-	log.NewInfo(params.OperationID, "redis phone number and verificating Code", "key: ", accountKey, "code: ", code, "params: ", params)
-	if err != nil {
-		log.NewError(params.OperationID, "Verification code expired", accountKey, "err", err.Error())
-		data := make(map[string]interface{})
-		data["account"] = account
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code expired!", "data": data})
-		return
-	}
-	if params.VerificationCode == code {
-		log.Info(params.OperationID, "Verified successfully", account)
-		data := make(map[string]interface{})
-		data["account"] = account
-		data["verificationCode"] = params.VerificationCode
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "Verified successfully!", "data": data})
-		return
-	} else {
-		log.Info(params.OperationID, "Verification code error", account, params.VerificationCode)
-		data := make(map[string]interface{})
-		data["account"] = account
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code error!", "data": data})
-	}
-}

internal/msggateway/gate/relay_rpc_server.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
@@ -145,7 +145,7 @@ func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgRe
 }
 func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUsersOnlineStatusReq) (*pbRelay.GetUsersOnlineStatusResp, error) {
 	log.NewInfo(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String())
-	if !token_verify.IsManagerUserID(req.OpUserID) {
+	if !tokenverify.IsManagerUserID(req.OpUserID) {
 		log.NewError(req.OperationID, "no permission GetUsersOnlineStatus ", req.OpUserID)
 		return &pbRelay.GetUsersOnlineStatusResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}

internal/msggateway/gate/ws_server.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"
@@ -444,7 +444,7 @@ func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operation
 	status := http.StatusUnauthorized
 	query := r.URL.Query()
 	if len(query["token"]) != 0 && len(query["sendID"]) != 0 && len(query["platformID"]) != 0 {
-		if ok, err, msg := token_verify.WsVerifyToken(query["token"][0], query["sendID"][0], query["platformID"][0], operationID); !ok {
+		if ok, err, msg := tokenverify.WsVerifyToken(query["token"][0], query["sendID"][0], query["platformID"][0], operationID); !ok {
 			if errors.Is(err, constant.ErrTokenExpired) {
 				status = int(constant.ErrTokenExpired.ErrCode)
 			}

internal/msgtransfer/logic/modify_msg_handler.go

@@ -61,7 +61,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg
 			continue
 		}
 		if msgDataToMQ.MsgData.ContentType == constant.ReactionMessageModifier {
-			notification := &api_struct.ReactionMessageModifierNotification{}
+			notification := &apistruct.ReactionMessageModifierNotification{}
 			if err := json.Unmarshal(msgDataToMQ.MsgData.Content, notification); err != nil {
 				continue
 			}
@@ -104,7 +104,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg
 				}
 			}
 		} else if msgDataToMQ.MsgData.ContentType == constant.ReactionMessageDeleter {
-			notification := &api_struct.ReactionMessageDeleteNotification{}
+			notification := &apistruct.ReactionMessageDeleteNotification{}
 			if err := json.Unmarshal(msgDataToMQ.MsgData.Content, notification); err != nil {
 				continue
 			}
@@ -116,7 +116,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg
 
 }
 
-func UnMarshallSetReactionMsgContent(content []byte) (notification *api_struct.ReactionMessageModifierNotification, err error) {
+func UnMarshallSetReactionMsgContent(content []byte) (notification *apistruct.ReactionMessageModifierNotification, err error) {
 
 	return notification, nil
 }

internal/push/logic/callback.go

@@ -7,12 +7,12 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
-	commonPb "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	http2 "net/http"
 )
 
-func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.MsgData, offlinePushUserIDList *[]string) cbApi.CommonCallbackResp {
+func callbackOfflinePush(operationID string, userIDList []string, msg *common.MsgData, offlinePushUserIDList *[]string) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackOfflinePush.Enable {
 		return callbackResp
@@ -60,7 +60,7 @@ func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.
 	return callbackResp
 }
 
-func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.MsgData) cbApi.CommonCallbackResp {
+func callbackOnlinePush(operationID string, userIDList []string, msg *common.MsgData) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackOnlinePush.Enable || utils.IsContain(msg.SendID, userIDList) {
 		return callbackResp
@@ -104,7 +104,7 @@ func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.M
 	return callbackResp
 }
 
-func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg *commonPb.MsgData, pushToUserList *[]string) cbApi.CommonCallbackResp {
+func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg *common.MsgData, pushToUserList *[]string) cbApi.CommonCallbackResp {
 	log.Debug(operationID, utils.GetSelfFuncName(), groupID, msg.String(), pushToUserList)
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable {

internal/rpc/admin_cms/admin_cms.go

@@ -8,11 +8,10 @@ import (
 	"Open_IM/pkg/common/db/relation"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/getcdv3"
 	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
-	server_api_params "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdk_ws"
 
 	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 
@@ -45,15 +44,15 @@ func NewAdminCMSServer(port int) *adminCMSServer {
 	admin := &adminCMSServer{
 		rpcPort:         port,
 		rpcRegisterName: config.Config.RpcRegisterName.OpenImAdminCMSName,
-		etcdSchema:      config.Config.Etcd.EtcdSchema,
-		etcdAddr:        config.Config.Etcd.EtcdAddr,
+		etcdSchema:      config.Config.Zookeeper.Schema,
+		etcdAddr:        config.Config.Zookeeper.ZkAddr,
 	}
 	var mysql relation.Mysql
 	var redis cache.RedisClient
 	mysql.InitConn()
 	redis.InitRedis()
 	admin.userInterface = controller.NewUserController(mysql.GormConn())
-	admin.groupInterface = controller.NewGroupController(mysql.GormConn(), redis.GetClient(), nil)
+	admin.groupInterface = controller.NewGroupInterface(mysql.GormConn(), redis.GetClient(), nil)
 	admin.adminCMSInterface = controller.NewAdminCMSController(mysql.GormConn())
 	admin.chatLogInterface = controller.NewChatLogController(mysql.GormConn())
 	return admin
@@ -68,7 +67,6 @@ func (s *adminCMSServer) Run() {
 		listenIP = config.Config.ListenIP
 	}
 	address := listenIP + ":" + strconv.Itoa(s.rpcPort)
-
 	//listener network
 	listener, err := net.Listen("tcp", address)
 	if err != nil {
@@ -116,7 +114,7 @@ func (s *adminCMSServer) AdminLogin(ctx context.Context, req *pbAdminCMS.AdminLo
 	resp := &pbAdminCMS.AdminLoginResp{}
 	for i, adminID := range config.Config.Manager.AppManagerUid {
 		if adminID == req.AdminID && config.Config.Manager.Secrets[i] == req.Secret {
-			token, expTime, err := token_verify.CreateToken(adminID, constant.LinuxPlatformID)
+			token, expTime, err := tokenverify.CreateToken(adminID, constant.LinuxPlatformID)
 			if err != nil {
 				log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "generate token failed", "adminID: ", adminID, err.Error())
 				return nil, err
@@ -140,7 +138,7 @@ func (s *adminCMSServer) AdminLogin(ctx context.Context, req *pbAdminCMS.AdminLo
 }
 
 func (s *adminCMSServer) GetUserToken(ctx context.Context, req *pbAdminCMS.GetUserTokenReq) (*pbAdminCMS.GetUserTokenResp, error) {
-	token, expTime, err := token_verify.CreateToken(req.UserID, int(req.PlatformID))
+	token, expTime, err := tokenverify.CreateToken(req.UserID, int(req.PlatformID))
 	if err != nil {
 		return nil, err
 	}
@@ -529,8 +527,8 @@ func (s *adminCMSServer) GetUserFriends(ctx context.Context, req *pbAdminCMS.Get
 		resp.FriendNums = int32(count)
 	}
 	for _, v := range friendList {
-		friendInfo := &server_api_params.FriendInfo{}
-		userInfo := &server_api_params.UserInfo{UserID: v.FriendUserID, Nickname: v.Nickname}
+		friendInfo := &common.FriendInfo{}
+		userInfo := &common.UserInfo{UserID: v.FriendUserID, Nickname: v.Nickname}
 		utils.CopyStructFields(friendInfo, v)
 		friendInfo.FriendUser = userInfo
 		resp.FriendInfoList = append(resp.FriendInfoList, friendInfo)

internal/rpc/auth/auth.go

@@ -8,7 +8,7 @@ import (
 	"Open_IM/pkg/common/db/controller"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
 	pbAuth "Open_IM/pkg/proto/auth"
 	pbRelay "Open_IM/pkg/proto/relay"
@@ -73,8 +73,8 @@ func (s *rpcAuth) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbA
 	return &resp, nil
 }
 
-func (s *rpcAuth) parseToken(ctx context.Context, tokensString, operationID string) (claims *token_verify.Claims, err error) {
-	claims, err = token_verify.GetClaimFromToken(tokensString)
+func (s *rpcAuth) parseToken(ctx context.Context, tokensString, operationID string) (claims *tokenverify.Claims, err error) {
+	claims, err = tokenverify.GetClaimFromToken(tokensString)
 	if err != nil {
 		return nil, utils.Wrap(err, "")
 	}
@@ -110,7 +110,7 @@ func (s *rpcAuth) ParseToken(ctx context.Context, req *pbAuth.ParseTokenReq) (*p
 
 func (s *rpcAuth) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) {
 	resp := pbAuth.ForceLogoutResp{}
-	if err := token_verify.CheckAdmin(ctx); err != nil {
+	if err := tokenverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, tracelog.GetOperationID(ctx)); err != nil {

internal/rpc/friend/black.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/internal/common/convert"
 	chat "Open_IM/internal/rpc/msg"
 	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
 	pbFriend "Open_IM/pkg/proto/friend"
 	"context"
@@ -53,7 +53,7 @@ func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlac
 
 func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
 	resp := &pbFriend.AddBlackResp{}
-	if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
+	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
 	black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.GetOpUserID(ctx)}

internal/rpc/friend/friend.go

@@ -13,7 +13,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/middleware"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
 	pbFriend "Open_IM/pkg/proto/friend"
 	"Open_IM/pkg/utils"
@@ -97,7 +97,7 @@ func (s *friendServer) Run() {
 // ok
 func (s *friendServer) ApplyToAddFriend(ctx context.Context, req *pbFriend.ApplyToAddFriendReq) (resp *pbFriend.ApplyToAddFriendResp, err error) {
 	resp = &pbFriend.ApplyToAddFriendResp{}
-	if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
+	if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
 	if err := callbackBeforeAddFriendV1(ctx, req); err != nil {
@@ -126,7 +126,7 @@ func (s *friendServer) ApplyToAddFriend(ctx context.Context, req *pbFriend.Apply
 // ok
 func (s *friendServer) ImportFriends(ctx context.Context, req *pbFriend.ImportFriendReq) (resp *pbFriend.ImportFriendResp, err error) {
 	resp = &pbFriend.ImportFriendResp{}
-	if err := token_verify.CheckAdmin(ctx); err != nil {
+	if err := tokenverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	if _, err := check.GetUsersInfo(ctx, req.OwnerUserID, req.FriendUserIDs); err != nil {

internal/rpc/group/group.go

@@ -13,9 +13,9 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/middleware"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
-	discoveryRegistry "Open_IM/pkg/discovery_registry"
+	discoveryRegistry "Open_IM/pkg/discoveryregistry"
 	pbGroup "Open_IM/pkg/proto/group"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@@ -122,7 +122,7 @@ func (s *groupServer) Run() {
 }
 
 func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error {
-	if !token_verify.IsAppManagerUid(ctx) {
+	if !tokenverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupInterface.TakeGroupMember(ctx, groupID, tracelog.GetOpUserID(ctx))
 		if err != nil {
 			return err
@@ -136,7 +136,7 @@ func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error
 
 func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) {
 	resp := &pbGroup.CreateGroupResp{GroupInfo: &open_im_sdk.GroupInfo{}}
-	if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
+	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
 	if req.OwnerUserID == "" {
@@ -210,7 +210,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 
 func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJoinedGroupListReq) (*pbGroup.GetJoinedGroupListResp, error) {
 	resp := &pbGroup.GetJoinedGroupListResp{}
-	if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
+	if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
 	total, members, err := s.GroupInterface.PageGroupMember(ctx, nil, []string{req.FromUserID}, nil, req.Pagination.PageNumber, req.Pagination.ShowNumber)
@@ -280,7 +280,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		return nil, constant.ErrArgs.Wrap("user not found " + strings.Join(ids, ","))
 	}
 	if group.NeedVerification == constant.AllNeedVerification {
-		if !token_verify.IsAppManagerUid(ctx) {
+		if !tokenverify.IsAppManagerUid(ctx) {
 			opUserID := tracelog.GetOpUserID(ctx)
 			member, ok := memberMap[opUserID]
 			if !ok {
@@ -412,7 +412,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 				return nil, constant.ErrUserIDNotFound.Wrap(userID)
 			}
 		}
-		if !token_verify.IsAppManagerUid(ctx) {
+		if !tokenverify.IsAppManagerUid(ctx) {
 			member := memberMap[opUserID]
 			if member == nil {
 				return nil, constant.ErrNoPermission.Wrap(fmt.Sprintf("opUserID %s no in group", opUserID))
@@ -543,7 +543,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	if !utils.Contain(req.HandleResult, constant.GroupResponseAgree, constant.GroupResponseRefuse) {
 		return nil, constant.ErrArgs.Wrap("HandleResult unknown")
 	}
-	if !token_verify.IsAppManagerUid(ctx) {
+	if !tokenverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupInterface.TakeGroupMember(ctx, req.GroupID, req.FromUserID)
 		if err != nil {
 			return nil, err
@@ -676,7 +676,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
 
 func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
 	resp := &pbGroup.SetGroupInfoResp{}
-	if !token_verify.IsAppManagerUid(ctx) {
+	if !tokenverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupInterface.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, tracelog.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
@@ -735,7 +735,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans
 		return nil, constant.ErrArgs.Wrap("NewOwnerUser not in group " + req.NewOwnerUserID)
 	}
 	oldOwner := memberMap[req.OldOwnerUserID]
-	if token_verify.IsAppManagerUid(ctx) {
+	if tokenverify.IsAppManagerUid(ctx) {
 		if oldOwner == nil {
 			oldOwner, err = s.GroupInterface.TakeGroupOwner(ctx, req.OldOwnerUserID)
 			if err != nil {
@@ -887,7 +887,7 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou
 	if err != nil {
 		return nil, err
 	}
-	if !(tracelog.GetOpUserID(ctx) == req.UserID || token_verify.IsAppManagerUid(ctx)) {
+	if !(tracelog.GetOpUserID(ctx) == req.UserID || tokenverify.IsAppManagerUid(ctx)) {
 		opMember, err := s.GroupInterface.TakeGroupMember(ctx, req.GroupID, req.UserID)
 		if err != nil {
 			return nil, err
@@ -910,7 +910,7 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca
 	if err != nil {
 		return nil, err
 	}
-	if !(tracelog.GetOpUserID(ctx) == req.UserID || token_verify.IsAppManagerUid(ctx)) {
+	if !(tracelog.GetOpUserID(ctx) == req.UserID || tokenverify.IsAppManagerUid(ctx)) {
 		opMember, err := s.GroupInterface.TakeGroupMember(ctx, req.GroupID, tracelog.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
@@ -979,7 +979,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 		if req.RoleLevel != nil {
 			return nil, constant.ErrArgs.Wrap("update role level")
 		}
-	} else if !token_verify.IsAppManagerUid(ctx) {
+	} else if !tokenverify.IsAppManagerUid(ctx) {
 		opMember, err := s.GroupInterface.TakeGroupMember(ctx, req.GroupID, tracelog.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err

internal/rpc/msg/chat.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	pbChat "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"
@@ -12,7 +12,7 @@ import (
 
 func (rpc *rpcChat) ClearMsg(_ context.Context, req *pbChat.ClearMsgReq) (*pbChat.ClearMsgResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc req: ", req.String())
-	if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.UserID) {
+	if req.OpUserID != req.UserID && !tokenverify.IsManagerUserID(req.UserID) {
 		errMsg := "No permission" + req.OpUserID + req.UserID
 		log.Error(req.OperationID, errMsg)
 		return &pbChat.ClearMsgResp{ErrCode: constant.ErrNoPermission.ErrCode, ErrMsg: errMsg}, nil
@@ -39,7 +39,7 @@ func (rpc *rpcChat) ClearMsg(_ context.Context, req *pbChat.ClearMsgReq) (*pbCha
 
 func (rpc *rpcChat) SetMsgMinSeq(_ context.Context, req *pbChat.SetMsgMinSeqReq) (*pbChat.SetMsgMinSeqResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc req: ", req.String())
-	if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.UserID) {
+	if req.OpUserID != req.UserID && !tokenverify.IsManagerUserID(req.UserID) {
 		errMsg := "No permission" + req.OpUserID + req.UserID
 		log.Error(req.OperationID, errMsg)
 		return &pbChat.SetMsgMinSeqResp{ErrCode: constant.ErrNoPermission.ErrCode, ErrMsg: errMsg}, nil

internal/rpc/msg/del_msg.go

@@ -4,17 +4,17 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/proto/msg"
-	commonPb "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"time"
 )
 
-func (rpc *rpcChat) DelMsgList(_ context.Context, req *commonPb.DelMsgListReq) (*commonPb.DelMsgListResp, error) {
+func (rpc *rpcChat) DelMsgList(_ context.Context, req *common.DelMsgListReq) (*common.DelMsgListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp := &commonPb.DelMsgListResp{}
+	resp := &common.DelMsgListResp{}
 	select {
 	case rpc.delMsgCh <- deleteMsg{
 		UserID:      req.UserID,
@@ -32,7 +32,7 @@ func (rpc *rpcChat) DelMsgList(_ context.Context, req *commonPb.DelMsgListReq) (
 }
 func (rpc *rpcChat) DelSuperGroupMsg(ctx context.Context, req *msg.DelSuperGroupMsgReq) (*msg.DelSuperGroupMsgResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	if !token_verify.CheckAccess(ctx, req.OpUserID, req.UserID) {
+	if !tokenverify.CheckAccess(ctx, req.OpUserID, req.UserID) {
 		log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.UserID)
 		return &msg.DelSuperGroupMsgResp{ErrCode: constant.ErrNoPermission.ErrCode, ErrMsg: constant.ErrNoPermission.ErrMsg}, nil
 	}

internal/rpc/msg/extend_msg.notification.go

@@ -14,7 +14,7 @@ import (
 
 func ExtendMessageUpdatedNotification(operationID, sendID string, sourceID string, sessionType int32,
 	req *msg.SetMessageReactionExtensionsReq, resp *msg.SetMessageReactionExtensionsResp, isHistory bool, isReactionFromCache bool) {
-	var m api_struct.ReactionMessageModifierNotification
+	var m apistruct.ReactionMessageModifierNotification
 	m.SourceID = req.SourceID
 	m.OpUserID = req.OpUserID
 	m.SessionType = req.SessionType
@@ -37,7 +37,7 @@ func ExtendMessageUpdatedNotification(operationID, sendID string, sourceID strin
 }
 func ExtendMessageDeleteNotification(operationID, sendID string, sourceID string, sessionType int32,
 	req *msg.DeleteMessageListReactionExtensionsReq, resp *msg.DeleteMessageListReactionExtensionsResp, isHistory bool, isReactionFromCache bool) {
-	var m api_struct.ReactionMessageDeleteNotification
+	var m apistruct.ReactionMessageDeleteNotification
 	m.SourceID = req.SourceID
 	m.OpUserID = req.OpUserID
 	m.SessionType = req.SessionType

internal/rpc/msg/group_notification.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	utils2 "Open_IM/pkg/common/utils"
 	pbGroup "Open_IM/pkg/proto/group"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -24,7 +24,7 @@ import (
 //} creator->group
 
 func setOpUserInfo(opUserID, groupID string, groupMemberInfo *open_im_sdk.GroupMemberFullInfo) error {
-	if token_verify.IsManagerUserID(opUserID) {
+	if tokenverify.IsManagerUserID(opUserID) {
 		u, err := imdb.GetUserByUserID(opUserID)
 		if err != nil {
 			return utils.Wrap(err, "GetUserByUserID failed")

internal/rpc/msg/send_msg.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/getcdv3"
 	cacheRpc "Open_IM/pkg/proto/cache"
 	pbConversation "Open_IM/pkg/proto/conversation"
@@ -182,7 +182,7 @@ func (rpc *rpcChat) messageVerification(ctx context.Context, data *pbChat.SendMs
 			log.NewError(data.OperationID, errMsg)
 			return false, 201, errMsg, nil
 		}
-		if token_verify.IsManagerUserID(data.MsgData.SendID) {
+		if tokenverify.IsManagerUserID(data.MsgData.SendID) {
 			return true, 0, "", userIDList
 		}
 		if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
@@ -256,7 +256,7 @@ func (rpc *rpcChat) messageVerification(ctx context.Context, data *pbChat.SendMs
 				log.NewError(data.OperationID, errMsg)
 				return false, 201, errMsg, nil
 			}
-			if token_verify.IsManagerUserID(data.MsgData.SendID) {
+			if tokenverify.IsManagerUserID(data.MsgData.SendID) {
 				return true, 0, "", userIDList
 			}
 			if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {

internal/rpc/user/user.go

@@ -11,7 +11,7 @@ import (
 	relationTb "Open_IM/pkg/common/db/table/relation"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
 	server_api_params "Open_IM/pkg/proto/sdk_ws"
 	pbUser "Open_IM/pkg/proto/user"
@@ -150,7 +150,7 @@ func (s *userServer) GetAllPageFriends(ctx context.Context, ownerUserID string)
 // ok
 func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserInfoReq) (resp *pbUser.UpdateUserInfoResp, err error) {
 	resp = &pbUser.UpdateUserInfoResp{}
-	err = token_verify.CheckAccessV3(ctx, req.UserInfo.UserID)
+	err = tokenverify.CheckAccessV3(ctx, req.UserInfo.UserID)
 	if err != nil {
 		return nil, err
 	}
@@ -211,7 +211,7 @@ func (s *userServer) AccountCheck(ctx context.Context, req *pbUser.AccountCheckR
 	if utils.Duplicate(req.CheckUserIDs) {
 		return nil, constant.ErrArgs.Wrap("userID repeated")
 	}
-	err = token_verify.CheckAdmin(ctx)
+	err = tokenverify.CheckAdmin(ctx)
 	if err != nil {
 		return nil, err
 	}