调整整体架构写法

调整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

+37 -38
View File
@@ -8,7 +8,6 @@ import (
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/common/log"
"go-admin/tools"
"go-admin/tools/app"
)
@@ -18,11 +17,11 @@ type SysConfig struct {
}
func (e *SysConfig) GetSysConfigList(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
d := new(dto.SysConfigSearch)
db, err := tools.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -30,19 +29,19 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) {
//查询列表
err = d.Bind(c)
if err != nil {
log.Errorf("msgID[%s] 参数验证失败, error:%s", msgID, err)
log.Errorf("参数验证失败, error:%s", err)
app.Error(c, 500, err, "参数验证失败")
return
}
list := make([]system.SysConfig, 0)
var count int64
serviceStudent := service.SysConfig{}
serviceStudent.MsgID = msgID
serviceStudent.Orm = db
err = serviceStudent.GetSysConfigPage(d, &list, &count)
s := service.SysConfig{}
s.Log = log
s.Orm = db
err = s.GetSysConfigPage(d, &list, &count)
if err != nil {
log.Errorf("msgID[%s] GetSysConfigPage 查询失败, error:%s", msgID, err)
log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
app.Error(c, 500, err, "查询失败")
return
}
@@ -50,12 +49,12 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) {
}
func (e *SysConfig) GetSysConfig(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
control := new(dto.SysConfigById)
db, err := tools.GetOrm(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -63,19 +62,19 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) {
err = control.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
var object system.SysConfig
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.MsgID = msgID
serviceSysLoginLog.Log = log
serviceSysLoginLog.Orm = db
err = serviceSysLoginLog.GetSysConfig(control, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -84,12 +83,12 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) {
}
func (e *SysConfig) InsertSysConfig(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
control := new(dto.SysConfigControl)
db, err := tools.GetOrm(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -98,14 +97,14 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
err = control.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -114,12 +113,12 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.MsgID = msgID
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.InsertSysConfig(object)
if err != nil {
log.Error(err)
e.Error(c, http.StatusInternalServerError, err, "创建失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -128,12 +127,12 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
}
func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
control := new(dto.SysConfigControl)
db, err := tools.GetOrm(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -143,14 +142,14 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -158,11 +157,11 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.MsgID = msgID
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.UpdateSysConfig(object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "更新失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -170,12 +169,12 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
}
func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
control := new(dto.SysConfigById)
db, err := tools.GetOrm(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -183,16 +182,16 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
//删除操作
err = control.Bind(c)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
log.Errorf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
object, err := control.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -202,11 +201,11 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.MsgID = msgID
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.RemoveSysConfig(control, object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "删除失败")
log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err)
log.Errorf("Orm获取失败, error:%s", err)
app.Error(c, 500, err, "Orm获取失败")
return
}
@@ -215,26 +214,26 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
log := e.GetLogger(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%s", msgID, err)
log.Errorf("error:%s", err)
app.Error(c, 500, err, "")
return
}
var v dto.SysConfigControl
err = v.Bind(c)
if err != nil {
log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err)
log.Errorf("参数验证错误, error:%s", err)
app.Error(c, 422, err, "参数验证失败")
return
}
s := service.SysConfig{}
s.MsgID = msgID
s.Log = log
s.Orm = db
err = s.GetSysConfigByKEY(&v)
if err != nil {
log.Errorf("msgID[%s] 通过Key获取配置失败, error:%s", msgID, err)
log.Errorf("通过Key获取配置失败, error:%s", err)
app.Error(c, 500, err, "")
return
}