From 0f4170907f3a6ec72d70b36c7b5936eb9be37fa5 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 12 Jan 2023 17:20:28 +0800
Subject: [PATCH 1/4] 1

---
 internal/rpc/group/group.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 95b9b0f39..540c3f20d 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -740,7 +740,8 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	} else if req.HandleResult == constant.GroupResponseRefuse {
 		chat.GroupApplicationRejectedNotification(req)
 	} else {
-		return nil, utils.Wrap(constant.ErrArgs, "")
+		//return nil, utils.Wrap(constant.ErrArgs, "")
+		return nil, constant.ErrArgs.Warp()
 	}
 	return resp, nil
 }

From 35774878db6afa0d29f4e32802b357337d42c891 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 12 Jan 2023 17:26:10 +0800
Subject: [PATCH 2/4] log

---
 pkg/common/log/logrus.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go
index c92e0655e..adb6a05f7 100644
--- a/pkg/common/log/logrus.go
+++ b/pkg/common/log/logrus.go
@@ -33,7 +33,7 @@ func init() {
 
 func NewPrivateLog(moduleName string) {
 	logger = loggerInit(moduleName)
-	ctxLogger = loggerInit(moduleName)
+	ctxLogger = ctxLoggerInit(moduleName)
 }
 
 func ctxLoggerInit(moduleName string) *Logger {

From 57928f900e0cc2551874bda27e30ad58c7f0cc0f Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 12 Jan 2023 17:30:40 +0800
Subject: [PATCH 3/4] log

---
 pkg/common/trace_log/ctx.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/common/trace_log/ctx.go b/pkg/common/trace_log/ctx.go
index ca7f4ea37..dc5b5873a 100644
--- a/pkg/common/trace_log/ctx.go
+++ b/pkg/common/trace_log/ctx.go
@@ -179,7 +179,7 @@ func SetContextInfo(ctx context.Context, funcName string, logLevel logrus.Level,
 	funcInfo.FuncName = funcName
 	funcInfo.Err = err
 	funcInfo.LogLevel = logLevel
-	_, file, line, _ := runtime.Caller(0)
+	_, file, line, _ := runtime.Caller(2)
 	var s string
 	i := strings.SplitAfter(file, "/")
 	if len(i) > 3 {

From 231e0adea194905abf551cb125711864a09b90ee Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 12 Jan 2023 17:30:48 +0800
Subject: [PATCH 4/4] 1

---
 pkg/common/constant/err_info.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/common/constant/err_info.go b/pkg/common/constant/err_info.go
index 7158bdec7..31fb79dec 100644
--- a/pkg/common/constant/err_info.go
+++ b/pkg/common/constant/err_info.go
@@ -2,11 +2,10 @@ package constant
 
 import (
 	sdkws "Open_IM/pkg/proto/sdk_ws"
-	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
+	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
 
@@ -25,11 +24,11 @@ func (e *ErrInfo) Code() int32 {
 }
 
 func (e *ErrInfo) Warp() error {
-	return utils.Wrap(e, "")
+	return errors.WithStack(e)
 }
 
 func (e *ErrInfo) WarpMessage(msg string) error {
-	return utils.Wrap(e, msg)
+	return errors.WithMessage(e, "")
 }
 
 func NewErrNetwork(err error) error {