diff --git a/app/admin/apis/captcha.go b/app/admin/apis/captcha.go index 0b99d96..3fd4ea0 100644 --- a/app/admin/apis/captcha.go +++ b/app/admin/apis/captcha.go @@ -11,7 +11,7 @@ type System struct { } func (e System) GenerateCaptchaHandler(c *gin.Context) { - e.Context = c + e.MakeContext(c) log := e.GetLogger() id, b64s, err := captcha.DriverDigitFunc() if err != nil { @@ -25,4 +25,4 @@ func (e System) GenerateCaptchaHandler(c *gin.Context) { "id": id, "msg": "success", }) -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go index c1e4103..062ae0f 100644 --- a/app/admin/apis/sys_api.go +++ b/app/admin/apis/sys_api.go @@ -88,7 +88,7 @@ func (e SysApi) GetSysApi(c *gin.Context) { control := new(dto.SysApiById) //查看详情 - err = control.Bind(c) + err = e.Bind(control) if err != nil { log.Warnf("request body bind error, %s", err.Error()) e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") @@ -112,56 +112,6 @@ func (e SysApi) GetSysApi(c *gin.Context) { e.OK(object, "查看成功") } -// InsertSysApi 创建接口管理 -// @Summary 创建接口管理 -// @Description 创建接口管理 -// @Tags 接口管理 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysApiControl true "data" -// @Success 200 {object} response.Response "{"code": 200, "message": "添加成功"}" -// @Router /api/v1/sys_api [post] -// @Security Bearer -//func (e SysApi) InsertSysApi(c *gin.Context) { -// e.MakeContext(c) -// log := e.GetLogger() -// db, err := e.GetOrm() -// if err != nil { -// log.Error(err) -// return -// } -// -// control := new(dto.SysApiControl) -// -// //新增操作 -// err = control.Bind(c) -// if err != nil { -// log.Warnf("request body bind error, %s", err.Error()) -// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") -// return -// } -// object, err := control.GenerateM() -// if err != nil { -// log.Errorf("generate SysApi model error, %s", err.Error()) -// e.Error(http.StatusInternalServerError, err, "模型生成失败") -// return -// } -// // 设置创建人 -// object.SetCreateBy(user.GetUserId(c)) -// -// serviceSysApi := service.SysApi{} -// serviceSysApi.Orm = db -// serviceSysApi.Log = log -// err = serviceSysApi.InsertSysApi(object.(*models.SysApi)) -// if err != nil { -// log.Errorf("Insert SysApi error, %s", err.Error()) -// e.Error(http.StatusInternalServerError, err, "创建失败") -// return -// } -// -// e.OK(object.GetId(), "创建成功") -//} - // UpdateSysApi 修改接口管理 // @Summary 修改接口管理 // @Description 修改接口管理 diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go index 3b0466d..0a13f3f 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -2,12 +2,12 @@ package apis import ( "github.com/gin-gonic/gin/binding" + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -35,7 +35,7 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { return } - list := make([]system.SysConfig, 0) + list := make([]models.SysConfig, 0) var count int64 s := service.SysConfig{} s.Log = log @@ -69,7 +69,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { // 控制只读前台的数据 d.IsFrontend = 1 - list := make([]system.SysConfig, 0) + list := make([]models.SysConfig, 0) s := service.SysConfig{} s.Log = log s.Orm = db @@ -107,7 +107,7 @@ func (e SysConfig) GetSysConfig(c *gin.Context) { e.Error(500, err, "Orm获取失败") return } - var object system.SysConfig + var object models.SysConfig serviceSysLoginLog := service.SysConfig{} serviceSysLoginLog.Log = log diff --git a/app/admin/apis/sys_dept.go b/app/admin/apis/sys_dept.go index e718956..d9c2efd 100644 --- a/app/admin/apis/sys_dept.go +++ b/app/admin/apis/sys_dept.go @@ -2,13 +2,13 @@ package apis import ( "github.com/go-admin-team/go-admin-core/sdk/pkg" + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -44,7 +44,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) { return } - list := make([]system.SysDept, 0) + list := make([]models.SysDept, 0) serviceStudent := service.SysDept{} serviceStudent.Log = log serviceStudent.Orm = db @@ -81,7 +81,7 @@ func (e SysDept) GetSysDept(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDept + var object models.SysDept serviceSysOperlog := service.SysDept{} serviceSysOperlog.Log = log @@ -291,4 +291,4 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { "depts": result, "checkedKeys": menuIds, }, "") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_dict_data.go b/app/admin/apis/sys_dict_data.go index d708bf7..faa51c7 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -48,7 +48,7 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) { return } - list := make([]system.SysDictData, 0) + list := make([]models.SysDictData, 0) var count int64 s := service.SysDictData{} s.Log = log @@ -87,7 +87,7 @@ func (e SysDictData) GetSysDictData(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDictData + var object models.SysDictData s := service.SysDictData{} s.Log = log @@ -136,7 +136,7 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Insert(object.(*system.SysDictData)) + err = s.Insert(object.(*models.SysDictData)) if err != nil { log.Errorf("Insert error, %s", err) e.Error(http.StatusInternalServerError, err, "创建失败") @@ -179,7 +179,7 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Update(object.(*system.SysDictData)) + err = s.Update(object.(*models.SysDictData)) if err != nil { log.Errorf("Update error, %s", err) e.Error(http.StatusInternalServerError, err, "更新失败") @@ -226,7 +226,7 @@ func (e SysDictData) DeleteSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Remove(req, object.(*system.SysDictData)) + err = s.Remove(req, object.(*models.SysDictData)) if err != nil { log.Errorf("Remove error, %s", err) e.Error(http.StatusInternalServerError, err, "删除失败") @@ -254,7 +254,7 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { return } - list := make([]system.SysDictData, 0) + list := make([]models.SysDictData, 0) s := service.SysDictData{} s.Log = log s.Orm = db @@ -266,4 +266,4 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { } e.OK(list, "查询成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index bc8fda2..6391f15 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -47,7 +47,7 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) { return } - list := make([]system.SysDictType, 0) + list := make([]models.SysDictType, 0) var count int64 s := service.SysDictType{} s.Log = log @@ -84,7 +84,7 @@ func (e SysDictType) GetSysDictType(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDictType + var object models.SysDictType s := service.SysDictType{} s.Log = log @@ -131,7 +131,7 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Insert(object.(*system.SysDictType)) + err = s.Insert(object.(*models.SysDictType)) if err != nil { log.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") @@ -173,7 +173,7 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Update(object.(*system.SysDictType)) + err = s.Update(object.(*models.SysDictType)) if err != nil { log.Error(err) return @@ -218,7 +218,7 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Remove(req, object.(*system.SysDictType)) + err = s.Remove(req, object.(*models.SysDictType)) if err != nil { log.Error(err) return @@ -253,7 +253,7 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { return } - list := make([]system.SysDictType, 0) + list := make([]models.SysDictType, 0) s := service.SysDictType{} s.Log = log s.Orm = db @@ -264,4 +264,4 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { } e.OK(list, "查询成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index f604c58..f3a79dd 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -33,7 +33,7 @@ func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) { return } - list := make([]system.SysLoginLog, 0) + list := make([]models.SysLoginLog, 0) var count int64 serviceStudent := service.SysLoginLog{} serviceStudent.Log = log @@ -63,7 +63,7 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysLoginLog + var object models.SysLoginLog serviceSysLoginLog := service.SysLoginLog{} serviceSysLoginLog.Log = log @@ -185,4 +185,4 @@ func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) { return } e.OK(object.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index ca3ec62..8d9a486 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -41,7 +41,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) { return } - var list *[]system.SysMenu + var list *[]models.SysMenu serviceSysMenu := service.SysMenu{} serviceSysMenu.Log = log serviceSysMenu.Orm = db @@ -54,6 +54,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) { e.OK(list, "查询成功") } +// GetSysMenu 获取菜单详情 // @Summary Menu详情数据 // @Description 获取JSON // @Tags 菜单 @@ -80,7 +81,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysMenu + var object models.SysMenu serviceSysMenu := service.SysMenu{} serviceSysMenu.Log = log @@ -94,6 +95,8 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { e.OK(object, "查看成功") } + +// InsertSysMenu 创建菜单 // @Summary 创建菜单 // @Description 获取JSON // @Tags 菜单 @@ -148,6 +151,7 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) { e.OK(object.GetId(), "创建成功") } +// UpdateSysMenu 修改菜单 // @Summary 修改菜单 // @Description 获取JSON // @Tags 菜单 @@ -280,7 +284,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { log.Error(err) return } - var data system.RoleMenu + var data models.RoleMenu data.RoleName = c.GetString("role") data.UpdateBy = user.GetUserId(c) result, err := data.GetIDS(db) @@ -366,4 +370,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { "menus": result, "checkedKeys": menuIds, }, "获取成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index 2dbc31e..f3858a7 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -33,7 +33,7 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { return } - list := make([]system.SysOperaLog, 0) + list := make([]models.SysOperaLog, 0) var count int64 serviceStudent := service.SysOperaLog{} serviceStudent.Log = log @@ -63,7 +63,7 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysOperaLog + var object models.SysOperaLog serviceSysOperlog := service.SysOperaLog{} serviceSysOperlog.Log = log @@ -175,4 +175,4 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_post.go b/app/admin/apis/sys_post.go index 6ec209f..e119d89 100644 --- a/app/admin/apis/sys_post.go +++ b/app/admin/apis/sys_post.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -44,7 +44,7 @@ func (e SysPost) GetSysPostList(c *gin.Context) { return } - list := make([]system.SysPost, 0) + list := make([]models.SysPost, 0) var count int64 serviceStudent := service.SysPost{} serviceStudent.Log = log @@ -81,7 +81,7 @@ func (e SysPost) GetSysPost(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysPost + var object models.SysPost serviceSysOperlog := service.SysPost{} serviceSysOperlog.Log = log @@ -220,4 +220,4 @@ func (e SysPost) DeleteSysPost(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_role.go b/app/admin/apis/sys_role.go index a4f31f1..9e924a3 100644 --- a/app/admin/apis/sys_role.go +++ b/app/admin/apis/sys_role.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -46,7 +46,7 @@ func (e SysRole) GetSysRoleList(c *gin.Context) { return } - list := make([]system.SysRole, 0) + list := make([]models.SysRole, 0) var count int64 s := service.SysRole{} s.Log = log @@ -84,7 +84,7 @@ func (e SysRole) GetSysRole(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysRole + var object models.SysRole s := service.SysRole{} s.Log = log @@ -261,7 +261,7 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - data := &system.SysRole{ + data := &models.SysRole{ RoleId: control.RoleId, DataScope: control.DataScope, DeptIds: control.DeptIds, @@ -276,4 +276,4 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { return } e.OK(nil, "操作成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index a8d2c19..d9ed47c 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -1,6 +1,7 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" @@ -8,7 +9,6 @@ import ( _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/google/uuid" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/actions" @@ -51,7 +51,7 @@ func (e SysUser) GetSysUserList(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - list := make([]system.SysUser, 0) + list := make([]models.SysUser, 0) var count int64 serviceStudent := service.SysUser{} serviceStudent.Log = log @@ -89,7 +89,7 @@ func (e SysUser) GetSysUser(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysUser + var object models.SysUser //数据权限检查 p := actions.GetPermissionFromContext(c) @@ -288,7 +288,7 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) { } } - object := &system.SysUser{ + object := &models.SysUser{ UserId: p.UserId, Avatar: "/" + filPath, } @@ -363,9 +363,9 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) { serviceSysUser := service.SysUser{} serviceSysUser.Log = log serviceSysUser.Orm = db - user := new(system.SysUser) - roles := make([]system.SysRole, 0) - posts := make([]system.SysPost, 0) + user := new(models.SysUser) + roles := make([]models.SysRole, 0) + posts := make([]models.SysPost, 0) err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts) if err != nil { log.Errorf("get user profile error, %s", err.Error()) @@ -432,7 +432,7 @@ func (e SysUser) GetInfo(c *gin.Context) { var buttons = make([]string, 1) buttons[0] = "*:*:*" - RoleMenu := system.RoleMenu{} + RoleMenu := models.RoleMenu{} RoleMenu.RoleId = user.GetRoleId(c) var mp = make(map[string]interface{}) @@ -446,7 +446,7 @@ func (e SysUser) GetInfo(c *gin.Context) { mp["buttons"] = list } - var sysUser system.SysUser + var sysUser models.SysUser req := new(dto.SysUserById) req.Id = user.GetUserId(c) serviceSysUser := service.SysUser{} @@ -469,4 +469,4 @@ func (e SysUser) GetInfo(c *gin.Context) { mp["deptId"] = sysUser.DeptId mp["name"] = sysUser.NickName e.OK(mp, "") -} +} \ No newline at end of file diff --git a/app/admin/models/system/casbin_rule.go b/app/admin/models/casbin_rule.go similarity index 96% rename from app/admin/models/system/casbin_rule.go rename to app/admin/models/casbin_rule.go index 7563420..f4ef826 100644 --- a/app/admin/models/system/casbin_rule.go +++ b/app/admin/models/casbin_rule.go @@ -1,4 +1,4 @@ -package system +package models //sys_casbin_rule type CasbinRule struct { @@ -13,4 +13,4 @@ type CasbinRule struct { func (CasbinRule) TableName() string { return "sys_casbin_rule" -} +} \ No newline at end of file diff --git a/app/admin/models/system/datascope.go b/app/admin/models/datascope.go similarity index 99% rename from app/admin/models/system/datascope.go rename to app/admin/models/datascope.go index a95acfd..3c384c8 100644 --- a/app/admin/models/system/datascope.go +++ b/app/admin/models/datascope.go @@ -1,4 +1,4 @@ -package system +package models import ( "errors" @@ -78,4 +78,4 @@ func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB { } return db } -} +} \ No newline at end of file diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 0e1d5f0..cbd8658 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -6,34 +6,33 @@ import ( "go-admin/common/models" "gorm.io/gorm" - - "go-admin/app/admin/models/system" ) type Menu struct { - MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` - MenuName string `json:"menuName" gorm:"size:128;"` - Title string `json:"title" gorm:"size:128;"` - Icon string `json:"icon" gorm:"size:128;"` - Path string `json:"path" gorm:"size:128;"` - Paths string `json:"paths" gorm:"size:128;"` - MenuType string `json:"menuType" gorm:"size:1;"` - Action string `json:"action" gorm:"size:16;"` - Permission string `json:"permission" gorm:"size:255;"` - ParentId int `json:"parentId" gorm:"size:11;"` - NoCache bool `json:"noCache" gorm:"size:8;"` - Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` - Component string `json:"component" gorm:"size:255;"` - Sort int `json:"sort" gorm:"size:4;"` - Visible string `json:"visible" gorm:"size:1;"` - CreateBy string `json:"createBy" gorm:"size:128;"` - UpdateBy string `json:"updateBy" gorm:"size:128;"` - IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - RoleId int `gorm:"-"` - Children []Menu `json:"children" gorm:"-"` - IsSelect bool `json:"is_select" gorm:"-"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` + MenuName string `json:"menuName" gorm:"size:128;"` + Title string `json:"title" gorm:"size:128;"` + Icon string `json:"icon" gorm:"size:128;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + CreateBy string `json:"createBy" gorm:"size:128;"` + UpdateBy string `json:"updateBy" gorm:"size:128;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + RoleId int `gorm:"-"` + Children []Menu `json:"children" gorm:"-"` + IsSelect bool `json:"is_select" gorm:"-"` + models.ModelTime } @@ -83,160 +82,6 @@ type MenuRole struct { type MS []Menu -//func (e *Menu) GetByMenuId() (Menu Menu, err error) { -// -// table := orm.Eloquent.Table(e.TableName()) -// table = table.Where("menu_id = ?", e.MenuId) -// if err = table.Find(&Menu).Error; err != nil { -// return -// } -// return -//} - -//func (e *Menu) SetMenu() (m []Menu, err error) { -// menulist, err := e.GetPage() -// -// m = make([]Menu, 0) -// for i := 0; i < len(menulist); i++ { -// if menulist[i].ParentId != 0 { -// continue -// } -// menusInfo := DiguiMenu(&menulist, menulist[i]) -// -// m = append(m, menusInfo) -// } -// return -//} - -//func DiguiMenu(menulist *[]Menu, menu Menu) Menu { -// list := *menulist -// -// min := make([]Menu, 0) -// for j := 0; j < len(list); j++ { -// -// if menu.MenuId != list[j].ParentId { -// continue -// } -// mi := Menu{} -// mi.MenuId = list[j].MenuId -// mi.MenuName = list[j].MenuName -// mi.Title = list[j].Title -// mi.Icon = list[j].Icon -// mi.Path = list[j].Path -// mi.MenuType = list[j].MenuType -// mi.Action = list[j].Action -// mi.Permission = list[j].Permission -// mi.ParentId = list[j].ParentId -// mi.NoCache = list[j].NoCache -// mi.Breadcrumb = list[j].Breadcrumb -// mi.Component = list[j].Component -// mi.Sort = list[j].Sort -// mi.Visible = list[j].Visible -// mi.CreatedAt = list[j].CreatedAt -// mi.Children = []Menu{} -// -// if mi.MenuType != "F" { -// ms := DiguiMenu(menulist, mi) -// min = append(min, ms) -// -// } else { -// min = append(min, mi) -// } -// -// } -// menu.Children = min -// return menu -//} - -//func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) { -// menulist, err := e.Get() -// -// ml := make([]MenuLable, 0) -// for i := 0; i < len(menulist); i++ { -// if menulist[i].ParentId != 0 { -// continue -// } -// e := MenuLable{} -// e.Id = menulist[i].MenuId -// e.Label = menulist[i].Title -// menusInfo := MenuLabelCall(&menulist, e) -// -// ml = append(ml, menusInfo) -// } -// return &ml, err -//} - -//func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable { -// list := *menulist -// -// min := make([]MenuLable, 0) -// for j := 0; j < len(list); j++ { -// -// if menu.Id != list[j].ParentId { -// continue -// } -// mi := MenuLable{} -// mi.Id = list[j].MenuId -// mi.Label = list[j].Title -// mi.Children = []MenuLable{} -// if list[j].MenuType != "F" { -// ms := MenuLabelCall(menulist, mi) -// min = append(min, ms) -// } else { -// min = append(min, mi) -// } -// -// } -// if len(min) > 0 { -// menu.Children = min -// } else { -// menu.Children = nil -// } -// return menu -//} - -//func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) { -// -// menus, err := e.GetByRoleName(roleName) -// -// m = make([]Menu, 0) -// for i := 0; i < len(menus); i++ { -// if menus[i].ParentId != 0 { -// continue -// } -// menusInfo := DiguiMenu(&menus, menus[i]) -// -// m = append(m, menusInfo) -// } -// return -//} - -//func (e *MenuRole) Get(tx *gorm.DB) (Menus []MenuRole, err error) { -// table := tx.Table(e.TableName()) -// if e.MenuName != "" { -// table = table.Where("menu_name = ?", e.MenuName) -// } -// if err = table.Order("sort").Find(&Menus).Error; err != nil { -// return -// } -// return -//} - -//func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) { -// var table *gorm.DB -// if roleName == "admin" { -// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*") -// table = table.Where(" menu_type in ('M','C')") -// } else { -// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") -// table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName) -// } -// if err = table.Order("sort").Find(&Menus).Error; err != nil { -// return -// } -// return -//} - func (e *Menu) Get(tx *gorm.DB) (Menus []Menu, err error) { table := tx.Table(e.TableName()) if e.MenuName != "" { @@ -274,7 +119,7 @@ func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) { } // 数据权限控制 - dataPermission := new(system.DataPermission) + dataPermission := new(DataPermission) dataPermission.UserId, _ = pkg.StringToInt(e.DataScope) table, err = dataPermission.GetDataScope("sys_menu", table) if err != nil { @@ -314,30 +159,4 @@ func InitPaths(tx *gorm.DB, menu *Menu) (err error) { } tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) return -} - -//func (e *Menu) Update(tx *gorm.DB, id int) (update Menu, err error) { -// if err = tx.Table(e.TableName()).First(&update, id).Error; err != nil { -// return -// } -// -// //参数1:是要修改的数据 -// //参数2:是修改的数据 -// if err = tx.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { -// return -// } -// err = InitPaths(tx, e) -// if err != nil { -// return -// } -// return -//} - -//func (e *Menu) Delete(tx *gorm.DB, id int) (success bool, err error) { -// if err = tx.Table(e.TableName()).Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil { -// success = false -// return -// } -// success = true -// return -//} +} \ No newline at end of file diff --git a/app/admin/models/role.go b/app/admin/models/role.go index ef2086d..ac0990f 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -1,28 +1,26 @@ package models -import "go-admin/common/models" - -type SysRole struct { - RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 - RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 - Status string `json:"status" gorm:"size:4;"` // - RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 - RoleSort int `json:"roleSort" gorm:""` //角色排序 - Flag string `json:"flag" gorm:"size:128;"` // - Remark string `json:"remark" gorm:"size:255;"` //备注 - Admin bool `json:"admin" gorm:"size:4;"` - DataScope string `json:"dataScope" gorm:"size:128;"` - models.ModelTime - models.ControlBy - - Params string `json:"params" gorm:"-"` - MenuIds []int `json:"menuIds" gorm:"-"` - DeptIds []int `json:"deptIds" gorm:"-"` -} - -func (SysRole) TableName() string { - return "sys_role" -} +//type SysRole struct { +// RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 +// RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 +// Status string `json:"status" gorm:"size:4;"` // +// RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 +// RoleSort int `json:"roleSort" gorm:""` //角色排序 +// Flag string `json:"flag" gorm:"size:128;"` // +// Remark string `json:"remark" gorm:"size:255;"` //备注 +// Admin bool `json:"admin" gorm:"size:4;"` +// DataScope string `json:"dataScope" gorm:"size:128;"` +// models.ModelTime +// models.ControlBy +// +// Params string `json:"params" gorm:"-"` +// MenuIds []int `json:"menuIds" gorm:"-"` +// DeptIds []int `json:"deptIds" gorm:"-"` +//} +// +//func (SysRole) TableName() string { +// return "sys_role" +//} type MenuIdList struct { MenuId int `json:"menuId"` @@ -240,4 +238,4 @@ type MenuIdList struct { // } // // return true, nil -//} +//} \ No newline at end of file diff --git a/app/admin/models/system/role_dept.go b/app/admin/models/role_dept.go similarity index 91% rename from app/admin/models/system/role_dept.go rename to app/admin/models/role_dept.go index 526f42e..3ac8eba 100644 --- a/app/admin/models/system/role_dept.go +++ b/app/admin/models/role_dept.go @@ -1,4 +1,4 @@ -package system +package models //sys_role_dept type SysRoleDept struct { @@ -8,4 +8,4 @@ type SysRoleDept struct { func (SysRoleDept) TableName() string { return "sys_role_dept" -} +} \ No newline at end of file diff --git a/app/admin/models/system/role_menu.go b/app/admin/models/role_menu.go similarity index 99% rename from app/admin/models/system/role_menu.go rename to app/admin/models/role_menu.go index ed0f033..82d4d9a 100644 --- a/app/admin/models/system/role_menu.go +++ b/app/admin/models/role_menu.go @@ -1,8 +1,7 @@ -package system +package models import ( "fmt" - "github.com/casbin/casbin/v2" "github.com/go-admin-team/go-admin-core/sdk/pkg" "gorm.io/gorm" @@ -169,4 +168,4 @@ func (rm *RoleMenu) Delete(tx *gorm.DB, RoleId string, MenuID string) (bool, err } return true, nil -} +} \ No newline at end of file diff --git a/app/admin/models/sys_api.go b/app/admin/models/sys_api.go index a71f5a4..20e8ae5 100644 --- a/app/admin/models/sys_api.go +++ b/app/admin/models/sys_api.go @@ -7,14 +7,15 @@ import ( ) type SysApi struct { - Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` - Handle string `json:"handle" gorm:"type:varchar(128);comment:handle"` - Title string `json:"title" gorm:"type:varchar(128);comment:标题"` - Path string `json:"path" gorm:"type:varchar(128);comment:地址"` - Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` - Action string `json:"action" gorm:"type:varchar(16);comment:类型"` - ParentId int `json:"parentId" gorm:"comment:按钮id"` - Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"type:varchar(128);comment:handle"` + Title string `json:"title" gorm:"type:varchar(128);comment:标题"` + Permission string `json:"permission" gorm:"size:255;"` + Path string `json:"path" gorm:"type:varchar(128);comment:地址"` + Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` + Action string `json:"action" gorm:"type:varchar(16);comment:类型"` + ParentId int `json:"parentId" gorm:"comment:按钮id"` + Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` models.ModelTime models.ControlBy } diff --git a/app/admin/models/system/sys_config.go b/app/admin/models/sys_config.go similarity index 97% rename from app/admin/models/system/sys_config.go rename to app/admin/models/sys_config.go index 0075b5e..6e7e3a5 100644 --- a/app/admin/models/system/sys_config.go +++ b/app/admin/models/sys_config.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -27,4 +27,4 @@ func (e *SysConfig) Generate() models.ActiveRecord { func (e *SysConfig) GetId() interface{} { return e.Id -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dept.go b/app/admin/models/sys_dept.go similarity index 98% rename from app/admin/models/system/sys_dept.go rename to app/admin/models/sys_dept.go index d076031..7084be3 100644 --- a/app/admin/models/system/sys_dept.go +++ b/app/admin/models/sys_dept.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -30,4 +30,4 @@ func (e *SysDept) Generate() models.ActiveRecord { func (e *SysDept) GetId() interface{} { return e.DeptId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dict_data.go b/app/admin/models/sys_dict_data.go similarity index 98% rename from app/admin/models/system/sys_dict_data.go rename to app/admin/models/sys_dict_data.go index f2f20e9..70f50bb 100644 --- a/app/admin/models/system/sys_dict_data.go +++ b/app/admin/models/sys_dict_data.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -32,4 +32,4 @@ func (e *SysDictData) Generate() models.ActiveRecord { func (e *SysDictData) GetId() interface{} { return e.DictCode -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dict_type.go b/app/admin/models/sys_dict_type.go similarity index 97% rename from app/admin/models/system/sys_dict_type.go rename to app/admin/models/sys_dict_type.go index dfc053d..9aaf3e4 100644 --- a/app/admin/models/system/sys_dict_type.go +++ b/app/admin/models/sys_dict_type.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -26,4 +26,4 @@ func (e *SysDictType) Generate() models.ActiveRecord { func (e *SysDictType) GetId() interface{} { return e.ID -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_login_log.go b/app/admin/models/sys_login_log.go similarity index 99% rename from app/admin/models/system/sys_login_log.go rename to app/admin/models/sys_login_log.go index 626428a..84154c1 100644 --- a/app/admin/models/system/sys_login_log.go +++ b/app/admin/models/sys_login_log.go @@ -1,4 +1,4 @@ -package system +package models import ( "encoding/json" @@ -69,4 +69,4 @@ func SaveLoginLog(message storage.Messager) (err error) { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_menu.go b/app/admin/models/sys_menu.go similarity index 53% rename from app/admin/models/system/sys_menu.go rename to app/admin/models/sys_menu.go index dbcf803..258c713 100644 --- a/app/admin/models/system/sys_menu.go +++ b/app/admin/models/sys_menu.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -19,6 +19,8 @@ type SysMenu struct { Sort int `json:"sort" gorm:"size:4;"` Visible string `json:"visible" gorm:"size:1;"` IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + SysApi []SysApi `json:"sysApi" gorm:"many2many:sys_menu_api_rule"` + Apis []int `json:"apis" gorm:"-"` DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` RoleId int `gorm:"-"` @@ -28,27 +30,27 @@ type SysMenu struct { models.ModelTime } -type SysMenus struct { - MenuId int `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"` - MenuName string `json:"menuName" gorm:"column:menu_name"` - Title string `json:"title" gorm:"column:title"` - Icon string `json:"icon" gorm:"column:icon"` - Path string `json:"path" gorm:"column:path"` - MenuType string `json:"menuType" gorm:"column:menu_type"` - Action string `json:"action" gorm:"column:action"` - Permission string `json:"permission" gorm:"column:permission"` - ParentId int `json:"parentId" gorm:"column:parent_id"` - NoCache bool `json:"noCache" gorm:"column:no_cache"` - Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` - Component string `json:"component" gorm:"column:component"` - Sort int `json:"sort" gorm:"column:sort"` - Visible string `json:"visible" gorm:"column:visible"` - Children []SysMenu `json:"children" gorm:"-"` - models.ControlBy - models.ModelTime - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` -} +//type SysMenus struct { +// MenuId int `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"` +// MenuName string `json:"menuName" gorm:"column:menu_name"` +// Title string `json:"title" gorm:"column:title"` +// Icon string `json:"icon" gorm:"column:icon"` +// Path string `json:"path" gorm:"column:path"` +// MenuType string `json:"menuType" gorm:"column:menu_type"` +// Action string `json:"action" gorm:"column:action"` +// Permission string `json:"permission" gorm:"column:permission"` +// ParentId int `json:"parentId" gorm:"column:parent_id"` +// NoCache bool `json:"noCache" gorm:"column:no_cache"` +// Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` +// Component string `json:"component" gorm:"column:component"` +// Sort int `json:"sort" gorm:"column:sort"` +// Visible string `json:"visible" gorm:"column:visible"` +// Children []SysMenu `json:"children" gorm:"-"` +// models.ControlBy +// models.ModelTime +// DataScope string `json:"dataScope" gorm:"-"` +// Params string `json:"params" gorm:"-"` +//} func (SysMenu) TableName() string { return "sys_menu" @@ -61,4 +63,4 @@ func (e *SysMenu) Generate() models.ActiveRecord { func (e *SysMenu) GetId() interface{} { return e.MenuId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_opera_log.go b/app/admin/models/sys_opera_log.go similarity index 99% rename from app/admin/models/system/sys_opera_log.go rename to app/admin/models/sys_opera_log.go index b8a83eb..40c8aa5 100644 --- a/app/admin/models/system/sys_opera_log.go +++ b/app/admin/models/sys_opera_log.go @@ -1,4 +1,4 @@ -package system +package models import ( "encoding/json" @@ -82,4 +82,4 @@ func SaveOperaLog(message storage.Messager) (err error) { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_post.go b/app/admin/models/sys_post.go similarity index 98% rename from app/admin/models/system/sys_post.go rename to app/admin/models/sys_post.go index a2dc3cd..7f1ccaa 100644 --- a/app/admin/models/system/sys_post.go +++ b/app/admin/models/sys_post.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -27,4 +27,4 @@ func (e *SysPost) Generate() models.ActiveRecord { func (e *SysPost) GetId() interface{} { return e.PostId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_role.go b/app/admin/models/sys_role.go similarity index 98% rename from app/admin/models/system/sys_role.go rename to app/admin/models/sys_role.go index 3def8e1..777def9 100644 --- a/app/admin/models/system/sys_role.go +++ b/app/admin/models/sys_role.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -30,4 +30,4 @@ func (e *SysRole) Generate() models.ActiveRecord { func (e *SysRole) GetId() interface{} { return e.RoleId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_user.go b/app/admin/models/sys_user.go similarity index 99% rename from app/admin/models/system/sys_user.go rename to app/admin/models/sys_user.go index f866bde..dde7576 100644 --- a/app/admin/models/system/sys_user.go +++ b/app/admin/models/sys_user.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -74,4 +74,4 @@ func (e *SysUser) AfterFind(_ *gorm.DB) error { e.PostIds = []int{e.PostId} e.RoleIds = []int{e.RoleId} return nil -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index f5bd85f..669ad31 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -68,8 +68,8 @@ func (s *SysConfigControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysConfigControl) Generate() (*system.SysConfig, error) { - return &system.SysConfig{ +func (s *SysConfigControl) Generate() (*models.SysConfig, error) { + return &models.SysConfig{ Model: common.Model{Id: s.ID}, ConfigName: s.ConfigName, ConfigKey: s.ConfigKey, @@ -114,6 +114,6 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error { return err } -func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { - return &system.SysConfig{}, nil -} +func (s *SysConfigById) GenerateM() (*models.SysConfig, error) { + return &models.SysConfig{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index f9c652e..e064520 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -74,8 +74,8 @@ func (s *SysDeptControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysDeptControl) Generate() (*system.SysDept, error) { - return &system.SysDept{ +func (s *SysDeptControl) Generate() (*models.SysDept, error) { + return &models.SysDept{ DeptId: s.DeptId, DeptName: s.DeptName, ParentId: s.ParentId, @@ -122,12 +122,12 @@ func (s *SysDeptById) Bind(ctx *gin.Context) error { return err } -func (s *SysDeptById) GenerateM() (*system.SysDept, error) { - return &system.SysDept{}, nil +func (s *SysDeptById) GenerateM() (*models.SysDept, error) { + return &models.SysDept{}, nil } type DeptLabel struct { Id int `gorm:"-" json:"id"` Label string `gorm:"-" json:"label"` Children []DeptLabel `gorm:"-" json:"children"` -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 130d591..5b026d7 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -72,7 +72,7 @@ func (s *SysDictDataControl) Generate() dto.Control { } func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{ + return &models.SysDictData{ DictCode: s.Id, DictSort: s.DictSort, DictLabel: s.DictLabel, @@ -122,5 +122,5 @@ func (s *SysDictDataById) Generate() dto.Control { } func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{}, nil -} + return &models.SysDictData{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 377a7dd..511f779 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -2,9 +2,9 @@ package dto import ( "github.com/gin-gonic/gin" + "go-admin/app/admin/models" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -67,7 +67,7 @@ func (s *SysDictTypeControl) Generate() dto.Control { } func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{ + return &models.SysDictType{ ID: s.Id, DictName: s.DictName, @@ -91,5 +91,5 @@ func (s *SysDictTypeById) Generate() dto.Control { } func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{}, nil -} + return &models.SysDictType{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 1984713..c83d553 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -60,8 +60,8 @@ func (s *SysLoginLogControl) Bind(ctx *gin.Context) error { return err } -func (s *SysLoginLogControl) Generate() (*system.SysLoginLog, error) { - return &system.SysLoginLog{ +func (s *SysLoginLogControl) Generate() (*models.SysLoginLog, error) { + return &models.SysLoginLog{ Model: common.Model{Id: s.ID}, Username: s.Username, Status: s.Status, @@ -108,6 +108,6 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById { return &cp } -func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) { - return &system.SysLoginLog{}, nil -} +func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { + return &models.SysLoginLog{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index dbf5756..9823435 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -38,24 +38,26 @@ func (m *SysMenuSearch) Bind(ctx *gin.Context) error { return err } -// SysConfigControl 增、改使用的结构体 +// SysMenuControl 增、改使用的结构体 type SysMenuControl struct { - MenuId int `uri:"id" comment:"编码"` // 编码 - MenuName string `form:"menuName" comment:"菜单name"` //菜单name - Title string `form:"title" comment:"显示名称"` //显示名称 - Icon string `form:"icon" comment:"图标"` //图标 - Path string `form:"path" comment:"路径"` //路径 - Paths string `form:"paths" comment:"id路径"` //id路径 - MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型 - Action string `form:"action" comment:"请求方式"` //请求方式 - Permission string `form:"permission" comment:"权限编码"` //权限编码 - ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单 - NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存 - Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑 - Component string `form:"component" comment:"组件"` //组件 - Sort int `form:"sort" comment:"排序"` //排序 - Visible string `form:"visible" comment:"是否显示"` //是否显示 - IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame + MenuId int `uri:"id" comment:"编码"` // 编码 + MenuName string `form:"menuName" comment:"菜单name"` //菜单name + Title string `form:"title" comment:"显示名称"` //显示名称 + Icon string `form:"icon" comment:"图标"` //图标 + Path string `form:"path" comment:"路径"` //路径 + Paths string `form:"paths" comment:"id路径"` //id路径 + MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型 + SysApi []models.SysApi `form:"sysApi"` + Apis []int `form:"apis"` + Action string `form:"action" comment:"请求方式"` //请求方式 + Permission string `form:"permission" comment:"权限编码"` //权限编码 + ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单 + NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存 + Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑 + Component string `form:"component" comment:"组件"` //组件 + Sort int `form:"sort" comment:"排序"` //排序 + Visible string `form:"visible" comment:"是否显示"` //是否显示 + IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame } // Bind 映射上下文中的结构体数据 @@ -79,9 +81,9 @@ func (s *SysMenuControl) Bind(ctx *gin.Context) error { return err } -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysMenuControl) Generate() (*system.SysMenu, error) { - return &system.SysMenu{ +// Generate 结构体数据转化 从 Control 至 model 对应的模型 +func (s *SysMenuControl) Generate() (*models.SysMenu, error) { + return &models.SysMenu{ MenuId: s.MenuId, MenuName: s.MenuName, Title: s.Title, @@ -90,6 +92,7 @@ func (s *SysMenuControl) Generate() (*system.SysMenu, error) { Paths: s.Paths, MenuType: s.MenuType, Action: s.Action, + SysApi: s.SysApi, Permission: s.Permission, ParentId: s.ParentId, NoCache: s.NoCache, @@ -135,8 +138,8 @@ func (s *SysMenuById) Bind(ctx *gin.Context) error { return err } -func (s *SysMenuById) GenerateM() (*system.SysMenu, error) { - return &system.SysMenu{}, nil +func (s *SysMenuById) GenerateM() (*models.SysMenu, error) { + return &models.SysMenu{}, nil } type MenuLabel struct { @@ -146,10 +149,10 @@ type MenuLabel struct { } type MenuRole struct { - system.SysMenus + models.SysMenu IsSelect bool `json:"is_select" gorm:"-"` } type SelectRole struct { RoleId int `uri:"roleId"` -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index 3d1c23d..b7b05bc 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -70,8 +70,8 @@ func (s *SysOperaLogControl) Bind(ctx *gin.Context) error { return err } -func (s *SysOperaLogControl) Generate() (*system.SysOperaLog, error) { - return &system.SysOperaLog{ +func (s *SysOperaLogControl) Generate() (*models.SysOperaLog, error) { + return &models.SysOperaLog{ Model: common.Model{Id: s.ID}, Title: s.Title, BusinessType: s.BusinessType, @@ -127,4 +127,4 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error { func (s *SysOperaLogById) SetUpdateBy(id int) { -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index 95cc81f..ab43c63 100644 --- a/app/admin/service/dto/sys_post.go +++ b/app/admin/service/dto/sys_post.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -68,8 +68,8 @@ func (s *SysPostControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysPostControl) Generate() (*system.SysPost, error) { - return &system.SysPost{ +func (s *SysPostControl) Generate() (*models.SysPost, error) { + return &models.SysPost{ PostId: s.PostId, PostName: s.PostName, PostCode: s.PostCode, @@ -113,6 +113,6 @@ func (s *SysPostById) Bind(ctx *gin.Context) error { return err } -func (s *SysPostById) GenerateM() (*system.SysPost, error) { - return &system.SysPost{}, nil -} +func (s *SysPostById) GenerateM() (*models.SysPost, error) { + return &models.SysPost{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index 0b8b98f..ff1c40f 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -76,8 +76,8 @@ func (s *SysRoleControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysRoleControl) Generate() (*system.SysRole, error) { - return &system.SysRole{ +func (s *SysRoleControl) Generate() (*models.SysRole, error) { + return &models.SysRole{ RoleId: s.RoleId, RoleName: s.RoleName, Status: s.Status, @@ -110,8 +110,8 @@ func (s *SysRoleById) GetId() interface{} { return s.Id } -func (s *SysRoleById) GenerateM() (*system.SysRole, error) { - return &system.SysRole{}, nil +func (s *SysRoleById) GenerateM() (*models.SysRole, error) { + return &models.SysRole{}, nil } // RoleDataScopeReq 角色数据权限修改 diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 97826ac..4abd426 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -3,8 +3,8 @@ package dto import ( "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" + "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -77,7 +77,7 @@ func (s *SysUserControl) Generate() dto.Control { } func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{ + return &models.SysUser{ UserId: s.UserId, Username: s.Username, Password: s.Password, @@ -108,11 +108,11 @@ func (s *SysUserById) Generate() dto.Control { } func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{}, nil + return &models.SysUser{}, nil } // PassWord 密码 type PassWord struct { NewPassword string `json:"newPassword" binding:"required"` OldPassword string `json:"oldPassword" binding:"required"` -} +} \ No newline at end of file diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 73e23e4..51ecc74 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -2,7 +2,7 @@ package service import ( "errors" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -14,9 +14,9 @@ type SysConfig struct { } // GetSysConfigPage 获取SysConfig列表 -func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error { +func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Scopes( @@ -32,9 +32,9 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC return nil } -func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error { +func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Scopes( @@ -49,8 +49,8 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.Sys } // GetSysConfig 获取SysConfig对象 -func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { - var data system.SysConfig +func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig) error { + var data models.SysConfig err := e.Orm.Model(&data). First(model, d.GetId()).Error @@ -67,9 +67,9 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) } // InsertSysConfig 创建SysConfig对象 -func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { +func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Create(model).Error @@ -81,7 +81,7 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { } // UpdateSysConfig 修改SysConfig对象 -func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { +func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error { var err error db := e.Orm.Model(c). @@ -99,9 +99,9 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { } // RemoveSysConfig 删除SysConfig -func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error { +func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig db := e.Orm.Model(&data). Where(d.Ids).Delete(c) @@ -120,7 +120,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e // GetSysConfigByKEY 根据Key获取SysConfig func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { var err error - var data system.SysConfig + var data models.SysConfig data.ConfigKey = c.ConfigKey err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error if err != nil { @@ -129,4 +129,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index a92335f..b1d2e63 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -4,10 +4,10 @@ import ( "errors" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -18,9 +18,9 @@ type SysDept struct { } // GetSysDeptPage 获取SysDept列表 -func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) error { +func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) e } // GetSysDept 获取SysDept对象 -func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { +func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { } // InsertSysDept 创建SysDept对象 -func (e *SysDept) InsertSysDept(model *system.SysDept) error { +func (e *SysDept) InsertSysDept(model *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Create(model).Error @@ -67,7 +67,7 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error { } deptPath := "/" + pkg.IntToString(model.DeptId) if model.ParentId != 0 { - var deptP system.SysDept + var deptP models.SysDept e.Orm.Model(&data).First(&deptP, model.ParentId) deptPath = deptP.DeptPath + deptPath } else { @@ -83,9 +83,9 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error { } // UpdateSysDept 修改SysDept对象 -func (e *SysDept) UpdateSysDept(c *system.SysDept) error { +func (e *SysDept) UpdateSysDept(c *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -106,7 +106,7 @@ func (e *SysDept) UpdateSysDept(c *system.SysDept) error { // RemoveSysDept 删除SysDept func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). Where(d.GetId()).Delete(&data) @@ -123,9 +123,9 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { } // GetSysDeptList 获取组织数据 -func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) error { +func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -141,7 +141,7 @@ func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) e // SetDeptTree 设置组织数据 func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) { - var list []system.SysDept + var list []models.SysDept err = e.getSysDeptList(c, &list) m = make([]dto.DeptLabel, 0) @@ -160,7 +160,7 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err erro } // Call 递归构造组织数据 -func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { +func deptTreeCall(deptlist *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptlist min := make([]dto.DeptLabel, 0) for j := 0; j < len(list); j++ { @@ -176,8 +176,8 @@ func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel } // SetDeptPage 设置dept页面数据 -func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err error) { - var list []system.SysDept +func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) { + var list []models.SysDept err = e.getSysDeptList(c, &list) //m := make([]models.SysDept, 0) @@ -192,16 +192,16 @@ func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err err return } -func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) system.SysDept { +func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) models.SysDept { list := *deptlist - min := make([]system.SysDept, 0) + min := make([]models.SysDept, 0) for j := 0; j < len(list); j++ { if menu.DeptId != list[j].ParentId { continue } - mi := system.SysDept{} + mi := models.SysDept{} mi.DeptId = list[j].DeptId mi.ParentId = list[j].ParentId mi.DeptPath = list[j].DeptPath @@ -212,7 +212,7 @@ func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) mi.Email = list[j].Email mi.Status = list[j].Status mi.CreatedAt = list[j].CreatedAt - mi.Children = []system.SysDept{} + mi.Children = []models.SysDept{} ms := e.deptPageCall(deptlist, mi) min = append(min, ms) @@ -242,7 +242,7 @@ func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) { } func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { - list := make([]system.SysDept, 0) + list := make([]models.SysDept, 0) err = e.Orm.Find(&list).Error if err != nil { log.Error("find dept list error, %s", err.Error()) @@ -266,7 +266,7 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { } // digitDeptLabel -func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { +func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptList var mi dto.DeptLabel @@ -283,4 +283,4 @@ func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabe } dept.Children = min return dept -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 4af36da..d104773 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysDictData struct { } // GetPage 获取列表 -func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictData, count *int64) error { +func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictData, count *int64) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictDa } // Get 获取对象 -func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) error { +func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) err } // Insert 创建对象 -func (e *SysDictData) Insert(model *system.SysDictData) error { +func (e *SysDictData) Insert(model *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysDictData) Insert(model *system.SysDictData) error { } // Update 修改对象 -func (e *SysDictData) Update(c *system.SysDictData) error { +func (e *SysDictData) Update(c *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -87,9 +87,9 @@ func (e *SysDictData) Update(c *system.SysDictData) error { } // Remove 删除 -func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) error { +func (e *SysDictData) Remove(d *dto.SysDictDataById, c *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) @@ -106,9 +106,9 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro } // GetAll 获取所有 -func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictData) error { +func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Scopes( @@ -120,4 +120,4 @@ func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictDat return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index c242df2..4a8a76a 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysDictType struct { } // GetPage 获取列表 -func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictType, count *int64) error { +func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictTy } // Get 获取对象 -func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) error { +func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) err } // Insert 创建对象 -func (e *SysDictType) Insert(model *system.SysDictType) error { +func (e *SysDictType) Insert(model *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysDictType) Insert(model *system.SysDictType) error { } // Update 修改对象 -func (e *SysDictType) Update(c *system.SysDictType) error { +func (e *SysDictType) Update(c *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -87,9 +87,9 @@ func (e *SysDictType) Update(c *system.SysDictType) error { } // Remove 删除 -func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) error { +func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) @@ -106,9 +106,9 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro } // GetAll 获取所有 -func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictType) error { +func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Scopes( @@ -120,4 +120,4 @@ func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictTyp return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index 800a1f1..a4194ac 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" common "go-admin/common/models" @@ -17,9 +17,9 @@ type SysLoginLog struct { } // GetSysLoginLogPage 获取SysLoginLog列表 -func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error { +func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog err = e.Orm.Model(&data). Scopes( @@ -36,9 +36,9 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste } // GetSysLoginLog 获取SysLoginLog对象 -func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLoginLog) error { +func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *models.SysLoginLog) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). First(model, d.GetId()) @@ -58,7 +58,7 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo // InsertSysLoginLog 创建SysLoginLog对象 func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog err = e.Orm.Model(&data). Create(model).Error @@ -72,7 +72,7 @@ func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { // UpdateSysLoginLog 修改SysLoginLog对象 func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -90,7 +90,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { // RemoveSysLoginLog 删除SysLoginLog func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). Where(d.Ids).Delete(c) @@ -104,4 +104,4 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 40422de..1c802df 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -3,7 +3,7 @@ package service import ( "errors" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -15,10 +15,10 @@ type SysMenu struct { } // GetSysMenuPage 获取SysMenu列表 -func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error) { - var m = make([]system.SysMenu, 0) +func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error) { + var m = make([]models.SysMenu, 0) var err error - var menu = make([]system.SysMenu, 0) + var menu = make([]models.SysMenu, 0) err = e.getSysMenuPage(c, &menu) for i := 0; i < len(menu); i++ { if menu[i].ParentId != 0 { @@ -32,11 +32,11 @@ func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error } // getSysMenuPage 菜单列表 -func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu - err = e.Orm.Model(&data). + err = e.Orm.Model(&data).Preload("SysApi"). Scopes( cDto.OrderDest("sort", false), cDto.MakeCondition(c.GetNeedSearch()), @@ -50,11 +50,11 @@ func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) e } // GetSysMenu 获取SysMenu对象 -func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { +func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu - db := e.Orm.Model(&data). + db := e.Orm.Model(&data).Preload("SysApi"). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { @@ -66,13 +66,16 @@ func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { e.Log.Errorf("db error:%s", err) return err } + for _, v := range model.SysApi { + model.Apis = append(model.Apis, v.Id) + } return nil } // InsertSysMenu 创建SysMenu对象 -func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error { +func (e *SysMenu) InsertSysMenu(model *models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu err = e.Orm.Model(&data). Create(model).Error @@ -83,10 +86,10 @@ func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error { return nil } -func (e *SysMenu) initPaths(menu *system.SysMenu) error { +func (e *SysMenu) initPaths(menu *models.SysMenu) error { var err error - var data system.SysMenu - parentMenu := new(system.SysMenu) + var data models.SysMenu + parentMenu := new(models.SysMenu) if menu.ParentId != 0 { e.Orm.Model(&data).First(parentMenu, menu.ParentId) if parentMenu.Paths == "" { @@ -102,12 +105,10 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error { } // UpdateSysMenu 修改SysMenu对象 -func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { +func (e *SysMenu) UpdateSysMenu(c *models.SysMenu) error { var err error - var data system.SysMenu - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + db := e.Orm.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -117,15 +118,15 @@ func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { } return nil -} +} // RemoveSysMenu 删除SysMenu func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { var err error - var data system.SysMenu + var data models.SysMenu db := e.Orm.Model(&data). - Where(d.GetId()).Delete(&data) + Where(d.Ids).Delete(&data) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) @@ -139,9 +140,9 @@ func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { } // GetSysMenuList 获取菜单数据 -func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu err = e.Orm.Model(&data). Scopes( @@ -157,7 +158,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e // SetSysMenuTree 设置菜单数据 func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { - var list []system.SysMenu + var list []models.SysMenu err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list) m = make([]dto.MenuLabel, 0) @@ -176,9 +177,9 @@ func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { } // 左侧菜单 -func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, err error) { +func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err error) { var table *gorm.DB - var data system.SysMenu + var data models.SysMenu if roleName == "admin" { table = e.Orm.Model(&data).Select("sys_menu.*") @@ -198,7 +199,7 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, } // menuLabelCall 递归构造组织数据 -func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { +func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel { list := *elist min := make([]dto.MenuLabel, 0) @@ -226,16 +227,16 @@ func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { return dept } -func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { +func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu { list := *menulist - min := make([]system.SysMenu, 0) + min := make([]models.SysMenu, 0) for j := 0; j < len(list); j++ { if menu.MenuId != list[j].ParentId { continue } - mi := system.SysMenu{} + mi := models.SysMenu{} mi.MenuId = list[j].MenuId mi.MenuName = list[j].MenuName mi.Title = list[j].Title @@ -251,7 +252,7 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { mi.Sort = list[j].Sort mi.Visible = list[j].Visible mi.CreatedAt = list[j].CreatedAt - mi.Children = []system.SysMenu{} + mi.Children = []models.SysMenu{} if mi.MenuType != "F" { ms := menuCall(menulist, mi) @@ -266,11 +267,11 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { return menu } -func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { +func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) { menus, err := e.getByRoleName(roleName) - m = make([]system.SysMenu, 0) + m = make([]models.SysMenu, 0) for i := 0; i < len(menus); i++ { if menus[i].ParentId != 0 { continue @@ -282,8 +283,8 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { return } -func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err error) { - var data system.SysMenu +func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err error) { + var data models.SysMenu var table *gorm.DB if roleName == "admin" { @@ -302,4 +303,4 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err er return } return -} +} \ No newline at end of file diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index cb81586..fa70c67 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -2,7 +2,7 @@ package service import ( "errors" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -14,9 +14,9 @@ type SysOperaLog struct { } // GetSysOperaLogPage 获取SysOperaLog列表 -func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]system.SysOperaLog, count *int64) error { +func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]models.SysOperaLog, count *int64) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog err = e.Orm.Model(&data). Scopes( @@ -33,8 +33,8 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste } // GetSysOperaLog 获取SysOperaLog对象 -func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error { - var data system.SysOperaLog +func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *models.SysOperaLog) error { + var data models.SysOperaLog err := e.Orm.Model(&data). First(model, d.GetId()).Error @@ -51,9 +51,9 @@ func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOp } // InsertSysOperaLog 创建SysOperaLog对象 -func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { +func (e *SysOperaLog) InsertSysOperaLog(model *models.SysOperaLog) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog err = e.Orm.Model(&data). Create(model).Error @@ -65,7 +65,7 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { } // UpdateSysOperaLog 修改SysOperaLog对象 -func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { +func (e *SysOperaLog) UpdateSysOperaLog(c *models.SysOperaLog) error { var err error db := e.Orm.Model(c). @@ -84,7 +84,7 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { // RemoveSysOperaLog 删除SysOperaLog func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog db := e.Orm.Model(&data).Where(d.Ids).Delete(&data) if err = db.Error; err != nil { diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index 7d3fe28..d5d983a 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysPost struct { } // GetSysPostPage 获取SysPost列表 -func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, count *int64) error { +func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, count *int64) error { var err error - var data system.SysPost + var data models.SysPost err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, c } // GetSysPost 获取SysPost对象 -func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { +func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { } // InsertSysPost 创建SysPost对象 -func (e *SysPost) InsertSysPost(model *system.SysPost) error { +func (e *SysPost) InsertSysPost(model *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysPost) InsertSysPost(model *system.SysPost) error { } // UpdateSysPost 修改SysPost对象 -func (e *SysPost) UpdateSysPost(c *system.SysPost) error { +func (e *SysPost) UpdateSysPost(c *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -89,7 +89,7 @@ func (e *SysPost) UpdateSysPost(c *system.SysPost) error { // RemoveSysPost 删除SysPost func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { @@ -102,4 +102,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index fedff99..1f76a22 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -6,7 +6,6 @@ import ( "gorm.io/gorm" "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -17,9 +16,9 @@ type SysRole struct { } // GetSysRolePage 获取SysRole列表 -func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, count *int64) error { +func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]models.SysRole, count *int64) error { var err error - var data system.SysRole + var data models.SysRole err = e.Orm.Model(&data). Scopes( @@ -36,7 +35,7 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c } // GetSysRole 获取SysRole对象 -func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { +func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *models.SysRole) error { var err error db := e.Orm.First(model, d.GetId()) @@ -59,9 +58,9 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { } // InsertSysRole 创建SysRole对象 -func (e *SysRole) InsertSysRole(c *system.SysRole) error { +func (e *SysRole) InsertSysRole(c *models.SysRole) error { var err error - var data system.SysRole + var data models.SysRole tx := e.Orm.Begin() defer func() { @@ -92,7 +91,7 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error { } // UpdateSysRole 修改SysRole对象 -func (e *SysRole) UpdateSysRole(c *system.SysRole) error { +func (e *SysRole) UpdateSysRole(c *models.SysRole) error { var err error tx := e.Orm.Debug().Begin() @@ -113,7 +112,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { return errors.New("无权更新该数据") } - var t system.RoleMenu + var t models.RoleMenu err = t.DeleteRoleMenu(tx, c.RoleId) if err != nil { e.Log.Errorf("delete role menu error, %", err.Error()) @@ -135,7 +134,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { // RemoveSysRole 删除SysRole func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { var err error - var data system.SysRole + var data models.SysRole tx := e.Orm.Begin() defer func() { @@ -188,7 +187,7 @@ func (e *SysRole) GetRoleMenuId(tx *gorm.DB, roleId int) ([]int, error) { return menuIds, nil } -func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { +func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) { tx := e.Orm.Begin() defer func() { if err != nil { @@ -197,20 +196,20 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { tx.Commit() } }() - err = tx.Model(&system.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error + err = tx.Model(&models.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error if err != nil { return err } - err = tx.Where("role_id = ?", c.RoleId).Delete(&system.SysRoleDept{}).Error + err = tx.Where("role_id = ?", c.RoleId).Delete(&models.SysRoleDept{}).Error if err != nil { return err } if c.DataScope == "2" { - deptRoles := make([]system.SysRoleDept, len(c.DeptIds)) + deptRoles := make([]models.SysRoleDept, len(c.DeptIds)) for i := range c.DeptIds { - deptRoles[i] = system.SysRoleDept{ + deptRoles[i] = models.SysRoleDept{ RoleId: c.RoleId, DeptId: c.DeptIds[i], } diff --git a/app/admin/service/sys_role_menu.go b/app/admin/service/sys_role_menu.go index 0f271c9..bcc4bca 100644 --- a/app/admin/service/sys_role_menu.go +++ b/app/admin/service/sys_role_menu.go @@ -3,7 +3,6 @@ package service import ( log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/common/service" "gorm.io/gorm" ) @@ -13,13 +12,13 @@ type SysRoleMenu struct { } func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err error) { - var role system.SysRole + var role models.SysRole msgID := e.MsgID menu := make([]models.Menu, 0) - roleMenu := make([]system.RoleMenu, len(menuId)) - casbinRule := make([]system.CasbinRule, 0) + roleMenu := make([]models.RoleMenu, len(menuId)) + casbinRule := make([]models.CasbinRule, 0) //先删除所有的 err = e.DeleteRoleMenu(tx, roleId) if err != nil { @@ -40,13 +39,13 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err return } for i := range menu { - roleMenu[i] = system.RoleMenu{ + roleMenu[i] = models.RoleMenu{ RoleId: role.RoleId, MenuId: menu[i].MenuId, RoleName: role.RoleKey, } if menu[i].MenuType == "A" { - casbinRule = append(casbinRule, system.CasbinRule{ + casbinRule = append(casbinRule, models.CasbinRule{ PType: "p", V0: role.RoleKey, V1: menu[i].Path, @@ -73,18 +72,18 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { msgID := e.MsgID err = tx.Where("role_id = ?", roleId). - Delete(&system.SysRoleDept{}).Error + Delete(&models.SysRoleDept{}).Error if err != nil { log.Errorf("msgID[%s] delete role's dept error, %s", msgID, err.Error()) return } err = tx.Where("role_id = ?", roleId). - Delete(&system.RoleMenu{}).Error + Delete(&models.RoleMenu{}).Error if err != nil { log.Errorf("msgID[%s] delete role's menu error, %s", msgID, err.Error()) return } - var role system.SysRole + var role models.SysRole err = tx.Where("role_id = ?", roleId). First(&role).Error if err != nil { @@ -92,7 +91,7 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { return } err = tx.Where("v0 = ?", role.RoleKey). - Delete(&system.CasbinRule{}).Error + Delete(&models.CasbinRule{}).Error if err != nil { log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error()) return @@ -100,8 +99,8 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { return } -func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, error) { - var r []system.MenuPath +func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, error) { + var r []models.MenuPath table := tx.Select("sys_menu.path").Table("sys_role_menu") table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id") table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id") @@ -110,4 +109,4 @@ func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, e return nil, err } return r, nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index 2962f1a..d02dd3d 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -2,12 +2,12 @@ package service import ( "errors" + "go-admin/app/admin/models" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/common/actions" cDto "go-admin/common/dto" common "go-admin/common/models" @@ -19,9 +19,9 @@ type SysUser struct { } // GetSysUserPage 获取SysUser列表 -func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]system.SysUser, count *int64) error { +func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]models.SysUser, count *int64) error { var err error - var data system.SysUser + var data models.SysUser err = e.Orm.Model(&data). Scopes( @@ -40,8 +40,8 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list * } // GetSysUser 获取SysUser对象 -func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *system.SysUser) error { - var data system.SysUser +func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *models.SysUser) error { + var data models.SysUser err := e.Orm.Model(&data). Scopes( @@ -63,7 +63,7 @@ func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *s // InsertSysUser 创建SysUser对象 func (e *SysUser) InsertSysUser(model common.ActiveRecord) error { var err error - var data system.SysUser + var data models.SysUser err = e.Orm.Model(&data). Create(model).Error @@ -96,7 +96,7 @@ func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission // RemoveSysUser 删除SysUser func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error { var err error - var data system.SysUser + var data models.SysUser db := e.Orm.Model(&data). Scopes( @@ -119,7 +119,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a if newPassword == "" { return nil } - c := &system.SysUser{} + c := &models.SysUser{} err = e.Orm.Model(c). Scopes( @@ -157,7 +157,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a return nil } -func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]system.SysRole, posts *[]system.SysPost) error { +func (e *SysUser) GetSysUserProfile(id int, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error { err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error if err != nil { return err @@ -172,4 +172,4 @@ func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]syste } return nil -} +} \ No newline at end of file diff --git a/cmd/api/server.go b/cmd/api/server.go index ad0ede2..9b40d88 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "github.com/go-admin-team/go-admin-core/sdk/runtime" + "go-admin/app/admin/models" "go-admin/app/admin/service" router2 "go-admin/app/other/router" "log" @@ -21,7 +22,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/spf13/cobra" - "go-admin/app/admin/models/system" "go-admin/app/admin/router" "go-admin/app/jobs" "go-admin/common/database" @@ -103,8 +103,8 @@ func setup() { log.Println(usageStr) //注册监听函数 queue := sdk.Runtime.GetMemoryQueue("") - queue.Register(global.LoginLog, system.SaveLoginLog) - queue.Register(global.OperateLog, system.SaveOperaLog) + queue.Register(global.LoginLog, models.SaveLoginLog) + queue.Register(global.OperateLog, models.SaveOperaLog) go queue.Run() } diff --git a/cmd/migrate/migration/models/sys_api.go b/cmd/migrate/migration/models/sys_api.go new file mode 100644 index 0000000..aef97eb --- /dev/null +++ b/cmd/migrate/migration/models/sys_api.go @@ -0,0 +1,30 @@ +package models + +import "go-admin/common/models" + +type SysApi struct { + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"type:varchar(128);comment:handle"` + Title string `json:"title" gorm:"type:varchar(128);comment:标题"` + Permission string `json:"permission" gorm:"size:255;"` + Path string `json:"path" gorm:"type:varchar(128);comment:地址"` + Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` + Action string `json:"action" gorm:"type:varchar(16);comment:类型"` + ParentId int `json:"parentId" gorm:"comment:按钮id"` + Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` + models.ModelTime + models.ControlBy +} + +func (SysApi) TableName() string { + return "sys_api" +} + +func (e *SysApi) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysApi) GetId() interface{} { + return e.Id +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_menu.go b/cmd/migrate/migration/models/sys_menu.go index c0f8848..501ba3d 100644 --- a/cmd/migrate/migration/models/sys_menu.go +++ b/cmd/migrate/migration/models/sys_menu.go @@ -1,28 +1,29 @@ package models type SysMenu struct { - MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` - MenuName string `json:"menuName" gorm:"size:128;"` - Title string `json:"title" gorm:"size:128;"` - Icon string `json:"icon" gorm:"size:128;"` - Path string `json:"path" gorm:"size:128;"` - Paths string `json:"paths" gorm:"size:128;"` - MenuType string `json:"menuType" gorm:"size:1;"` - Action string `json:"action" gorm:"size:16;"` - Permission string `json:"permission" gorm:"size:255;"` - ParentId int `json:"parentId" gorm:"size:11;"` - NoCache bool `json:"noCache" gorm:"size:8;"` - Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` - Component string `json:"component" gorm:"size:255;"` - Sort int `json:"sort" gorm:"size:4;"` - Visible string `json:"visible" gorm:"size:1;"` - IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` + MenuName string `json:"menuName" gorm:"size:128;"` + Title string `json:"title" gorm:"size:128;"` + Icon string `json:"icon" gorm:"size:128;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + SysApi []SysApi `gorm:"many2many:sys_menu_api_rule"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` ControlBy ModelTime } func (SysMenu) TableName() string { return "sys_menu" -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index ba23366..1d19dae 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -39,6 +39,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysFileInfo), new(models.SysCategory), new(models.SysContent), + new(models.SysApi), ) if err != nil { return err @@ -46,4 +47,4 @@ func _1599190683659Tables(db *gorm.DB, version string) error { return db.Create(&common.Migration{ Version: version, }).Error -} +} \ No newline at end of file diff --git a/common/apis/api.go b/common/apis/api.go index b4d977a..509d1a7 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -27,7 +27,6 @@ func (e *Api) MakeContext(c *gin.Context) { // GetLogger 获取上下文提供的日志 func (e Api) GetLogger() *logger.Logger { - return api.GetRequestLogger(e.Context) } diff --git a/common/middleware/handler/auth.go b/common/middleware/handler/auth.go index 36d940e..eabbbc8 100644 --- a/common/middleware/handler/auth.go +++ b/common/middleware/handler/auth.go @@ -1,6 +1,7 @@ package handler import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" @@ -14,7 +15,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/mssola/user_agent" - "go-admin/app/admin/models/system" "go-admin/common/global" ) @@ -159,8 +159,8 @@ func LogOut(c *gin.Context) { func Authorizator(data interface{}, c *gin.Context) bool { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(system.SysUser) - r, _ := v["role"].(system.SysRole) + u, _ := v["user"].(models.SysUser) + r, _ := v["role"].(models.SysRole) c.Set("role", r.RoleName) c.Set("roleIds", r.RoleId) c.Set("userId", u.UserId) @@ -177,4 +177,4 @@ func Unauthorized(c *gin.Context, code int, message string) { "code": code, "msg": message, }) -} +} \ No newline at end of file