refactor🎨 移除设置log函数

This commit is contained in:
wenjianzhang
2021-05-16 21:47:49 +08:00
parent 33275573f9
commit b2345039e4
4 changed files with 16 additions and 20 deletions
+5 -11
View File
@@ -21,20 +21,20 @@ type Api struct {
Errors error
}
func (e *Api) AddError(err error) error {
func (e *Api) AddError(err error) {
if e.Errors == nil {
e.Errors = err
} else if err != nil {
e.Logger.Error(err)
e.Errors = fmt.Errorf("%v; %w", e.Error, err)
}
return e.Errors
}
// MakeContext 设置http上下文
func (e *Api) MakeContext(c *gin.Context) *Api {
fmt.Println(&c)
e.Context = c
e.Logger = api.GetRequestLogger(c)
fmt.Println(&e.Context)
return e
}
@@ -91,25 +91,19 @@ func (e Api) GetOrm() (*gorm.DB, error) {
return db, nil
}
// MakeLogger 设置上下文提供的日志
func (e *Api) MakeLogger() *Api {
e.Logger = api.GetRequestLogger(e.Context)
return e
}
// MakeOrm 设置Orm DB
func (e *Api) MakeOrm() *Api {
var err error
if e.Logger == nil {
err = errors.New("at MakeOrm logger is nil")
//e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil")
_ = e.AddError(err)
e.AddError(err)
return e
}
db, err := pkg.GetOrm(e.Context)
if err != nil {
e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
_ = e.AddError(err)
e.AddError(err)
}
e.Orm = db
return e
@@ -133,4 +127,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
// Custom 兼容函数
func (e Api) Custom(data gin.H) {
response.Custum(e.Context, data)
}
}