diff --git a/server/Makefile b/server/Makefile index 68550a1e83efa6d3d0ba586f5c85912eada540b2..60084d942c5921e5816db32ddd4b8506b3950545 100644 --- a/server/Makefile +++ b/server/Makefile @@ -32,7 +32,7 @@ clean: @if [ -f ${GVA} ] ; then rm ${GVA} ; fi help: - @echo "make - 格式化 Go 代码, 并编译生成二进制文件" + @echo "make - 生成gva终端工具,初始化数据后删除gva终端工具" @echo "make linux-build - 编译 Go 代码, 生成Linux系统的二进制文件" @echo "make windows-build - 编译 Go 代码, 生成Windows系统的exe文件" @echo "make mac-build - 编译 Go 代码, 生成Mac系统的二进制文件" diff --git a/server/cmd/datas/authority_Ids.go b/server/cmd/datas/authority_Ids.go index 2cd6d8076c45415a83ba1fec67fc2ad796062feb..a05aeb6156c7fdf963edb3a4a87531fd6ee588ba 100644 --- a/server/cmd/datas/authority_Ids.go +++ b/server/cmd/datas/authority_Ids.go @@ -18,7 +18,7 @@ var DataAuthorityId = []SysDataAuthorityId{ } func InitSysDataAuthorityId(db *gorm.DB) (err error) { - return db.Transaction(func(tx *gorm.DB) error { + return db.Table("sys_data_authority_id").Transaction(func(tx *gorm.DB) error { if tx.Create(&DataAuthorityId).Error != nil { // 遇到错误时回滚事务 return err } diff --git a/server/cmd/datas/authority_menus.go b/server/cmd/datas/authority_menus.go index 133f567b7ca726f2f2b3020fc5f1aa490581c10b..8f076c9628250bfa8e68f2ce73513621385a478e 100644 --- a/server/cmd/datas/authority_menus.go +++ b/server/cmd/datas/authority_menus.go @@ -66,7 +66,7 @@ var AuthorityMenus = []SysAuthorityMenus{ } func InitSysAuthorityMenus(db *gorm.DB) (err error) { - return db.Transaction(func(tx *gorm.DB) error { + return db.Table("sys_authority_menus").Transaction(func(tx *gorm.DB) error { if tx.Create(&AuthorityMenus).Error != nil { // 遇到错误时回滚事务 return err } diff --git a/server/cmd/datas/casbins.go b/server/cmd/datas/casbins.go index ebce80474f2b27bf45eb1e3a40a5b488907b1d05..97fe60fefbbcae654a4ec90154c438cbe48c3f34 100644 --- a/server/cmd/datas/casbins.go +++ b/server/cmd/datas/casbins.go @@ -42,6 +42,7 @@ var Carbines = []gormadapter.CasbinRule{ {PType: "p", V0: "888", V1: "/jwt/jsonInBlacklist", V2: "POST"}, {PType: "p", V0: "888", V1: "/system/getSystemConfig", V2: "POST"}, {PType: "p", V0: "888", V1: "/system/setSystemConfig", V2: "POST"}, + {PType: "p", V0: "888", V1: "/system/getServerInfo", V2: "POST"}, {PType: "p", V0: "888", V1: "/customer/customer", V2: "POST"}, {PType: "p", V0: "888", V1: "/customer/customer", V2: "PUT"}, {PType: "p", V0: "888", V1: "/customer/customer", V2: "DELETE"}, @@ -69,6 +70,9 @@ var Carbines = []gormadapter.CasbinRule{ {PType: "p", V0: "888", V1: "/sysOperationRecord/deleteSysOperationRecordByIds", V2: "DELETE"}, {PType: "p", V0: "888", V1: "/user/setUserInfo", V2: "PUT"}, {PType: "p", V0: "888", V1: "/email/emailTest", V2: "POST"}, + {PType: "p", V0: "888", V1: "/simpleUploader/upload", V2: "POST"}, + {PType: "p", V0: "888", V1: "/simpleUploader/checkFileMd5", V2: "GET"}, + {PType: "p", V0: "888", V1: "/simpleUploader/mergeFileMd5", V2: "GET"}, {PType: "p", V0: "8881", V1: "/base/login", V2: "POST"}, {PType: "p", V0: "8881", V1: "/base/register", V2: "POST"}, {PType: "p", V0: "8881", V1: "/api/createApi", V2: "POST"}, diff --git a/server/router/sys_system.go b/server/router/sys_system.go index 215af6995c8196eb8f934a7b991350dd41f8dc15..2c80e90a843a46ccb895b05d358138f60326134e 100644 --- a/server/router/sys_system.go +++ b/server/router/sys_system.go @@ -2,11 +2,12 @@ package router import ( "gin-vue-admin/api/v1" + "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSystemRouter(Router *gin.RouterGroup) { - SystemRouter := Router.Group("system") + SystemRouter := Router.Group("system").Use(middleware.JWTAuth(), middleware.CasbinHandler()) { SystemRouter.POST("getSystemConfig", v1.GetSystemConfig) // 获取配置文件内容 SystemRouter.POST("setSystemConfig", v1.SetSystemConfig) // 设置配置文件内容