调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ import (
"go-admin/app/admin/models"
"go-admin/common/dto"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
common "go-admin/common/models"
"go-admin/tools"
)
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
"go-admin/common/apis"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools"
)
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"go-admin/app/admin/models"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
common "go-admin/common/models"
"go-admin/common/service"
"gorm.io/gorm"
@@ -116,4 +116,4 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d cDto.Control, c common.ActiveRec
return err
}
return nil
}
}
+9 -9
View File
@@ -6,8 +6,8 @@ import (
"go-admin/app/admin/models"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/tools"
"go-admin/pkg/logger"
)
type {{.ClassName}}Search struct {
@@ -27,10 +27,10 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
}
func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -54,15 +54,15 @@ type {{.ClassName}}Control struct {
}
func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -105,15 +105,15 @@ func (s *{{.ClassName}}ById) GetId() interface{} {
}
func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
+48 -30
View File
@@ -9,7 +9,6 @@ import (
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
"go-admin/common/apis"
"go-admin/common/log"
"go-admin/tools"
)
@@ -18,17 +17,19 @@ type {{.ClassName}} struct {
}
func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
d := new(dto.{{.ClassName}}Search)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
d := new(dto.{{.ClassName}}Search)
//查询列表
err = d.Bind(c)
if err != nil {
log.Warnf("request body bind error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -38,12 +39,13 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
list := make([]models.{{.ClassName}}, 0)
var count int64
serviceStudent := service.{{.ClassName}}{}
serviceStudent.MsgID = msgID
serviceStudent.Orm = db
err = serviceStudent.Get{{.ClassName}}Page(d, p, &list, &count)
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.Log = log
service{{.ClassName}}.Orm = db
err = service{{.ClassName}}.Get{{.ClassName}}Page(d, p, &list, &count)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("Get {{.ClassName}} Page error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@@ -51,17 +53,20 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
}
func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
control := new(dto.{{.ClassName}}ById)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
control := new(dto.{{.ClassName}}ById)
//查看详情
err = control.Bind(c)
if err != nil {
log.Warnf("request body bind error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -71,11 +76,12 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.MsgID = msgID
service{{.ClassName}}.Log = log
service{{.ClassName}}.Orm = db
err = service{{.ClassName}}.Get{{.ClassName}}(control, p, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("Get {{.ClassName}} error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@@ -83,22 +89,26 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
}
func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
control := new(dto.{{.ClassName}}Control)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
control := new(dto.{{.ClassName}}Control)
//新增操作
err = control.Bind(c)
if err != nil {
log.Warnf("request body bind error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
@@ -107,10 +117,10 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.Orm = db
service{{.ClassName}}.MsgID = msgID
service{{.ClassName}}.Log = log
err = service{{.ClassName}}.Insert{{.ClassName}}(object)
if err != nil {
log.Error(err)
log.Errorf("Insert {{.ClassName}} error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
@@ -119,22 +129,26 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
}
func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
control := new(dto.{{.ClassName}}Control)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
control := new(dto.{{.ClassName}}Control)
//更新操作
err = control.Bind(c)
if err != nil {
log.Warnf("request body bind error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
@@ -145,28 +159,31 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.Orm = db
service{{.ClassName}}.MsgID = msgID
service{{.ClassName}}.Log = log
err = service{{.ClassName}}.Update{{.ClassName}}(object, p)
if err != nil {
log.Error(err)
log.Errorf("Update {{.ClassName}} error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "更新失败")
return
}
e.OK(c, object.GetId(), "更新成功")
}
func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
control := new(dto.{{.ClassName}}ById)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
msgID := tools.GenerateMsgIDFromContext(c)
control := new(dto.{{.ClassName}}ById)
//删除操作
err = control.Bind(c)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
log.Warnf("request body bind error, %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -179,10 +196,11 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.Orm = db
service{{.ClassName}}.MsgID = msgID
service{{.ClassName}}.Log = log
err = service{{.ClassName}}.Remove{{.ClassName}}(control, p)
if err != nil {
log.Error(err)
log.Errorf("Remove {{.ClassName}} error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "删除失败")
return
}
e.OK(c, control.GetId(), "删除成功")
+11 -20
View File
@@ -5,7 +5,6 @@ import (
"go-admin/app/admin/models"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/log"
"go-admin/app/admin/service/dto"
"go-admin/common/service"
"gorm.io/gorm"
@@ -19,7 +18,6 @@ type {{.ClassName}} struct {
func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Model(&data).
Scopes(
@@ -30,7 +28,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
return nil
@@ -40,7 +38,6 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a
func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -50,26 +47,23 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error:%s", err)
return err
}
return nil
}
// Insert{{.ClassName}} 创建{{.ClassName}}对象
func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) error {
func (e *{{.ClassName}}) Insert{{.ClassName}}(c *models.{{.ClassName}}) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
err = e.Orm.Model(&data).
Create(model).Error
err = e.Orm.Create(c).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
return nil
@@ -78,15 +72,13 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) erro
// Update{{.ClassName}} 修改{{.ClassName}}对象
func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actions.DataPermission) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
db := e.Orm.Model(c).
Scopes(
actions.Permission(data.TableName(), p),
actions.Permission(c.TableName(), p),
).Where(c.GetId()).Updates(c)
if db.Error != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
e.Log.Errorf("db error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -100,7 +92,6 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actio
func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
var err error
var data models.{{.ClassName}}
msgID := e.MsgID
db := e.Orm.Model(&data).
Scopes(
@@ -108,7 +99,7 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti
).Delete(&data, d.GetId())
if db.Error != nil {
err = db.Error
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
e.Log.Errorf("Delete error: %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -116,4 +107,4 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti
return err
}
return nil
}
}