zishuo/easygoadmin
1
0
Fork 0
mirror of https://gitlab.52pay.top/go/easygoadmin.git synced 2025-09-27 02:18:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 增加数据库前缀配置

Browse Source 
增加数据库前缀配置
This commit is contained in:
yaoyilin
2022-11-01 18:10:13 +08:00
parent fec60fcda9
commit d9f1161320
7 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dto/login.go
View File

@@ -9,7 +9,7 @@ package dto
// 系统登录
type LoginReq struct {
UserName string `form:"username" binding:"required,min=4,max=30"`
Password string `form:"password" binding:"required,min=6,max=12"`
Password string `form:"password" binding:"required,min=5,max=12"`
Captcha string `form:"captcha" binding:"required,min=4,max=6"`
IdKey string `form:"idKey" binding:"required"`
}

11
app/middleware/checklogin.go
View File

@@ -143,8 +143,9 @@ func getRoleApiIds(c *gin.Context, userId int64) []string {
userRole := make([]model.UserRole, 0)
// 创建查询实例
query := utils.XormDb.Where("user_id = ?", gconv.String(userId)).Table("sys_user_role")
err := query.Find(&userRole)
err := utils.XormDb.Where("user_id = ?", gconv.String(userId)).
Table(model.UserRole{}).
Find(&userRole)
if err != nil {
return apiIdsArr
}
@@ -182,9 +183,9 @@ func getMenuId(c *gin.Context, path string) string {
var menu model.Menu
// 创建查询实例
query := utils.XormDb.Where("url = ?", path).Select("id").
Table("sys_menu")
_, err := query.Get(&menu)
_, err := utils.XormDb.Where("url = ?", path).Select("id").
Table(model.Menu{}).
Get(&menu)
if err != nil || menu.Id == 0 {
return menuId
}

18
app/model/menu.go
View File

@@ -23,26 +23,26 @@ type Menu struct {
}
// 根据条件查询单条数据
func (r *Menu) Get() (bool, error) {
return utils.XormDb.Get(r)
func (m *Menu) Get() (bool, error) {
return utils.XormDb.Get(m)
}
// 插入数据
func (r *Menu) Insert() (int64, error) {
return utils.XormDb.Insert(r)
func (m *Menu) Insert() (int64, error) {
return utils.XormDb.Insert(m)
}
// 更新数据
func (r *Menu) Update() (int64, error) {
return utils.XormDb.Id(r.Id).Update(r)
func (m *Menu) Update() (int64, error) {
return utils.XormDb.Id(m.Id).Update(m)
}
// 删除
func (r *Menu) Delete() (int64, error) {
return utils.XormDb.Id(r.Id).Delete(&Menu{})
func (m *Menu) Delete() (int64, error) {
return utils.XormDb.Id(m.Id).Delete(&Menu{})
}
// 批量删除
func (r *Menu) BatchDelete(ids ...int64) (int64, error) {
func (m *Menu) BatchDelete(ids ...int64) (int64, error) {
return utils.XormDb.In("id", ids).Delete(&Menu{})
}

4
app/model/user_role.go
View File

@@ -7,10 +7,6 @@ type UserRole struct {
RoleId int `json:"role_id" xorm:"not null default 0 comment('角色ID') INT(10)"`
}
func (r *UserRole) TableName() string {
return "sys_user_role"
}
// 根据条件查询单条数据
func (r *UserRole) Get() (bool, error) {
return utils.XormDb.Get(r)

4
app/service/generate.go
View File

@@ -13,6 +13,7 @@ import (
"gitlab.52pay.top/go/easygoadmin/app/dto"
"gitlab.52pay.top/go/easygoadmin/app/model"
"gitlab.52pay.top/go/easygoadmin/app/vo"
"gitlab.52pay.top/go/easygoadmin/library/cfg"
"gitlab.52pay.top/go/easygoadmin/utils"
"gitlab.52pay.top/go/easygoadmin/utils/common"
"gitlab.52pay.top/go/easygoadmin/utils/gconv"
@@ -63,6 +64,7 @@ func (s *generateService) Generate(req dto.GenerateFileReq, ctx *gin.Context) er
tableName := req.Name
// 数据表描述
moduleTitle := req.Comment
config := cfg.Instance()
// 替换“表”
if gstr.Contains(moduleTitle, "表") {
moduleTitle = gstr.Replace(moduleTitle, "表", "")
@@ -72,7 +74,7 @@ func (s *generateService) Generate(req dto.GenerateFileReq, ctx *gin.Context) er
moduleTitle = gstr.Replace(moduleTitle, "管理", "")
}
// 模型名称
moduleName := gstr.Replace(tableName, "sys_", "")
moduleName := gstr.Replace(tableName, config.Database.Prev, "")
// 作者名称
authorName := ""

29
app/service/menu.go
View File

@@ -246,10 +246,13 @@ func (s *menuService) GetPermissionList(userId int) interface{} {
// 数据转换
list := make([]model.Menu, 0)
// 查询数据
utils.XormDb.Table("sys_menu").Alias("m").
Join("INNER", []string{"sys_role_menu", "r"}, "m.id = r.menu_id").
Join("INNER", []string{"sys_user_role", "ur"}, "ur.role_id=r.role_id").
utils.XormDb.
Table(model.Menu{}).
Alias("m").
Join("INNER", []interface{}{model.RoleMenu{}, "r"}, "m.id = r.menu_id").
Join("INNER", []interface{}{model.UserRole{}, "ur"}, "ur.role_id=r.role_id").
Where("ur.user_id=? AND m.type=0 AND m.`status`=1 AND m.mark=1", userId).
Cols("m.*").
OrderBy("m.id asc").
@@ -288,17 +291,23 @@ func makeTree(menu []model.Menu, tn *vo.MenuTreeNode) {
// 获取权限节点列表
func (s *menuService) GetPermissionsList(userId int) []string {
if userId == 1 {
// 管理员,管理员拥有全部权限
permissionList := make([]string, 0)
utils.XormDb.Table("sys_menu").Cols("permission").Where("type=1").Where("mark=1").Find(&permissionList)
utils.XormDb.
Table(model.Menu{}).
Cols("permission").
Where("type=1").
Where("mark=1").
Find(&permissionList)
return permissionList
} else {
// 非管理员
permissionList := make([]string, 0)
utils.XormDb.Table("sys_menu").Alias("m").
Join("INNER", []string{"sys_role_menu", "r"}, "m.id = r.menu_id").
Join("INNER", []string{"sys_user_role", "ur"}, "ur.role_id=r.role_id").
utils.XormDb.Table(model.Menu{}).Alias("m").
Join("INNER", []interface{}{model.RoleMenu{}, "r"}, "m.id = r.menu_id").
Join("INNER", []interface{}{model.UserRole{}, "ur"}, "ur.role_id=r.role_id").
Where("ur.user_id=? AND m.type=1 AND m.`status`=1 AND m.mark=1", userId).
Cols("m.permission").
Find(&permissionList)
@@ -340,9 +349,9 @@ func (s *menuService) GetPermissionMenuList(userId int) interface{} {
// 数据转换
list := make([]model.Menu, 0)
// 查询数据
utils.XormDb.Table("sys_menu").Alias("m").
Join("INNER", []string{"sys_role_menu", "r"}, "m.id = r.menu_id").
Join("INNER", []string{"sys_user_role", "ur"}, "ur.role_id=r.role_id").
utils.XormDb.Table(model.Menu{}).Alias("m").
Join("INNER", []interface{}{model.RoleMenu{}, "r"}, "m.id = r.menu_id").
Join("INNER", []interface{}{model.UserRole{}, "ur"}, "ur.role_id=r.role_id").
Where("ur.user_id=? AND m.type=0 AND m.`status`=1 AND m.mark=1", userId).
Cols("m.*").
OrderBy("m.id asc").

4
app/service/user_role.go
View File

@@ -19,8 +19,8 @@ type userRoleService struct{}
func (s *userRoleService) GetUserRoleList(userId int) []model.Role {
// 实例化对象
list := make([]model.Role, 0)
utils.XormDb.Table("sys_role").Alias("r").
Join("INNER", []string{"sys_user_role", "ur"}, "r.id=ur.role_id").
utils.XormDb.Table(model.Role{}).Alias("r").
Join("INNER", []interface{}{model.UserRole{}, "ur"}, "r.id=ur.role_id").
Where("ur.user_id=? AND r.mark=1", userId).
Cols("r.*").
OrderBy("r.sort asc").