casbin结构修改为三方包内部结构，避免升级冲突。

piexlmax · piexlmax · commit 4724cec45559 · 2022-02-21T14:07:32.000+08:00
diff --git a/server/core/server.go b/server/core/server.go
@@ -26,7 +26,6 @@ func RunWindowsServer() {
 	}
 
 	Router := initialize.Routers()
-
 	Router.Static("/form-generator", "./resource/page")
 
 	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
diff --git a/server/initialize/router.go b/server/initialize/router.go
@@ -27,7 +27,7 @@ func Routers() *gin.Engine {
 	// Router.StaticFile("/", "./dist/index.html") // 前端网页入口页面
 
 	Router.StaticFS(global.GVA_CONFIG.Local.Path, http.Dir(global.GVA_CONFIG.Local.Path)) // 为用户头像和文件提供静态地址
-	// Router.Use(middleware.LoadTls())  // 打开就能玩https了
+	// Router.Use(middleware.LoadTls())  // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件")
 	global.GVA_LOG.Info("use middleware logger")
 	// 跨域，如需跨域可以打开下面的注释
 	// Router.Use(middleware.Cors()) // 直接放行全部跨域请求
diff --git a/server/model/system/sys_casbin.go b/server/model/system/sys_casbin.go
diff --git a/server/service/system/sys_casbin.go b/server/service/system/sys_casbin.go
@@ -7,7 +7,6 @@ import (
 	"github.com/casbin/casbin/v2"
 	gormadapter "github.com/casbin/gorm-adapter/v3"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	_ "github.com/go-sql-driver/mysql"
 )
@@ -26,13 +25,7 @@ func (casbinService *CasbinService) UpdateCasbin(authorityId string, casbinInfos
 	casbinService.ClearCasbin(0, authorityId)
 	rules := [][]string{}
 	for _, v := range casbinInfos {
-		cm := system.CasbinModel{
-			Ptype:       "p",
-			AuthorityId: authorityId,
-			Path:        v.Path,
-			Method:      v.Method,
-		}
-		rules = append(rules, []string{cm.AuthorityId, cm.Path, cm.Method})
+		rules = append(rules, []string{authorityId, v.Path, v.Method})
 	}
 	e := casbinService.Casbin()
 	success, _ := e.AddPolicies(rules)
@@ -49,7 +42,7 @@ func (casbinService *CasbinService) UpdateCasbin(authorityId string, casbinInfos
 //@return: error
 
 func (casbinService *CasbinService) UpdateCasbinApi(oldPath string, newPath string, oldMethod string, newMethod string) error {
-	err := global.GVA_DB.Table("casbin_rule").Model(&system.CasbinModel{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
+	err := global.GVA_DB.Model(&gormadapter.CasbinRule{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
 		"v1": newPath,
 		"v2": newMethod,
 	}).Error

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ func RunWindowsServer() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`Router := initialize.Routers()`
`29`		`-`
`30`	`29`	`Router.Static("/form-generator", "./resource/page")`
`31`	`30`
`32`	`31`	`address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)`