From 2e939cee70409849342947aa54ee1adaf353ef04 Mon Sep 17 00:00:00 2001
From: xushuhui <xushuhui@infini.ltd>
Date: Thu, 21 Apr 2022 15:44:22 +0800
Subject: [PATCH] fix: (rbac) menu permission

---
 internal/biz/permission.go    | 26 +++++++++++++-------------
 model/rbac/role.go            |  6 +++---
 plugin/api/rbac/permission.go |  6 +-----
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/internal/biz/permission.go b/internal/biz/permission.go
index dd4f5a59..c954a2f6 100644
--- a/internal/biz/permission.go
+++ b/internal/biz/permission.go
@@ -40,10 +40,10 @@ type ConsolePermisson struct {
 	Menu []Menu   `json:"menu"`
 }
 type Menu struct {
-	Id       string   `json:"id"`
-	Name     string   `json:"name"`
-	Switch   []string `json:"switch,omitempty"`
-	Children []Menu   `json:"children,omitempty"`
+	Id         string   `json:"id"`
+	Name       string   `json:"name"`
+	Permission []string `json:"permission,omitempty"`
+	Children   []Menu   `json:"children,omitempty"`
 }
 
 func (r ConsoleRole) ListPermission() interface{} {
@@ -68,20 +68,20 @@ func (r ConsoleRole) ListPermission() interface{} {
 			Name: "平台管理",
 			Children: []Menu{
 				{
-					Id:     "cluster_overview",
-					Name:   "平台概览",
-					Switch: []string{"none", "write", "read"},
+					Id:         "cluster_overview",
+					Name:       "平台概览",
+					Permission: []string{"none", "write", "read"},
 				},
 				{
 
-					Id:     "cluster_elasticsearch",
-					Name:   "集群监控",
-					Switch: []string{"none", "write", "read"},
+					Id:         "cluster_elasticsearch",
+					Name:       "集群监控",
+					Permission: []string{"none", "write", "read"},
 				}, {
 
-					Id:     "cluster_activities",
-					Name:   "集群动态",
-					Switch: []string{"none", "write", "read"},
+					Id:         "cluster_activities",
+					Name:       "集群动态",
+					Permission: []string{"none", "write", "read"},
 				},
 			},
 		},
diff --git a/model/rbac/role.go b/model/rbac/role.go
index b36ec54f..dea4bdf0 100644
--- a/model/rbac/role.go
+++ b/model/rbac/role.go
@@ -18,9 +18,9 @@ type ConsolePermission struct {
 }
 
 type Menu struct {
-	Id     string `json:"id"`
-	Name   string `json:"name"`
-	Switch string `json:"switch"`
+	Id         string `json:"id"`
+	Name       string `json:"name"`
+	Permission string `json:"permission"`
 }
 type ElasticsearchPermission struct {
 	Cluster          []string `json:"cluster" elastic_mapping:"cluster:{type:object}"`
diff --git a/plugin/api/rbac/permission.go b/plugin/api/rbac/permission.go
index a6ff6e7b..138c2bc7 100644
--- a/plugin/api/rbac/permission.go
+++ b/plugin/api/rbac/permission.go
@@ -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
 }