fix: (rbac) menu permission

This commit is contained in:
xushuhui 2022-04-21 15:44:22 +08:00
parent 8d730834dd
commit 2e939cee70
3 changed files with 17 additions and 21 deletions

View File

@ -42,7 +42,7 @@ type ConsolePermisson struct {
type Menu struct {
Id string `json:"id"`
Name string `json:"name"`
Switch []string `json:"switch,omitempty"`
Permission []string `json:"permission,omitempty"`
Children []Menu `json:"children,omitempty"`
}
@ -70,18 +70,18 @@ func (r ConsoleRole) ListPermission() interface{} {
{
Id: "cluster_overview",
Name: "平台概览",
Switch: []string{"none", "write", "read"},
Permission: []string{"none", "write", "read"},
},
{
Id: "cluster_elasticsearch",
Name: "集群监控",
Switch: []string{"none", "write", "read"},
Permission: []string{"none", "write", "read"},
}, {
Id: "cluster_activities",
Name: "集群动态",
Switch: []string{"none", "write", "read"},
Permission: []string{"none", "write", "read"},
},
},
},

View File

@ -20,7 +20,7 @@ type ConsolePermission struct {
type Menu struct {
Id string `json:"id"`
Name string `json:"name"`
Switch string `json:"switch"`
Permission string `json:"permission"`
}
type ElasticsearchPermission struct {
Cluster []string `json:"cluster" elastic_mapping:"cluster:{type:object}"`

View File

@ -3,8 +3,6 @@ package rbac
import (
log "github.com/cihub/seelog"
"infini.sh/console/internal/biz"
"infini.sh/console/internal/core"
httprouter "infini.sh/framework/core/api/router"
"net/http"
)
@ -19,8 +17,6 @@ func (h Rbac) ListPermission(w http.ResponseWriter, r *http.Request, ps httprout
return
}
permissions := role.ListPermission()
h.WriteOKJSON(w, core.Response{
Hit: permissions,
})
h.WriteOKJSON(w, permissions)
return
}