Browse Source

Merge pull request #538 from songzhibin97/gva_gormv2_dev

fix:创建用户初始化权限,确保用户可用
main
奇淼(piexlmax 3 years ago
committed by GitHub
parent
commit
17904a72c5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      server/api/v1/sys_authority.go
  2. 4
      server/model/request/sys_casbin.go
  3. 20
      server/model/request/sys_menu.go

3
server/api/v1/sys_authority.go

@ -7,6 +7,7 @@ import (
"gin-vue-admin/model/response" "gin-vue-admin/model/response"
"gin-vue-admin/service" "gin-vue-admin/service"
"gin-vue-admin/utils" "gin-vue-admin/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -30,6 +31,8 @@ func CreateAuthority(c *gin.Context) {
global.GVA_LOG.Error("创建失败!", zap.Any("err", err)) global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
response.FailWithMessage("创建失败"+err.Error(), c) response.FailWithMessage("创建失败"+err.Error(), c)
} else { } else {
service.AddMenuAuthority(request.DefaultMenu(), authority.AuthorityId)
service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c) response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
} }
} }

4
server/model/request/sys_casbin.go

@ -11,3 +11,7 @@ type CasbinInReceive struct {
AuthorityId string `json:"authorityId"` // 权限id AuthorityId string `json:"authorityId"` // 权限id
CasbinInfos []CasbinInfo `json:"casbinInfos"` CasbinInfos []CasbinInfo `json:"casbinInfos"`
} }
func DefaultCasbin() []CasbinInfo {
return []CasbinInfo{{Path: "/menu/getMenu", Method: "POST"}, {Path: "/jwt/jsonInBlacklist", Method: "POST"}}
}

20
server/model/request/sys_menu.go

@ -1,9 +1,27 @@
package request package request
import "gin-vue-admin/model"
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
)
// Add menu authority info structure // Add menu authority info structure
type AddMenuAuthorityInfo struct { type AddMenuAuthorityInfo struct {
Menus []model.SysBaseMenu Menus []model.SysBaseMenu
AuthorityId string // 角色ID AuthorityId string // 角色ID
} }
func DefaultMenu() []model.SysBaseMenu {
return []model.SysBaseMenu{{
GVA_MODEL: global.GVA_MODEL{ID: 1},
ParentId: "0",
Path: "dashboard",
Name: "dashboard",
Component: "view/dashboard/index.vue",
Sort: 1,
Meta: model.Meta{
Title: "仪表盘",
Icon: "setting",
},
}}
}
Loading…
Cancel
Save