yjp 3 дней назад
Родитель
Сommit
4c749d14f3
2 измененных файлов с 11 добавлено и 5 удалено
  1. 1 5
      framework/core/api/api.go
  2. 10 0
      framework/core/api/router.go

+ 1 - 5
framework/core/api/api.go

@@ -242,11 +242,7 @@ func (api *Api) DumpRouterPermissionItems(onSave func(items *DumpedPermissionIte
 		for _, routerPermissionItem := range routerPermissionItems {
 			if savedPermissionItem.Resource == routerPermissionItem.Resource &&
 				savedPermissionItem.Action == routerPermissionItem.Action {
-				if savedPermissionItem.Group != routerPermissionItem.Group ||
-					savedPermissionItem.Name != routerPermissionItem.Name ||
-					savedPermissionItem.Description != routerPermissionItem.Description ||
-					savedPermissionItem.NeedCheckExpire != routerPermissionItem.NeedCheckExpire ||
-					savedPermissionItem.SensitiveWordScene != routerPermissionItem.SensitiveWordScene {
+				if savedPermissionItem.needUpdate(routerPermissionItem) {
 					dumped.Update = append(dumped.Update, routerPermissionItem)
 				}
 

+ 10 - 0
framework/core/api/router.go

@@ -47,6 +47,7 @@ type PermissionItem struct {
 	NeedCheckExpire    bool   `json:"needCheckExpire"`
 	SensitiveWordScene int    `json:"sensitiveWordScene"`
 	Privilege          bool   `json:"privilege"`
+	// 添加字段后,注意在下面needUpdate添加判断
 }
 
 func (p *PermissionItem) check() error {
@@ -65,6 +66,15 @@ func (p *PermissionItem) check() error {
 	return nil
 }
 
+func (p *PermissionItem) needUpdate(oldPermissionItem PermissionItem) bool {
+	return p.Group != oldPermissionItem.Group ||
+		p.Name != oldPermissionItem.Name ||
+		p.Description != oldPermissionItem.Description ||
+		p.NeedCheckExpire != oldPermissionItem.NeedCheckExpire ||
+		p.SensitiveWordScene != oldPermissionItem.SensitiveWordScene ||
+		p.Privilege != oldPermissionItem.Privilege
+}
+
 type RootRouter struct {
 	engine    *gin.Engine
 	versioned map[string]*PrefixRouter