fix: Fix casbin mod and menu data

LyricTian · Nov 14, 2023 · 3175278 · 3175278
1 parent 24a13c3
commit 3175278
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 223 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 NOW = $(shell date -u '+%Y%m%d%I%M%S')
 
-RELEASE_VERSION = v10.0.0
+RELEASE_VERSION = v10.0.1
 
 APP 			= ginadmin
 SERVER_BIN  	= ${APP}

diff --git a/configs/menu.json b/configs/menu.json
diff --git a/configs/rbac_model.conf b/configs/rbac_model.conf
@@ -11,4 +11,4 @@ e = some(where (p.eft == allow)) # Passes auth if any of the policies allows
 g = _, _
 
 [matchers]
-m = g(r.sub, p.sub) && r.sub == p.sub && keyMatch2(r.obj, p.obj) && r.act == p.act
+m = g(r.sub, p.sub) && r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch3(r.obj, p.obj)) && r.act == p.act
diff --git a/internal/bootstrap/logger.go b/internal/bootstrap/logger.go
@@ -26,7 +26,7 @@ func initLoggerHook(_ context.Context, cfg *logging.HookConfig) (*logging.Hook,
 			MaxIdleTime:  cast.ToInt(cfg.Options["MaxIdleTime"]),
 			MaxOpenConns: cast.ToInt(cfg.Options["MaxOpenConns"]),
 			MaxIdleConns: cast.ToInt(cfg.Options["MaxIdleConns"]),
-			TablePrefix:  cast.ToString(cfg.Options["TablePrefix"]),
+			TablePrefix:  config.C.Storage.DB.TablePrefix,
 		})
 		if err != nil {
 			return nil, err

diff --git a/internal/mods/sys/main.go b/internal/mods/sys/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/LyricTian/gin-admin/v10/internal/mods/sys/api"
-	"github.com/LyricTian/gin-admin/v10/internal/mods/sys/schema"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -15,7 +14,7 @@ type SYS struct {
 }
 
 func (a *SYS) AutoMigrate(ctx context.Context) error {
-	return a.DB.AutoMigrate(new(schema.Logger))
+	return a.DB.AutoMigrate()
 }
 
 func (a *SYS) Init(ctx context.Context) error {

diff --git a/internal/mods/sys/schema/logger.go b/internal/mods/sys/schema/logger.go
@@ -3,6 +3,7 @@ package schema
 import (
 	"time"
 
+	"github.com/LyricTian/gin-admin/v10/internal/config"
 	"github.com/LyricTian/gin-admin/v10/pkg/util"
 )
 
@@ -22,7 +23,7 @@ type Logger struct {
 }
 
 func (a *Logger) TableName() string {
-	return "logger"
+	return config.C.FormatTableName("logger")
 }
 
 // Defining the query parameters for the `Logger` struct.

diff --git a/internal/swagger/docs.go b/internal/swagger/docs.go
diff --git a/internal/swagger/swagger.json b/internal/swagger/swagger.json
@@ -4,7 +4,7 @@
         "description": "A lightweight, flexible, elegant and full-featured RBAC scaffolding based on GIN + GORM 2.0 + Casbin 2.0 + Wire DI.",
         "title": "ginadmin",
         "contact": {},
-        "version": "v10.0.0"
+        "version": "v10.0.1"
     },
     "paths": {
         "/api/v1/captcha/id": {

diff --git a/internal/swagger/swagger.yaml b/internal/swagger/swagger.yaml
@@ -434,7 +434,7 @@ info:
   description: A lightweight, flexible, elegant and full-featured RBAC scaffolding
     based on GIN + GORM 2.0 + Casbin 2.0 + Wire DI.
   title: ginadmin
-  version: v10.0.0
+  version: v10.0.1
 paths:
   /api/v1/captcha/id:
     get:

diff --git a/internal/swagger/v3/openapi.json b/internal/swagger/v3/openapi.json
@@ -4,7 +4,7 @@
     "contact" : { },
     "description" : "A lightweight, flexible, elegant and full-featured RBAC scaffolding based on GIN + GORM 2.0 + Casbin 2.0 + Wire DI.",
     "title" : "ginadmin",
-    "version" : "v10.0.0"
+    "version" : "v10.0.1"
   },
   "servers" : [ {
     "url" : "/"
@@ -379,9 +379,9 @@
             "type" : "string"
           }
         }, {
-          "description" : "user ID",
+          "description" : "user name",
           "in" : "query",
-          "name" : "userID",
+          "name" : "userName",
           "schema" : {
             "type" : "string"
           }
@@ -1505,6 +1505,10 @@
             "description" : "Log level",
             "type" : "string"
           },
+          "login_name" : {
+            "description" : "From User.Username",
+            "type" : "string"
+          },
           "message" : {
             "description" : "Log message",
             "type" : "string"

diff --git a/main.go b/main.go
@@ -8,10 +8,10 @@ import (
 )
 
 // Usage: go build -ldflags "-X main.VERSION=x.x.x"
-var VERSION = "v10.0.0"
+var VERSION = "v10.0.1"
 
 // @title ginadmin
-// @version v10.0.0
+// @version v10.0.1
 // @description A lightweight, flexible, elegant and full-featured RBAC scaffolding based on GIN + GORM 2.0 + Casbin 2.0 + Wire DI.
 // @securityDefinitions.apikey ApiKeyAuth
 // @in header