调整整体架构写法

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

+3 -3
View File
@@ -6,8 +6,8 @@ import (
"github.com/gin-gonic/gin"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/app"
)
@@ -15,13 +15,13 @@ import (
// CreateAction 通用新增动作
func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
req := control.Generate()
err = req.Bind(c)
@@ -38,7 +38,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
object.SetCreateBy(tools.GetUserId(c))
err = db.WithContext(c).Create(object).Error
if err != nil {
log.Errorf("MsgID[%s] Create error: %s", msgID, err)
log.Errorf("Create error: %s", err)
app.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
@@ -94,4 +94,4 @@ func getPermissionFromContext(c *gin.Context) *DataPermission {
// PermissionForNoAction 提供非action写法数据范围约束
func GetPermissionFromContext(c *gin.Context) *DataPermission {
return getPermissionFromContext(c)
}
}
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"