diff --git a/internal/rpc/admin/applet.go b/internal/rpc/admin/applet.go index d9e76ea77..adb464d30 100644 --- a/internal/rpc/admin/applet.go +++ b/internal/rpc/admin/applet.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "strings" "time" @@ -31,6 +32,7 @@ import ( ) func (o *adminServer) AddApplet(ctx context.Context, req *admin.AddAppletReq) (*admin.AddAppletResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -66,6 +68,7 @@ func (o *adminServer) AddApplet(ctx context.Context, req *admin.AddAppletReq) (* } func (o *adminServer) DelApplet(ctx context.Context, req *admin.DelAppletReq) (*admin.DelAppletResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -86,6 +89,7 @@ func (o *adminServer) DelApplet(ctx context.Context, req *admin.DelAppletReq) (* } func (o *adminServer) UpdateApplet(ctx context.Context, req *admin.UpdateAppletReq) (*admin.UpdateAppletResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -104,6 +108,7 @@ func (o *adminServer) UpdateApplet(ctx context.Context, req *admin.UpdateAppletR } func (o *adminServer) FindApplet(ctx context.Context, req *admin.FindAppletReq) (*admin.FindAppletResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -131,6 +136,7 @@ func (o *adminServer) FindApplet(ctx context.Context, req *admin.FindAppletReq) } func (o *adminServer) SearchApplet(ctx context.Context, req *admin.SearchAppletReq) (*admin.SearchAppletResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/check.go b/internal/rpc/admin/check.go index 35c5ec409..36be7fc38 100644 --- a/internal/rpc/admin/check.go +++ b/internal/rpc/admin/check.go @@ -17,6 +17,7 @@ package admin import ( "context" "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/chat/pkg/common/db/dbutil" "github.com/OpenIMSDK/chat/pkg/eerrs" @@ -24,6 +25,7 @@ import ( ) func (o *adminServer) CheckRegisterForbidden(ctx context.Context, req *admin.CheckRegisterForbiddenReq) (*admin.CheckRegisterForbiddenResp, error) { + defer log.ZDebug(ctx, "return") forbiddens, err := o.Database.FindIPForbidden(ctx, []string{req.Ip}) if err != nil { return nil, err @@ -37,6 +39,7 @@ func (o *adminServer) CheckRegisterForbidden(ctx context.Context, req *admin.Che } func (o *adminServer) CheckLoginForbidden(ctx context.Context, req *admin.CheckLoginForbiddenReq) (*admin.CheckLoginForbiddenResp, error) { + defer log.ZDebug(ctx, "return") forbiddens, err := o.Database.FindIPForbidden(ctx, []string{req.Ip}) if err != nil { return nil, err diff --git a/internal/rpc/admin/client_config.go b/internal/rpc/admin/client_config.go index 500ab2a84..92ec0e9c6 100644 --- a/internal/rpc/admin/client_config.go +++ b/internal/rpc/admin/client_config.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" @@ -24,6 +25,7 @@ import ( ) func (o *adminServer) GetClientConfig(ctx context.Context, req *admin.GetClientConfigReq) (*admin.GetClientConfigResp, error) { + defer log.ZDebug(ctx, "return") conf, err := o.Database.GetConfig(ctx) if err != nil { return nil, err @@ -32,6 +34,7 @@ func (o *adminServer) GetClientConfig(ctx context.Context, req *admin.GetClientC } func (o *adminServer) SetClientConfig(ctx context.Context, req *admin.SetClientConfigReq) (*admin.SetClientConfigResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/invitation.go b/internal/rpc/admin/invitation.go index 3619727bd..69c8eb23f 100644 --- a/internal/rpc/admin/invitation.go +++ b/internal/rpc/admin/invitation.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "math/rand" "strings" "time" @@ -31,6 +32,7 @@ import ( ) func (o *adminServer) AddInvitationCode(ctx context.Context, req *admin.AddInvitationCodeReq) (*admin.AddInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -64,6 +66,7 @@ func (o *adminServer) AddInvitationCode(ctx context.Context, req *admin.AddInvit } func (o *adminServer) GenInvitationCode(ctx context.Context, req *admin.GenInvitationCodeReq) (*admin.GenInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -107,6 +110,7 @@ func (o *adminServer) GenInvitationCode(ctx context.Context, req *admin.GenInvit } func (o *adminServer) FindInvitationCode(ctx context.Context, req *admin.FindInvitationCodeReq) (*admin.FindInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -140,6 +144,7 @@ func (o *adminServer) FindInvitationCode(ctx context.Context, req *admin.FindInv } func (o *adminServer) UseInvitationCode(ctx context.Context, req *admin.UseInvitationCodeReq) (*admin.UseInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -160,6 +165,7 @@ func (o *adminServer) UseInvitationCode(ctx context.Context, req *admin.UseInvit } func (o *adminServer) DelInvitationCode(ctx context.Context, req *admin.DelInvitationCodeReq) (*admin.DelInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -184,6 +190,7 @@ func (o *adminServer) DelInvitationCode(ctx context.Context, req *admin.DelInvit } func (o *adminServer) SearchInvitationCode(ctx context.Context, req *admin.SearchInvitationCodeReq) (*admin.SearchInvitationCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/ip_forbidden.go b/internal/rpc/admin/ip_forbidden.go index 03a221a56..9dcb9edd9 100644 --- a/internal/rpc/admin/ip_forbidden.go +++ b/internal/rpc/admin/ip_forbidden.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "time" admin2 "github.com/OpenIMSDK/chat/pkg/common/db/table/admin" @@ -24,6 +25,7 @@ import ( ) func (o *adminServer) SearchIPForbidden(ctx context.Context, req *admin.SearchIPForbiddenReq) (*admin.SearchIPForbiddenResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -47,6 +49,7 @@ func (o *adminServer) SearchIPForbidden(ctx context.Context, req *admin.SearchIP } func (o *adminServer) AddIPForbidden(ctx context.Context, req *admin.AddIPForbiddenReq) (*admin.AddIPForbiddenResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -67,6 +70,7 @@ func (o *adminServer) AddIPForbidden(ctx context.Context, req *admin.AddIPForbid } func (o *adminServer) DelIPForbidden(ctx context.Context, req *admin.DelIPForbiddenReq) (*admin.DelIPForbiddenResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/register_add_friend.go b/internal/rpc/admin/register_add_friend.go index 5544bd424..72f40e783 100644 --- a/internal/rpc/admin/register_add_friend.go +++ b/internal/rpc/admin/register_add_friend.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "strings" "time" @@ -29,6 +30,7 @@ import ( ) func (o *adminServer) AddDefaultFriend(ctx context.Context, req *admin.AddDefaultFriendReq) (*admin.AddDefaultFriendResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -67,6 +69,7 @@ func (o *adminServer) AddDefaultFriend(ctx context.Context, req *admin.AddDefaul } func (o *adminServer) DelDefaultFriend(ctx context.Context, req *admin.DelDefaultFriendReq) (*admin.DelDefaultFriendResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -98,6 +101,7 @@ func (o *adminServer) DelDefaultFriend(ctx context.Context, req *admin.DelDefaul } func (o *adminServer) FindDefaultFriend(ctx context.Context, req *admin.FindDefaultFriendReq) (*admin.FindDefaultFriendResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -109,6 +113,7 @@ func (o *adminServer) FindDefaultFriend(ctx context.Context, req *admin.FindDefa } func (o *adminServer) SearchDefaultFriend(ctx context.Context, req *admin.SearchDefaultFriendReq) (*admin.SearchDefaultFriendResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/register_add_group.go b/internal/rpc/admin/register_add_group.go index 651ebde1d..02636de7d 100644 --- a/internal/rpc/admin/register_add_group.go +++ b/internal/rpc/admin/register_add_group.go @@ -30,6 +30,7 @@ import ( ) func (o *adminServer) AddDefaultGroup(ctx context.Context, req *admin.AddDefaultGroupReq) (*admin.AddDefaultGroupResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -68,6 +69,7 @@ func (o *adminServer) AddDefaultGroup(ctx context.Context, req *admin.AddDefault } func (o *adminServer) DelDefaultGroup(ctx context.Context, req *admin.DelDefaultGroupReq) (*admin.DelDefaultGroupResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -99,6 +101,7 @@ func (o *adminServer) DelDefaultGroup(ctx context.Context, req *admin.DelDefault } func (o *adminServer) FindDefaultGroup(ctx context.Context, req *admin.FindDefaultGroupReq) (*admin.FindDefaultGroupResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -110,7 +113,7 @@ func (o *adminServer) FindDefaultGroup(ctx context.Context, req *admin.FindDefau } func (o *adminServer) SearchDefaultGroup(ctx context.Context, req *admin.SearchDefaultGroupReq) (*admin.SearchDefaultGroupResp, error) { - defer log.ZInfo(ctx, "return") + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/token.go b/internal/rpc/admin/token.go index bd35fbfc7..ae10df318 100644 --- a/internal/rpc/admin/token.go +++ b/internal/rpc/admin/token.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/chat/pkg/common/config" "github.com/OpenIMSDK/chat/pkg/common/tokenverify" @@ -23,6 +24,7 @@ import ( ) func (*adminServer) CreateToken(ctx context.Context, req *admin.CreateTokenReq) (*admin.CreateTokenResp, error) { + defer log.ZDebug(ctx, "return") token, err := tokenverify.CreateToken(req.UserID, req.UserType, *config.Config.TokenPolicy.Expire) if err != nil { return nil, err diff --git a/internal/rpc/admin/user.go b/internal/rpc/admin/user.go index 970fdd6f8..08f95bda4 100644 --- a/internal/rpc/admin/user.go +++ b/internal/rpc/admin/user.go @@ -34,6 +34,7 @@ import ( ) func (o *adminServer) CancellationUser(ctx context.Context, req *admin.CancellationUserReq) (*admin.CancellationUserResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -49,6 +50,7 @@ func (o *adminServer) CancellationUser(ctx context.Context, req *admin.Cancellat } func (o *adminServer) BlockUser(ctx context.Context, req *admin.BlockUserReq) (*admin.BlockUserResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -74,6 +76,7 @@ func (o *adminServer) BlockUser(ctx context.Context, req *admin.BlockUserReq) (* } func (o *adminServer) UnblockUser(ctx context.Context, req *admin.UnblockUserReq) (*admin.UnblockUserResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -98,6 +101,7 @@ func (o *adminServer) UnblockUser(ctx context.Context, req *admin.UnblockUserReq } func (o *adminServer) SearchBlockUser(ctx context.Context, req *admin.SearchBlockUserReq) (*admin.SearchBlockUserResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -134,6 +138,7 @@ func (o *adminServer) SearchBlockUser(ctx context.Context, req *admin.SearchBloc } func (o *adminServer) FindUserBlockInfo(ctx context.Context, req *admin.FindUserBlockInfoReq) (*admin.FindUserBlockInfoResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/admin/user_ip_limit_login.go b/internal/rpc/admin/user_ip_limit_login.go index 8d6b69a5f..1336c9a7d 100644 --- a/internal/rpc/admin/user_ip_limit_login.go +++ b/internal/rpc/admin/user_ip_limit_login.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" @@ -27,6 +28,7 @@ import ( ) func (o *adminServer) SearchUserIPLimitLogin(ctx context.Context, req *admin.SearchUserIPLimitLoginReq) (*admin.SearchUserIPLimitLoginResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } @@ -52,6 +54,7 @@ func (o *adminServer) SearchUserIPLimitLogin(ctx context.Context, req *admin.Sea } func (o *adminServer) AddUserIPLimitLogin(ctx context.Context, req *admin.AddUserIPLimitLoginReq) (*admin.AddUserIPLimitLoginResp, error) { + defer log.ZDebug(ctx, "return") if _, err := mctx.CheckAdmin(ctx); err != nil { return nil, err } diff --git a/internal/rpc/chat/callback.go b/internal/rpc/chat/callback.go index 6532bc075..922144bcf 100644 --- a/internal/rpc/chat/callback.go +++ b/internal/rpc/chat/callback.go @@ -30,6 +30,7 @@ import ( ) func (o *chatSvr) OpenIMCallback(ctx context.Context, req *chat.OpenIMCallbackReq) (*chat.OpenIMCallbackResp, error) { + defer log.ZDebug(ctx, "return") switch req.Command { case constant.CallbackBeforeAddFriendCommand: var data callbackstruct.CallbackBeforeAddFriendReq diff --git a/internal/rpc/chat/login.go b/internal/rpc/chat/login.go index ee86a1429..3ca574ce7 100644 --- a/internal/rpc/chat/login.go +++ b/internal/rpc/chat/login.go @@ -41,6 +41,7 @@ func (o *chatSvr) verifyCodeJoin(areaCode, phoneNumber string) string { } func (o *chatSvr) SendVerifyCode(ctx context.Context, req *chat.SendVerifyCodeReq) (*chat.SendVerifyCodeResp, error) { + defer log.ZDebug(ctx, "return") switch req.UsedFor { case constant.VerificationCodeForRegister: if err := o.Admin.CheckRegister(ctx, req.Ip); err != nil { @@ -120,6 +121,7 @@ func (o *chatSvr) SendVerifyCode(ctx context.Context, req *chat.SendVerifyCodeRe } func (o *chatSvr) verifyCode(ctx context.Context, account string, verifyCode string) (uint, error) { + defer log.ZDebug(ctx, "return") if verifyCode == "" { return 0, errs.ErrArgs.Wrap("verify code is empty") } @@ -159,6 +161,7 @@ func (o *chatSvr) verifyCode(ctx context.Context, account string, verifyCode str } func (o *chatSvr) VerifyCode(ctx context.Context, req *chat.VerifyCodeReq) (*chat.VerifyCodeResp, error) { + defer log.ZDebug(ctx, "return") if _, err := o.verifyCode(ctx, o.verifyCodeJoin(req.AreaCode, req.PhoneNumber), req.VerifyCode); err != nil { return nil, err } @@ -191,6 +194,7 @@ func (o *chatSvr) genVerifyCode() string { } func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (*chat.RegisterUserResp, error) { + defer log.ZDebug(ctx, "return") isAdmin, err := o.Admin.CheckNilOrAdmin(ctx) if err != nil { return nil, err @@ -363,6 +367,7 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) ( } func (o *chatSvr) Login(ctx context.Context, req *chat.LoginReq) (*chat.LoginResp, error) { + defer log.ZDebug(ctx, "return") resp := &chat.LoginResp{} if req.Password == "" && req.VerifyCode == "" { return nil, errs.ErrArgs.Wrap("password or code must be set") diff --git a/internal/rpc/chat/password.go b/internal/rpc/chat/password.go index 236d07c30..675058a5c 100644 --- a/internal/rpc/chat/password.go +++ b/internal/rpc/chat/password.go @@ -16,6 +16,7 @@ package chat import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" @@ -25,6 +26,7 @@ import ( ) func (o *chatSvr) ResetPassword(ctx context.Context, req *chat.ResetPasswordReq) (*chat.ResetPasswordResp, error) { + defer log.ZDebug(ctx, "return") if req.Password == "" { return nil, errs.ErrArgs.Wrap("password must be set") } @@ -44,6 +46,7 @@ func (o *chatSvr) ResetPassword(ctx context.Context, req *chat.ResetPasswordReq) } func (o *chatSvr) ChangePassword(ctx context.Context, req *chat.ChangePasswordReq) (*chat.ChangePasswordResp, error) { + defer log.ZDebug(ctx, "return") if req.NewPassword == "" { return nil, errs.ErrArgs.Wrap("new password must be set") } diff --git a/internal/rpc/chat/user.go b/internal/rpc/chat/user.go index 04ae803c7..48a7c814f 100644 --- a/internal/rpc/chat/user.go +++ b/internal/rpc/chat/user.go @@ -16,6 +16,7 @@ package chat import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" @@ -28,6 +29,7 @@ import ( ) func (o *chatSvr) UpdateUserInfo(ctx context.Context, req *chat.UpdateUserInfoReq) (*chat.UpdateUserInfoResp, error) { + defer log.ZDebug(ctx, "return") opUserID, userType, err := mctx.Check(ctx) if err != nil { return nil, err @@ -115,6 +117,7 @@ func (o *chatSvr) UpdateUserInfo(ctx context.Context, req *chat.UpdateUserInfoRe } func (o *chatSvr) FindUserPublicInfo(ctx context.Context, req *chat.FindUserPublicInfoReq) (*chat.FindUserPublicInfoResp, error) { + defer log.ZDebug(ctx, "return") if len(req.UserIDs) == 0 { return nil, errs.ErrArgs.Wrap("UserIDs is empty") } @@ -128,6 +131,7 @@ func (o *chatSvr) FindUserPublicInfo(ctx context.Context, req *chat.FindUserPubl } func (o *chatSvr) SearchUserPublicInfo(ctx context.Context, req *chat.SearchUserPublicInfoReq) (*chat.SearchUserPublicInfoResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -142,6 +146,7 @@ func (o *chatSvr) SearchUserPublicInfo(ctx context.Context, req *chat.SearchUser } func (o *chatSvr) FindUserFullInfo(ctx context.Context, req *chat.FindUserFullInfoReq) (*chat.FindUserFullInfoResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -156,6 +161,7 @@ func (o *chatSvr) FindUserFullInfo(ctx context.Context, req *chat.FindUserFullIn } func (o *chatSvr) SearchUserFullInfo(ctx context.Context, req *chat.SearchUserFullInfoReq) (*chat.SearchUserFullInfoResp, error) { + defer log.ZDebug(ctx, "return") if _, _, err := mctx.Check(ctx); err != nil { return nil, err } @@ -170,6 +176,7 @@ func (o *chatSvr) SearchUserFullInfo(ctx context.Context, req *chat.SearchUserFu } func (o *chatSvr) FindUserAccount(ctx context.Context, req *chat.FindUserAccountReq) (*chat.FindUserAccountResp, error) { + defer log.ZDebug(ctx, "return") if len(req.UserIDs) == 0 { return nil, errs.ErrArgs.Wrap("user id list must be set") } @@ -188,6 +195,7 @@ func (o *chatSvr) FindUserAccount(ctx context.Context, req *chat.FindUserAccount } func (o *chatSvr) FindAccountUser(ctx context.Context, req *chat.FindAccountUserReq) (*chat.FindAccountUserResp, error) { + defer log.ZDebug(ctx, "return") if len(req.Accounts) == 0 { return nil, errs.ErrArgs.Wrap("account list must be set") }