diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..201a8ea --- /dev/null +++ b/config.yaml @@ -0,0 +1,34 @@ +server: + port: 8899 + address: 127.0.0.1 + name: go-easy-admin + # # 生产环境建议使用 release,debug:可以使用debug模式 + model: release + adminUser: admin + adminPwd: 25285442ebc7d3a0c20047e01d341c31 + +# 数据库配置 +mysql: + DbHost: 47.92.196.70 + DbPort: 3306 + # 数据库名称 需要提前创建好 + DbName: go_easy_admin + DbUser: root + DbPwd: v|+(ah@bF3dyN + MaxIdleConns: 10 + MaxOpenConns: 100 + # 是否开启debug,1 开启 0 关闭 + ActiveDebug: 0 + +# 密码加密 +aes: + key: go-easy-admin + +jwt: + realm: go-easy-admin + # jwt加密因子 + key: anruo + # jwt token过期时间 单位为小时 + timeout: 100 + # jwt token刷新时间 单位为小时 + maxRefresh: 1 \ No newline at end of file diff --git a/pkg/controller/system/apis.go b/pkg/controller/system/apis.go index ad77490..22987b4 100644 --- a/pkg/controller/system/apis.go +++ b/pkg/controller/system/apis.go @@ -9,8 +9,8 @@ package system import ( "context" - "github.com/jinzhu/copier" + "gorm.io/gorm" reqSystem "go-easy-admin/internal/model/request/system" "go-easy-admin/internal/model/system" @@ -51,10 +51,15 @@ func (sa *sysApis) Delete(id int) error { if err != nil { return err } - if err = global.GORM.WithContext(sa.ctx).Delete(&api).Error; err != nil { - return global.DeleteErr(sa.tips, err) - } - return NewSysRBAC(sa.ctx).DeleteByAPIsID(id) + + err = global.GORM.WithContext(sa.ctx).Transaction(func(tx *gorm.DB) error { + if err = NewSysRBAC(sa.ctx).DeleteByAPIsID(id); err != nil { + return global.DeleteErr(sa.tips, err) + } else { + return global.GORM.WithContext(sa.ctx).Delete(&api).Error + } + }) + return err } func (sa *sysApis) Update(id int, req *reqSystem.UpdateAPIsReq) error { diff --git a/pkg/controller/system/user.go b/pkg/controller/system/user.go index cfb197a..a26ac51 100644 --- a/pkg/controller/system/user.go +++ b/pkg/controller/system/user.go @@ -10,7 +10,6 @@ package system import ( "context" "errors" - "github.com/jinzhu/copier" "gorm.io/gorm"