兼容casbin2.24.0版本log

迁移脚本编译时不打包
This commit is contained in:
linwenxiang committed 2021-03-05 13:23:21 +08:00
1 parent 48f0cb46ec
commit 39dd1ee6f8
56 files changed
+320 -454

No files matched your search

+4 -7
View File
@@ -11,7 +11,6 @@ import (
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysSetting struct {
@@ -26,10 +25,9 @@ type SysSetting struct {
// @Router /api/v1/setting [get]
func (e *SysSetting) GetSetting(c *gin.Context) {
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
log.Error(err)
return
}
@@ -62,10 +60,9 @@ func (e *SysSetting) GetSetting(c *gin.Context) {
func (e *SysSetting) CreateOrUpdateSetting(c *gin.Context) {
control := new(dto.SysSettingControl)
log := e.GetLogger(c)
db, err := tools.GetOrm(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
log.Error(err)
return
}