diff --git a/README.Zh-cn.md b/README.Zh-cn.md index 1ab92bb..217b900 100644 --- a/README.Zh-cn.md +++ b/README.Zh-cn.md @@ -34,7 +34,7 @@ - 支持 Swagger 文档(基于swaggo) -- 基于 GORM 的数据库存储,可扩展多种类型数据库 +- 基于 GORM 的数据库存储,可扩展多种类型数据库 - 配置文件简单的模型映射,快速能够得到想要的配置 @@ -74,9 +74,9 @@ [步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html) -[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html) +[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html) -### 手把手教你从入门到放弃 - 视频教程 +### 手把手教你从入门到放弃 - 视频教程 [如何启动go-admin](https://www.bilibili.com/video/BV1z5411x7JG) diff --git a/app/admin/apis/system/captcha.go b/app/admin/apis/captcha.go similarity index 61% rename from app/admin/apis/system/captcha.go rename to app/admin/apis/captcha.go index 511fb78..b258e27 100644 --- a/app/admin/apis/system/captcha.go +++ b/app/admin/apis/captcha.go @@ -1,21 +1,24 @@ -package system +package apis import ( "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/captcha" - "go-admin/common/apis" ) type System struct { - apis.Api + api.Api } func (e System) GenerateCaptchaHandler(c *gin.Context) { - e.Context = c - log := e.GetLogger() + err := e.MakeContext(c).Errors + if err != nil { + e.Error(500, err, "服务初始化失败!") + return + } id, b64s, err := captcha.DriverDigitFunc() if err != nil { - log.Errorf("DriverDigitFunc error, %s", err.Error()) + e.Logger.Errorf("DriverDigitFunc error, %s", err.Error()) e.Error(500, err, "验证码获取失败") return } diff --git a/app/admin/apis/system/index.go b/app/admin/apis/index.go similarity index 97% rename from app/admin/apis/system/index.go rename to app/admin/apis/index.go index 5999749..19d691d 100644 --- a/app/admin/apis/system/index.go +++ b/app/admin/apis/index.go @@ -1,4 +1,4 @@ -package system +package apis import ( "github.com/gin-gonic/gin" diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go new file mode 100644 index 0000000..05fdaf7 --- /dev/null +++ b/app/admin/apis/sys_api.go @@ -0,0 +1,149 @@ +package apis + +import ( + "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" + "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" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" +) + +type SysApi struct { + api.Api +} + +// GetPage 获取接口管理列表 +// @Summary 获取接口管理列表 +// @Description 获取接口管理列表 +// @Tags 接口管理 +// @Param name query string false "名称" +// @Param title query string false "标题" +// @Param path query string false "地址" +// @Param action query string false "类型" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-api [get] +// @Security Bearer +func (e SysApi) GetPage(c *gin.Context) { + s := service.SysApi{} + req := dto.SysApiSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + //数据权限检查 + p := actions.GetPermissionFromContext(c) + list := make([]models.SysApi, 0) + var count int64 + err = s.GetPage(&req, p, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get 获取接口管理 +// @Summary 获取接口管理 +// @Description 获取接口管理 +// @Tags 接口管理 +// @Param id path string false "id" +// @Success 200 {object} response.Response{data=models.SysApi} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-api/{id} [get] +// @Security Bearer +func (e SysApi) Get(c *gin.Context) { + req := dto.SysApiById{} + s := service.SysApi{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + p := actions.GetPermissionFromContext(c) + var object models.SysApi + err = s.Get(&req, p, &object).Error + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +// Update 修改接口管理 +// @Summary 修改接口管理 +// @Description 修改接口管理 +// @Tags 接口管理 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysApiControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/sys-api/{id} [put] +// @Security Bearer +func (e SysApi) Update(c *gin.Context) { + req := dto.SysApiControl{} + s := service.SysApi{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + return + } + req.SetUpdateBy(user.GetUserId(c)) + p := actions.GetPermissionFromContext(c) + err = s.Update(&req, p) + if err != nil { + e.Error(500, err, "更新失败") + return + } + e.OK(req.GetId(), "更新成功") +} + +// DeleteSysApi 删除接口管理 +// @Summary 删除接口管理 +// @Description 删除接口管理 +// @Tags 接口管理 +// @Param ids body []int false "ids" +// @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" +// @Router /api/v1/sys-api [delete] +// @Security Bearer +func (e SysApi) DeleteSysApi(c *gin.Context) { + req := dto.SysApiById{} + s := service.SysApi{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + return + } + req.SetUpdateBy(user.GetUserId(c)) + p := actions.GetPermissionFromContext(c) + err = s.Remove(&req, p) + if err != nil { + e.Error(500, err, "删除失败") + return + } + e.OK(req.GetId(), "删除成功") +} \ No newline at end of file diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go new file mode 100644 index 0000000..e1b4c0c --- /dev/null +++ b/app/admin/apis/sys_config.go @@ -0,0 +1,314 @@ +package apis + +import ( + "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + + "go-admin/app/admin/models" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysConfig struct { + api.Api +} + +// GetPage 获取配置管理列表 +// @Summary 获取配置管理列表 +// @Description 获取配置管理列表 +// @Tags 配置管理 +// @Param configName query string false "名称" +// @Param configKey query string false "key" +// @Param configType query string false "类型" +// @Param isFrontend query int false "是否前端" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-config [get] +// @Security Bearer +func (e SysConfig) GetPage(c *gin.Context) { + s := service.SysConfig{} + req := dto.SysConfigSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + return + } + + list := make([]models.SysConfig, 0) + var count int64 + err = s.GetPage(&req, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get 获取配置管理 +// @Summary 获取配置管理 +// @Description 获取配置管理 +// @Tags 配置管理 +// @Param id path string false "id" +// @Success 200 {object} response.Response{data=models.SysConfig} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-config/{id} [get] +// @Security Bearer +func (e SysConfig) Get(c *gin.Context) { + req := dto.SysConfigById{} + s := service.SysConfig{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysConfig + + err = s.Get(&req, &object) + if err != nil { + e.Error(500, err, err.Error()) + return + } + + e.OK(object, "查询成功") +} + +// Insert 创建配置管理 +// @Summary 创建配置管理 +// @Description 创建配置管理 +// @Tags 配置管理 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysConfigControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "创建成功"}" +// @Router /api/v1/sys-config [post] +// @Security Bearer +func (e SysConfig) Insert(c *gin.Context) { + s := service.SysConfig{} + req := dto.SysConfigControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetCreateBy(user.GetUserId(c)) + + err = s.Insert(&req) + if err != nil { + e.Error(500, err, "创建失败") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update 修改配置管理 +// @Summary 修改配置管理 +// @Description 修改配置管理 +// @Tags 配置管理 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysConfigControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/sys-config/{id} [put] +// @Security Bearer +func (e SysConfig) Update(c *gin.Context) { + s := service.SysConfig{} + req := dto.SysConfigControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) + if err != nil { + e.Error(500, err, "更新失败") + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete 删除配置管理 +// @Summary 删除配置管理 +// @Description 删除配置管理 +// @Tags 配置管理 +// @Param ids body []int false "ids" +// @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" +// @Router /api/v1/sys-config [delete] +// @Security Bearer +func (e SysConfig) Delete(c *gin.Context) { + s := service.SysConfig{} + req := dto.SysConfigById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + + err = s.Remove(&req) + if err != nil { + e.Error(500, err, "删除失败") + return + } + e.OK(req.GetId(), "删除成功") +} + +// GetSysConfigBySysApp 获取系统配置信息 +// @Summary 获取系统前台配置信息,主要注意这里不在验证数据权限 +// @Description 获取系统配置信息,主要注意这里不在验证数据权限 +// @Tags 配置管理 +// @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}" +// @Router /api/v1/app-config [get] +// @Security Bearer +func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { + req := dto.SysConfigSearch{} + s := service.SysConfig{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + return + } + // 控制只读前台的数据 + req.IsFrontend = 1 + list := make([]models.SysConfig, 0) + err = s.GetWithKeyList(&req, &list) + if err != nil { + e.Error(500, err, "查询失败") + return + } + mp := make(map[string]string) + for i := 0; i < len(list); i++ { + key := list[i].ConfigKey + if key != "" { + mp[key] = list[i].ConfigValue + } + } + e.OK(mp, "查询成功") +} + +// Get2Set 获取配置 +// @Summary 获取配置 +// @Description 界面操作设置配置值的获取 +// @Tags 配置管理 +// @Accept application/json +// @Product application/json +// @Success 200 {object} response.Response{data=map[string]interface{}} "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/set-config [get] +// @Security Bearer +func (e SysConfig) Get2Set(c *gin.Context) { + s := service.SysConfig{} + req := make([]dto.GetSetSysConfigReq, 0) + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + err = s.GetForSet(&req) + if err != nil { + e.Error(500, err, "查询失败") + return + } + m := make(map[string]interface{}, 0) + for _, v := range req { + m[v.ConfigKey] = v.ConfigValue + } + e.OK(m, "查询成功") +} + +// Update2Set 设置配置 +// @Summary 设置配置 +// @Description 界面操作设置配置值 +// @Tags 配置管理 +// @Accept application/json +// @Product application/json +// @Param data body []dto.GetSetSysConfigReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/set-config [put] +// @Security Bearer +func (e SysConfig) Update2Set(c *gin.Context) { + s := service.SysConfig{} + req := make([]dto.GetSetSysConfigReq, 0) + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + err = s.UpdateForSet(&req) + if err != nil { + e.Error(500, err, err.Error()) + return + } + + e.OK("", "更新成功") +} + +// GetSysConfigByKEYForService 根据Key获取SysConfig的Service +// @Summary 根据Key获取SysConfig的Service +// @Description 根据Key获取SysConfig的Service +// @Tags 配置管理 +// @Param configKey path string false "configKey" +// @Success 200 {object} response.Response{data=dto.SysConfigByKeyReq} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-config/{id} [get] +// @Security Bearer +func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { + var s = new(service.SysConfig) + var req = new(dto.SysConfigByKeyReq) + var resp = new(dto.GetSysConfigByKEYForServiceResp) + err := e.MakeContext(c). + MakeOrm(). + Bind(req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + err = s.GetWithKey(req, resp) + if err != nil { + e.Error(500, err, err.Error()) + return + } + e.OK(resp, s.Msg) +} \ No newline at end of file diff --git a/app/admin/apis/sys_dept.go b/app/admin/apis/sys_dept.go new file mode 100644 index 0000000..ee96a4a --- /dev/null +++ b/app/admin/apis/sys_dept.go @@ -0,0 +1,238 @@ +package apis + +import ( + "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg" + "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" + + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysDept struct { + api.Api +} + +// GetPage +// @Summary 分页部门列表数据 +// @Description 分页列表 +// @Tags 部门 +// @Param deptName query string false "deptName" +// @Param deptId query string false "deptId" +// @Param position query string false "position" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dept [get] +// @Security Bearer +func (e SysDept) GetPage(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]models.SysDept, 0) + list, err = s.SetDeptPage(&req) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(list, "查询成功") +} + +// Get +// @Summary 部门列表数据 +// @Description 获取JSON +// @Tags 部门 +// @Param deptId path string false "deptId" +// @Param position query string false "position" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dept/{deptId} [get] +// @Security Bearer +func (e SysDept) Get(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysDept + + err = s.Get(&req, &object) + if err != nil { + e.Error(500, err, "查询失败") + return + } + + e.OK(object, "查询成功") +} + +// Insert 添加部门 +// @Summary 添加部门 +// @Description 获取JSON +// @Tags 部门 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysDeptControl true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dept [post] +// @Security Bearer +func (e SysDept) Insert(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // 设置创建人 + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req) + if err != nil { + e.Error(500, err, "创建失败") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update +// @Summary 修改部门 +// @Description 获取JSON +// @Tags 部门 +// @Accept application/json +// @Product application/json +// @Param id path int true "id" +// @Param data body dto.SysDeptControl true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dept/{deptId} [put] +// @Security Bearer +func (e SysDept) Update(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) + if err != nil { + e.Error(500, err, err.Error()) + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete +// @Summary 删除部门 +// @Description 删除数据 +// @Tags 部门 +// @Param data body dto.SysDeptById true "body" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dept [delete] +func (e SysDept) Delete(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + err = s.Remove(&req) + if err != nil { + e.Error(500, err, "删除失败") + return + } + e.OK(req.GetId(), "删除成功") +} + +// Get2Tree 用户管理 左侧部门树 +func (e SysDept) Get2Tree(c *gin.Context) { + s := service.SysDept{} + req := dto.SysDeptSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req,binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]dto.DeptLabel, 0) + list, err = s.SetDeptTree(&req) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(list, "") +} + +// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起 +func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { + s := service.SysDept{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + id, err := pkg.StringToInt(c.Param("roleId")) + result, err := s.SetDeptLabel() + if err != nil { + e.Error(500, err, err.Error()) + return + } + menuIds := make([]int, 0) + if id != 0 { + menuIds, err = s.GetWithRoleId(id) + if err != nil { + e.Error(500, err, err.Error()) + return + } + } + e.OK(gin.H{ + "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 new file mode 100644 index 0000000..032d46a --- /dev/null +++ b/app/admin/apis/sys_dict_data.go @@ -0,0 +1,219 @@ +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/api" + "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/service" + "go-admin/app/admin/service/dto" +) + +type SysDictData struct { + api.Api +} + +// GetPage +// @Summary 字典数据列表 +// @Description 获取JSON +// @Tags 字典数据 +// @Param status query string false "status" +// @Param dictCode query string false "dictCode" +// @Param dictType query string false "dictType" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dict/data [get] +// @Security Bearer +func (e SysDictData) GetPage(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + list := make([]models.SysDictData, 0) + var count int64 + err = s.GetPage(&req, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// GetSysDictData +// @Summary 通过编码获取字典数据 +// @Description 获取JSON +// @Tags 字典数据 +// @Param dictCode path int true "字典编码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dict/data/{dictCode} [get] +// @Security Bearer +func (e SysDictData) Get(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + var object models.SysDictData + + err = s.Get(&req, &object) + if err != nil { + e.Logger.Warnf("Get error: %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "查询失败") + return + } + + e.OK(object, "查询成功") +} + +// InsertSysDictData +// @Summary 添加字典数据 +// @Description 获取JSON +// @Tags 字典数据 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysDictDataControl true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dict/data [post] +// @Security Bearer +func (e SysDictData) Insert(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req) + if err != nil { + e.Error(500, err, "创建失败") + return + } + + e.OK(req.GetId(), "创建成功") +} + +// UpdateSysDictData +// @Summary 修改字典数据 +// @Description 获取JSON +// @Tags 字典数据 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysDictDataControl true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dict/data/{dictCode} [put] +// @Security Bearer +func (e SysDictData) Update(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) + if err != nil { + e.Error(500, err, "更新失败") + return + } + e.OK(req.GetId(), "更新成功") +} + +// DeleteSysDictData +// @Summary 删除字典数据 +// @Description 删除数据 +// @Tags 字典数据 +// @Param dictCode path int true "dictCode" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dict/data/{dictCode} [delete] +// @Security Bearer +func (e SysDictData) Delete(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(&req) + if err != nil { + e.Error(500, err, "删除失败") + return + } + e.OK(req.GetId(), "删除成功") +} + +// GetSysDictDataAll 数据字典根据key获取 业务页面使用 +// @Summary 数据字典根据key获取 +// @Description 数据字典根据key获取 +// @Tags 字典数据 +// @Param dictType query int true "dictType" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dict-data/option-select [get] +// @Security Bearer +func (e SysDictData) GetSysDictDataAll(c *gin.Context) { + s := service.SysDictData{} + req := dto.SysDictDataSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]models.SysDictData, 0) + err = s.GetAll(&req, &list) + if err != nil { + e.Error(500, err, "查询失败") + return + } + 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 new file mode 100644 index 0000000..3bd4721 --- /dev/null +++ b/app/admin/apis/sys_dict_type.go @@ -0,0 +1,213 @@ +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/api" + "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/service" + "go-admin/app/admin/service/dto" +) + +type SysDictType struct { + api.Api +} + +// GetPage 字典类型列表数据 +// @Summary 字典类型列表数据 +// @Description 获取JSON +// @Tags 字典类型 +// @Param dictName query string false "dictName" +// @Param dictId query string false "dictId" +// @Param dictType query string false "dictType" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dict/type [get] +// @Security Bearer +func (e SysDictType) GetPage(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]models.SysDictType, 0) + var count int64 + err = s.GetPage(&req, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get 字典类型通过字典id获取 +// @Summary 字典类型通过字典id获取 +// @Description 获取JSON +// @Tags 字典类型 +// @Param dictId path int true "字典类型编码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dict/type/{dictId} [get] +// @Security Bearer +func (e SysDictType) Get(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysDictType + err = s.Get(&req, &object) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +//Insert 字典类型创建 +// @Summary 添加字典类型 +// @Description 获取JSON +// @Tags 字典类型 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysDictTypeControl true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dict/type [post] +// @Security Bearer +func (e SysDictType) Insert(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req) + if err != nil { + e.Logger.Error(err) + e.Error(500, err, "创建失败") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update +// @Summary 修改字典类型 +// @Description 获取JSON +// @Tags 字典类型 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysDictTypeControl true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dict/type/{dictId} [put] +// @Security Bearer +func (e SysDictType) Update(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete +// @Summary 删除字典类型 +// @Description 删除数据 +// @Tags 字典类型 +// @Param dictId path int true "dictId" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dict/type/{dictId} [delete] +func (e SysDictType) Delete(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(&req) + if err != nil { + e.Error(500, err, err.Error()) + return + } + e.OK(req.GetId(), "删除成功") +} + +// GetAll +// @Summary 字典类型全部数据 代码生成使用接口 +// @Description 获取JSON +// @Tags 字典类型 +// @Param dictName query string false "dictName" +// @Param dictId query string false "dictId" +// @Param dictType query string false "dictType" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dict/type-option-select [get] +// @Security Bearer +func (e SysDictType) GetAll(c *gin.Context) { + s := service.SysDictType{} + req := dto.SysDictTypeSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]models.SysDictType, 0) + err = s.GetAll(&req, &list) + if err != nil { + e.Error(500, err, "查询失败") + return + } + 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 new file mode 100644 index 0000000..ee32b21 --- /dev/null +++ b/app/admin/apis/sys_login_log.go @@ -0,0 +1,111 @@ +package apis + +import ( + "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + "go-admin/app/admin/models" + + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysLoginLog struct { + api.Api +} + +// GetPage 登录日志列表 +// @Summary 登录日志列表 +// @Description 获取JSON +// @Tags 登录日志 +// @Param username query string false "用户名" +// @Param ipaddr query string false "ip地址" +// @Param loginLocation query string false "归属地" +// @Param status query string false "状态" +// @Param beginTime query string false "开始时间" +// @Param endTime query string false "结束时间" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-login-log [get] +// @Security Bearer +func (e SysLoginLog) GetPage(c *gin.Context) { + s := service.SysLoginLog{} + req := dto.SysLoginLogSearch {} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + list := make([]models.SysLoginLog, 0) + var count int64 + err = s.GetPage(&req, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// GetSysLoginLog 登录日志通过id获取 +// @Summary 登录日志通过id获取 +// @Description 获取JSON +// @Tags 登录日志 +// @Param id path string false "id" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-login-log/{id} [get] +// @Security Bearer +func (e SysLoginLog) Get(c *gin.Context) { + s := service.SysLoginLog{} + req := dto.SysLoginLogById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysLoginLog + err = s.Get(&req, &object) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +// DeleteSysLoginLog 登录日志删除 +// @Summary 登录日志删除 +// @Description 登录日志删除 +// @Tags 登录日志 +// @Param data body dto.SysLoginLogById true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-login-log [delete] +func (e SysLoginLog) Delete(c *gin.Context) { + s := service.SysLoginLog{} + req := dto.SysLoginLogById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(&req) + if err != nil { + e.Error(500, err, "删除失败") + return + } + e.OK(req.GetId(), "删除成功") +} \ No newline at end of file diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go new file mode 100644 index 0000000..3c82b61 --- /dev/null +++ b/app/admin/apis/sys_menu.go @@ -0,0 +1,282 @@ +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/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysMenu struct { + api.Api +} + +// GetPage Menu列表数据 +// @Summary Menu列表数据 +// @Description 获取JSON +// @Tags 菜单 +// @Param menuName query string false "menuName" +// @Param menuName query string false "menuName" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menu [get] +// @Security Bearer +func (e SysMenu) GetPage(c *gin.Context) { + s := service.SysMenu{} + req := dto.SysMenuSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var list = make([]models.SysMenu, 0) + err = s.GetPage(&req, &list).Error + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(list, "查询成功") +} + +// Get 获取菜单详情 +// @Summary Menu详情数据 +// @Description 获取JSON +// @Tags 菜单 +// @Param id path string false "id" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menu/{id} [get] +// @Security Bearer +func (e SysMenu) Get(c *gin.Context) { + req := dto.SysMenuById{} + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object = models.SysMenu{} + + err = s.Get(&req, &object).Error + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +// Insert 创建菜单 +// @Summary 创建菜单 +// @Description 获取JSON +// @Tags 菜单 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysMenuControl true "data" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menu [post] +// @Security Bearer +func (e SysMenu) Insert(c *gin.Context) { + req := dto.SysMenuControl{} + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + // 设置创建人 + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req).Error + if err != nil { + e.Error(500, err, "创建失败") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update 修改菜单 +// @Summary 修改菜单 +// @Description 获取JSON +// @Tags 菜单 +// @Accept application/json +// @Product application/json +// @Param id path int true "id" +// @Param data body dto.SysMenuControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menu/{id} [put] +// @Security Bearer +func (e SysMenu) Update(c *gin.Context) { + req := dto.SysMenuControl{} + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req).Error + if err != nil { + e.Error(500, err, "更新失败") + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete 删除菜单 +// @Summary 删除菜单 +// @Description 删除数据 +// @Tags 菜单 +// @Param data body dto.SysMenuById true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menu [delete] +func (e SysMenu) Delete(c *gin.Context) { + control := new(dto.SysMenuById) + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + Bind(control, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + err = s.Remove(control).Error + if err != nil { + e.Logger.Errorf("RemoveSysMenu error, %s", err) + e.Error(http.StatusInternalServerError, err, "删除失败") + return + } + e.OK(control.GetId(), "删除成功") +} + +// GetMenuRole 根据登录角色名称获取菜单列表数据(左菜单使用) +// @Summary 根据登录角色名称获取菜单列表数据(左菜单使用) +// @Description 获取JSON +// @Tags 菜单 +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menurole [get] +// @Security Bearer +func (e SysMenu) GetMenuRole(c *gin.Context) { + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + result, err := s.SetMenuRole(user.GetRoleName(c)) + + if err != nil { + e.Error(http.StatusInternalServerError, err, "查询失败") + return + } + + e.OK(result, "") +} + +// GetMenuIDS 获取角色对应的菜单id数组 +// @Summary 获取角色对应的菜单id数组,设置角色权限使用 +// @Description 获取JSON +// @Tags 菜单 +// @Param id path int true "id" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menuids/{id} [get] +// @Security Bearer +func (e SysMenu) GetMenuIDS(c *gin.Context) { + s := new(service.SysMenu) + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var data models.RoleMenu + data.RoleName = c.GetString("role") + data.UpdateBy = user.GetUserId(c) + result, err := data.GetIDS(s.Orm) + if err != nil { + e.Logger.Errorf("GetIDS error, %s", err.Error()) + e.Error(500, err, "获取失败") + return + } + e.OK(result, "") +} + +// GetMenuTreeSelect 根据角色ID查询菜单下拉树结构 +// @Summary 角色修改使用的菜单列表 +// @Description 获取JSON +// @Tags 菜单 +// @Accept application/json +// @Product application/json +// @Param roleId path int true "roleId" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/menuTreeselect/{roleId} [get] +// @Security Bearer +func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { + m := service.SysMenu{} + r := service.SysRole{} + req := dto.SelectRole{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&m.Service). + MakeService(&r.Service). + Bind(&req, nil). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + result, err := m.SetLabel() + if err != nil { + e.Error(500, err, "查询失败") + return + } + + menuIds := make([]int, 0) + if req.RoleId != 0 { + menuIds, err = r.GetRoleMenuId(req.RoleId) + if err != nil { + e.Error(500, err, "") + return + } + } + e.OK(gin.H{ + "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 new file mode 100644 index 0000000..cd97cf0 --- /dev/null +++ b/app/admin/apis/sys_opera_log.go @@ -0,0 +1,117 @@ +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/api" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysOperaLog struct { + api.Api +} + +// GetPage 操作日志列表 +// @Summary 操作日志列表 +// @Description 获取JSON +// @Tags 操作日志 +// @Param title query string false "title" +// @Param method query string false "method" +// @Param requestMethod query string false "requestMethod" +// @Param operUrl query string false "operUrl" +// @Param operIp query string false "operIp" +// @Param status query string false "status" +// @Param beginTime query string false "beginTime" +// @Param endTime query string false "endTime" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-opera-log [get] +// @Security Bearer +func (e SysOperaLog) GetPage(c *gin.Context) { + s := service.SysOperaLog{} + req := new(dto.SysOperaLogSearch) + err := e.MakeContext(c). + MakeOrm(). + Bind(req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + list := make([]models.SysOperaLog, 0) + var count int64 + + err = s.GetPage(req, &list, &count) + if err != nil { + e.Error(http.StatusUnprocessableEntity, err, "查询失败") + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get 操作日志通过id获取 +// @Summary 操作日志通过id获取 +// @Description 获取JSON +// @Tags 操作日志 +// @Param id path string false "id" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-opera-log/{id} [get] +// @Security Bearer +func (e SysOperaLog) Get(c *gin.Context) { + s := new(service.SysOperaLog) + req := dto.SysOperaLogById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysOperaLog + err = s.Get(&req, &object) + if err != nil { + e.Error(500, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +// Delete 操作日志删除 +// DeleteSysMenu 操作日志删除 +// @Summary 删除操作日志 +// @Description 删除数据 +// @Tags 操作日志 +// @Param data body dto.SysOperaLogById true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-opera-log [delete] +func (e SysOperaLog) Delete(c *gin.Context) { + s := new(service.SysOperaLog) + req := new(dto.SysOperaLogById) + err := e.MakeContext(c). + MakeOrm(). + Bind(req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + err = s.Remove(req) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "删除成功") +} \ No newline at end of file diff --git a/app/admin/apis/sys_post.go b/app/admin/apis/sys_post.go new file mode 100644 index 0000000..22c80da --- /dev/null +++ b/app/admin/apis/sys_post.go @@ -0,0 +1,186 @@ +package apis + +import ( + "github.com/gin-gonic/gin/binding" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" + "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" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" +) + +type SysPost struct { + api.Api +} + +// GetPage +// @Summary 岗位列表数据 +// @Description 获取JSON +// @Tags 岗位 +// @Param postName query string false "postName" +// @Param postCode query string false "postCode" +// @Param postId query string false "postId" +// @Param status query string false "status" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/post [get] +// @Security Bearer +func (e SysPost) GetPage(c *gin.Context) { + s := service.SysPost{} + req := dto.SysPostSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + list := make([]models.SysPost, 0) + var count int64 + + err = s.GetSysPostPage(&req, &list, &count) + if err != nil { + e.Error(http.StatusUnprocessableEntity, err, "查询失败") + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get +// @Summary 获取岗位信息 +// @Description 获取JSON +// @Tags 岗位 +// @Param postId path int true "postId" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/post/{postId} [get] +// @Security Bearer +func (e SysPost) Get(c *gin.Context) { + s := service.SysPost{} + req := dto.SysPostById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysPost + + err = s.GetSysPost(&req, &object) + if err != nil { + e.Error(500, err, "查询失败") + return + } + + e.OK(object, "查询成功") +} + +// Insert +// @Summary 添加岗位 +// @Description 获取JSON +// @Tags 岗位 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysPostControl true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/post [post] +// @Security Bearer +func (e SysPost) Insert(c *gin.Context) { + s := service.SysPost{} + req := dto.SysPostControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetCreateBy(user.GetUserId(c)) + err = s.InsertSysPost(&req) + if err != nil { + e.Error(500, err, "创建失败") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update +// @Summary 修改岗位 +// @Description 获取JSON +// @Tags 岗位 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysPostControl true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/post/ [put] +// @Security Bearer +func (e SysPost) Update(c *gin.Context) { + s := service.SysPost{} + req := dto.SysPostControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.SetUpdateBy(user.GetUserId(c)) + + err = s.UpdateSysPost(&req) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete +// @Summary 删除岗位 +// @Description 删除数据 +// @Tags 岗位 +// @Param id path int true "id" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 500 {string} string "{"code": 500, "message": "删除失败"}" +// @Router /api/v1/post/{postId} [delete] +func (e SysPost) Delete(c *gin.Context) { + s := service.SysPost{} + req := dto.SysPostById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.RemoveSysPost(&req) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "删除成功") +} \ No newline at end of file diff --git a/app/admin/apis/sys_role.go b/app/admin/apis/sys_role.go new file mode 100644 index 0000000..5b70a8c --- /dev/null +++ b/app/admin/apis/sys_role.go @@ -0,0 +1,282 @@ +package apis + +import ( + "fmt" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk" + "go-admin/app/admin/models" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" + "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/service" + "go-admin/app/admin/service/dto" + "go-admin/common/global" +) + +type SysRole struct { + api.Api +} + +// GetPage +// @Summary 角色列表数据 +// @Description Get JSON +// @Tags 角色/Role +// @Param roleName query string false "roleName" +// @Param status query string false "status" +// @Param roleKey query string false "roleKey" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role [get] +// @Security Bearer +func (e SysRole) GetPage(c *gin.Context) { + s := service.SysRole{} + req := dto.SysRoleSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + list := make([]models.SysRole, 0) + var count int64 + + err = s.GetPage(&req, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get +// @Summary 获取Role数据 +// @Description 获取JSON +// @Tags 角色/Role +// @Param roleId path string false "roleId" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role/{id} [get] +// @Security Bearer +func (e SysRole) Get(c *gin.Context) { + s := service.SysRole{} + req := dto.SysRoleById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, fmt.Sprintf(" %s ", err.Error())) + return + } + + var object models.SysRole + + err = s.Get(&req, &object) + if err != nil { + e.Error(http.StatusUnprocessableEntity, err, "查询失败") + return + } + + e.OK(object, "查询成功") +} + +// Insert +// @Summary 创建角色 +// @Description 获取JSON +// @Tags 角色/Role +// @Accept application/json +// @Product application/json +// @Param data body dto.SysRoleControl true "data" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role [post] +// @Security Bearer +func (e SysRole) Insert(c *gin.Context) { + s := service.SysRole{} + req := dto.SysRoleControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // 设置创建人 + req.CreateBy = user.GetUserId(c) + if req.Status == "" { + req.Status = "2" + } + cb := sdk.Runtime.GetCasbinKey(c.Request.Host) + err = s.Insert(&req, cb) + if err != nil { + e.Logger.Error(err) + e.Error(500, err, "创建失败") + return + } + _, err = global.LoadPolicy(c) + if err != nil { + e.Error(500, err, "") + return + } + e.OK(req.GetId(), "创建成功") +} + +// Update 修改用户角色 +// @Summary 修改用户角色 +// @Description 获取JSON +// @Tags 角色/Role +// @Accept application/json +// @Product application/json +// @Param data body dto.SysRoleControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role/{id} [put] +// @Security Bearer +func (e SysRole) Update(c *gin.Context) { + s := service.SysRole{} + req := dto.SysRoleControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + cb := sdk.Runtime.GetCasbinKey(c.Request.Host) + + req.SetUpdateBy(user.GetUserId(c)) + + err = s.Update(&req, cb) + if err != nil { + e.Logger.Error(err) + return + } + _, err = global.LoadPolicy(c) + if err != nil { + e.Error(http.StatusInternalServerError, err, "") + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete +// @Summary 删除用户角色 +// @Description 删除数据 +// @Tags 角色/Role +// @Param data body dto.SysRoleById true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role [delete] +// @Security Bearer +func (e SysRole) Delete(c *gin.Context) { + s := new(service.SysRole) + req := dto.SysRoleById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, fmt.Sprintf("删除角色 %v 失败,\r\n失败信息 %s", req.Ids, err.Error())) + return + } + + err = s.Remove(&req) + if err != nil { + e.Logger.Error(err) + e.Error(500, err, "") + return + } + _, err = global.LoadPolicy(c) + if err != nil { + e.Error(500, err, fmt.Sprintf("删除角色 %v 失败,失败信息 %s", req.Id, err.Error())) + return + } + e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功!", req.GetId())) +} + +// Update2Status 修改用户角色状态 +// @Summary 修改用户角色 +// @Description 获取JSON +// @Tags 角色/Role +// @Accept application/json +// @Product application/json +// @Param data body dto.UpdateStatusReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role-status/{id} [put] +// @Security Bearer +func (e SysRole) Update2Status(c *gin.Context) { + s := service.SysRole{} + req := dto.UpdateStatusReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, fmt.Sprintf("更新角色状态失败,失败原因:%s ", err.Error())) + return + } + req.SetUpdateBy(user.GetUserId(c)) + err = s.UpdateStatus(&req) + if err != nil { + e.Error(500, err, fmt.Sprintf("更新角色状态失败,失败原因:%s ", err.Error())) + return + } + e.OK(req.GetId(), fmt.Sprintf("更新角色 %v 状态成功!", req.GetId())) +} + +// Update2DataScope 更新角色数据权限 +// @Summary 更新角色数据权限 +// @Description 获取JSON +// @Tags 角色/Role +// @Accept application/json +// @Product application/json +// @Param data body dto.RoleDataScopeReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/role-status/{id} [put] +// @Security Bearer +func (e SysRole) Update2DataScope(c *gin.Context) { + s := &service.SysRole{} + req := dto.RoleDataScopeReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + data := &models.SysRole{ + RoleId: req.RoleId, + DataScope: req.DataScope, + DeptIds: req.DeptIds, + } + data.UpdateBy = user.GetUserId(c) + err = s.UpdateDataScope(data) + if err != nil { + e.Error(http.StatusInternalServerError, err, "") + return + } + e.OK(nil, "操作成功") +} diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go new file mode 100644 index 0000000..14bdff5 --- /dev/null +++ b/app/admin/apis/sys_user.go @@ -0,0 +1,445 @@ +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/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" + "github.com/google/uuid" + + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" +) + +type SysUser struct { + api.Api +} + +// GetPage +// @Summary 列表用户信息数据 +// @Description 获取JSON +// @Tags 用户 +// @Param username query string false "username" +// @Success 200 {string} {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-user [get] +// @Security Bearer +func (e SysUser) GetPage(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + list := make([]models.SysUser, 0) + var count int64 + + err = s.GetSysUserPage(&req, p, &list, &count) + if err != nil { + e.Error(500, err, "查询失败") + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get +// @Summary 获取用户 +// @Description 获取JSON +// @Tags 用户 +// @Param userId path int true "用户编码" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sysUser/{userId} [get] +// @Security Bearer +func (e SysUser) Get(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.SysUser + //数据权限检查 + p := actions.GetPermissionFromContext(c) + err = s.GetSysUser(&req, p, &object) + if err != nil { + e.Error(http.StatusUnprocessableEntity, err, "查询失败") + return + } + e.OK(object, "查询成功") +} + +// Insert +// @Summary 创建用户 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysUserControl true "用户数据" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sysUser [post] +func (e SysUser) Insert(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + // 设置创建人 + req.SetCreateBy(user.GetUserId(c)) + err = s.InsertSysUser(&req) + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + e.OK(req.GetId(), "创建成功") +} + +// Update +// @Summary 修改用户数据 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysUserControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-user/{userId} [put] +func (e SysUser) Update(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.SetUpdateBy(user.GetUserId(c)) + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + err = s.UpdateSysUser(&req, p) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "更新成功") +} + +// Delete +// @Summary 删除用户数据 +// @Description 删除数据 +// @Tags 用户 +// @Param userId path int true "userId" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sys-user/{userId} [delete] +func (e SysUser) Delete(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // 设置编辑人 + req.SetUpdateBy(user.GetUserId(c)) + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + err = s.RemoveSysUser(&req, p) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "删除成功") +} + +// InsetAvatar +// @Summary 修改头像 +// @Description 获取JSON +// @Tags 个人中心 +// @Accept multipart/form-data +// @Param file formData file true "file" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/avatar [post] +func (e SysUser) InsetAvatar(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserControl{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + form, _ := c.MultipartForm() + files := form.File["upload[]"] + guid := uuid.New().String() + filPath := "static/uploadfile/" + guid + ".jpg" + for _, file := range files { + e.Logger.Debugf("upload avatar file: %s", file.Filename) + // 上传文件至指定目录 + err = c.SaveUploadedFile(file, filPath) + if err != nil { + e.Logger.Errorf("save file error, %s", err.Error()) + e.Error(500, err, "") + return + } + } + req.UserId = p.UserId + req.Avatar = "/" + filPath + + err = s.UpdateSysUser(&req, p) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(filPath, "修改成功") +} + +// UpdateStatus 修改用户状态 +// @Summary 修改用户状态 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.UpdateSysUserStatusReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/status [put] +func (e SysUser) UpdateStatus(c *gin.Context) { + s := service.SysUser{} + req := dto.UpdateSysUserStatusReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON, nil). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.SetUpdateBy(user.GetUserId(c)) + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + err = s.UpdateSysUserStatus(&req, p) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "更新成功") +} + +// ResetPwd 重置用户密码 +// @Summary 重置用户密码 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.ResetSysUserPwdReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/pwd/reset [put] +func (e SysUser) ResetPwd(c *gin.Context) { + s := service.SysUser{} + req := dto.ResetSysUserPwdReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.JSON). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.SetUpdateBy(user.GetUserId(c)) + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + err = s.ResetSysUserPwd(&req, p) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(req.GetId(), "更新成功") +} + +// UpdatePwd +// @Summary 重置密码 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.PassWord true "body" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/pwd [post] +// @Security Bearer +func (e SysUser) UpdatePwd(c *gin.Context) { + s := service.SysUser{} + req := dto.PassWord{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + err = s.UpdateSysUserPwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p) + if err != nil { + e.Logger.Error(err) + e.Error(http.StatusForbidden, err, "密码修改失败") + return + } + e.OK(nil, "密码修改成功") +} + +// GetProfile +// @Summary 获取个人中心用户 +// @Description 获取JSON +// @Tags 个人中心 +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/profile [get] +// @Security Bearer +func (e SysUser) GetProfile(c *gin.Context) { + s := service.SysUser{} + req := dto.SysUserById{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + req.Id = user.GetUserId(c) + + sysUser := models.SysUser{} + roles := make([]models.SysRole, 0) + posts := make([]models.SysPost, 0) + err = s.GetSysUserProfile(&req, &sysUser, &roles, &posts) + if err != nil { + e.Logger.Errorf("get user profile error, %s", err.Error()) + e.Error(500, err, "获取用户信息失败") + return + } + e.OK(gin.H{ + "user": sysUser, + "roles": roles, + "posts": posts, + }, "查询成功") +} + +// GetInfo +// @Summary 获取个人信息 +// @Description 获取JSON +// @Tags 个人中心 +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/getinfo [get] +// @Security Bearer +func (e SysUser) GetInfo(c *gin.Context) { + req := dto.SysUserById{} + s := service.SysUser{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + p := actions.GetPermissionFromContext(c) + var roles = make([]string, 1) + roles[0] = user.GetRoleName(c) + var permissions = make([]string, 1) + permissions[0] = "*:*:*" + var buttons = make([]string, 1) + buttons[0] = "*:*:*" + RoleMenu := models.RoleMenu{} + RoleMenu.RoleId = user.GetRoleId(c) + var mp = make(map[string]interface{}) + mp["roles"] = roles + if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" { + mp["permissions"] = permissions + mp["buttons"] = buttons + } else { + list, _ := RoleMenu.GetPermis(e.Orm) + mp["permissions"] = list + mp["buttons"] = list + } + sysUser := models.SysUser{} + req.Id = user.GetUserId(c) + err = s.GetSysUser(&req, p, &sysUser) + if err != nil { + e.Error(http.StatusUnauthorized, err, "登录失败") + return + } + mp["introduction"] = " am a super administrator" + mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif" + if sysUser.Avatar != "" { + mp["avatar"] = sysUser.Avatar + } + mp["userName"] = sysUser.NickName + mp["userId"] = sysUser.UserId + mp["deptId"] = sysUser.DeptId + mp["name"] = sysUser.NickName + e.OK(mp, "") +} \ No newline at end of file diff --git a/app/admin/apis/sys_user/sys_user.go b/app/admin/apis/sys_user/sys_user.go deleted file mode 100644 index 3a04a1a..0000000 --- a/app/admin/apis/sys_user/sys_user.go +++ /dev/null @@ -1,472 +0,0 @@ -package sys_user - -import ( - "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" - "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" - "go-admin/common/apis" - common "go-admin/common/models" -) - -type SysUser struct { - apis.Api -} - -// @Summary 列表用户信息数据 -// @Description 获取JSON -// @Tags 用户 -// @Param username query string false "username" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/sysUser [get] -// @Security Bearer -func (e SysUser) GetSysUserList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysUserSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := d.Generate() - - //查询列表 - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - //数据权限检查 - p := actions.GetPermissionFromContext(c) - - list := make([]system.SysUser, 0) - var count int64 - serviceStudent := service.SysUser{} - serviceStudent.Log = log - serviceStudent.Orm = db - err = serviceStudent.GetSysUserPage(req, p, &list, &count) - if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") -} - -// @Summary 获取用户 -// @Description 获取JSON -// @Tags 用户 -// @Param userId path int true "用户编码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/sysUser/{userId} [get] -// @Security Bearer -func (e SysUser) GetSysUser(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysUserById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - req := control.Generate() - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysUser - - //数据权限检查 - p := actions.GetPermissionFromContext(c) - - serviceSysUser := service.SysUser{} - serviceSysUser.Log = log - serviceSysUser.Orm = db - err = serviceSysUser.GetSysUser(req, p, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 创建用户 -// @Description 获取JSON -// @Tags 用户 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysUserControl true "用户数据" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/sysUser [post] -func (e SysUser) InsertSysUser(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysUserControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - req := control.Generate() - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object common.ActiveRecord - object, err = req.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysUser := service.SysUser{} - serviceSysUser.Orm = db - serviceSysUser.Log = log - err = serviceSysUser.InsertSysUser(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改用户数据 -// @Description 获取JSON -// @Tags 用户 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysUserControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" -// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" -// @Router /api/v1/sysuser/{userId} [put] -func (e SysUser) UpdateSysUser(c *gin.Context) { - control := new(dto.SysUserControl) - - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := control.Generate() - //更新操作 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object common.ActiveRecord - object, err = req.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - //数据权限检查 - p := actions.GetPermissionFromContext(c) - - serviceSysUser := service.SysUser{} - serviceSysUser.Orm = db - serviceSysUser.Log = log - err = serviceSysUser.UpdateSysUser(object, p) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除用户数据 -// @Description 删除数据 -// @Tags 用户 -// @Param userId path int true "userId" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/sysuser/{userId} [delete] -func (e SysUser) DeleteSysUser(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysUserById) - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - req := control.Generate() - err = req.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object common.ActiveRecord - object, err = req.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) - - // 数据权限检查 - p := actions.GetPermissionFromContext(c) - - serviceSysUser := service.SysUser{} - serviceSysUser.Orm = db - serviceSysUser.Log = log - err = serviceSysUser.RemoveSysUser(req, object, p) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "删除成功") -} - -// @Summary 修改头像 -// @Description 获取JSON -// @Tags 用户 -// @Accept multipart/form-data -// @Param file formData file true "file" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/user/avatar [post] -func (e SysUser) InsetSysUserAvatar(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - // 数据权限检查 - p := actions.GetPermissionFromContext(c) - - form, _ := c.MultipartForm() - files := form.File["upload[]"] - guid := uuid.New().String() - filPath := "static/uploadfile/" + guid + ".jpg" - for _, file := range files { - log.Debugf("upload avatar file: %s", file.Filename) - // 上传文件至指定目录 - err = c.SaveUploadedFile(file, filPath) - if err != nil { - log.Errorf("save file error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") - return - } - } - - object := &system.SysUser{ - UserId: p.UserId, - Avatar: "/" + filPath, - } - serviceSysUser := service.SysUser{} - serviceSysUser.Orm = db - serviceSysUser.Log = log - err = serviceSysUser.UpdateSysUser(object, p) - if err != nil { - log.Error(err) - return - } - e.OK(filPath, "修改成功") -} - -// @Summary 重置密码 -// @Description 获取JSON -// @Tags 用户 -// @Accept application/json -// @Product application/json -// @Param data body dto.PassWord true "body" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/user/pwd [post] -// @Security Bearer -func (e SysUser) SysUserUpdatePwd(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - var pwd dto.PassWord - err = c.Bind(&pwd) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - // 数据权限检查 - p := actions.GetPermissionFromContext(c) - - serviceSysUser := service.SysUser{} - serviceSysUser.Orm = db - serviceSysUser.Log = log - err = serviceSysUser.UpdateSysUserPwd(user.GetUserId(c), pwd.OldPassword, pwd.NewPassword, p) - if err != nil { - log.Error(err) - e.Error(http.StatusForbidden, err, "密码修改失败") - return - } - e.OK(nil, "密码修改成功") -} - -// @Summary 获取个人中心用户 -// @Description 获取JSON -// @Tags 个人中心 -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/user/profile [get] -// @Security Bearer -func (e SysUser) GetSysUserProfile(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - id := user.GetUserId(c) - serviceSysUser := service.SysUser{} - serviceSysUser.Log = log - serviceSysUser.Orm = db - user := new(system.SysUser) - roles := make([]system.SysRole, 0) - posts := make([]system.SysPost, 0) - err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts) - if err != nil { - log.Errorf("get user profile error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "获取用户信息失败") - return - } - e.OK(gin.H{ - "user": user, - "roles": roles, - "posts": posts, - }, "查询成功") - //var SysUser models.SysUser - //userId := tools.GetUserIdStr(c) - //SysUser.UserId, _ = tools.StringToInt(userId) - //result, err := SysUser.Get() - //tools.HasError(err, "抱歉未找到相关信息", -1) - //var SysRole models.SysRole - //var Post models.Post - //var Dept models.SysDepts - ////获取角色列表 - //roles, err := SysRole.GetList() - ////获取职位列表 - //posts, err := Post.GetList() - ////获取部门列表 - //Dept.DeptId = result.DeptId - //dept, err := Dept.Get() - // - //postIds := make([]int, 0) - //postIds = append(postIds, result.PostId) - // - //roleIds := make([]int, 0) - //roleIds = append(roleIds, result.RoleId) - // - //app.Custum(c, gin.H{ - // "code": 200, - // "data": result, - // "postIds": postIds, - // "roleIds": roleIds, - // "roles": roles, - // "posts": posts, - // "dept": dept, - //}) -} - -func (e SysUser) GetInfo(c *gin.Context) { - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //数据权限检查 - p := actions.GetPermissionFromContext(c) - - var roles = make([]string, 1) - roles[0] = user.GetRoleName(c) - - var permissions = make([]string, 1) - permissions[0] = "*:*:*" - - var buttons = make([]string, 1) - buttons[0] = "*:*:*" - - RoleMenu := system.RoleMenu{} - RoleMenu.RoleId = user.GetRoleId(c) - - var mp = make(map[string]interface{}) - mp["roles"] = roles - if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" { - mp["permissions"] = permissions - mp["buttons"] = buttons - } else { - list, _ := RoleMenu.GetPermis(db) - mp["permissions"] = list - mp["buttons"] = list - } - - var sysUser system.SysUser - req := new(dto.SysUserById) - req.Id = user.GetUserId(c) - serviceSysUser := service.SysUser{} - serviceSysUser.Log = log - serviceSysUser.Orm = db - err = serviceSysUser.GetSysUser(req, p, &sysUser) - if err != nil { - e.Error(http.StatusUnauthorized, err, "登录失败") - return - } - - mp["introduction"] = " am a super administrator" - - mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif" - if sysUser.Avatar != "" { - mp["avatar"] = sysUser.Avatar - } - mp["userName"] = sysUser.NickName - mp["userId"] = sysUser.UserId - mp["deptId"] = sysUser.DeptId - mp["name"] = sysUser.NickName - e.OK(mp, "") -} diff --git a/app/admin/apis/system/dict/sys_dict_data.go b/app/admin/apis/system/dict/sys_dict_data.go deleted file mode 100644 index 94d16df..0000000 --- a/app/admin/apis/system/dict/sys_dict_data.go +++ /dev/null @@ -1,269 +0,0 @@ -package dict - -import ( - "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" - common "go-admin/common/models" -) - -type SysDictData struct { - apis.Api -} - -// @Summary 字典数据列表 -// @Description 获取JSON -// @Tags 字典数据 -// @Param status query string false "status" -// @Param dictCode query string false "dictCode" -// @Param dictType query string false "dictType" -// @Param pageSize query int false "页条数" -// @Param pageIndex query int false "页码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dict/data [get] -// @Security Bearer -func (e SysDictData) GetSysDictDataList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictDataSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysDictData, 0) - var count int64 - s := service.SysDictData{} - s.Log = log - s.Orm = db.Debug() - err = s.GetPage(req, &list, &count) - if err != nil { - log.Errorf("GetPage error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") -} - -// @Summary 通过编码获取字典数据 -// @Description 获取JSON -// @Tags 字典数据 -// @Param dictCode path int true "字典编码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dict/data/{dictCode} [get] -// @Security Bearer -func (e SysDictData) GetSysDictData(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - req := &dto.SysDictDataById{} - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysDictData - - s := service.SysDictData{} - s.Log = log - s.Orm = db - err = s.Get(req, &object) - if err != nil { - log.Warnf("Get error: %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 添加字典数据 -// @Description 获取JSON -// @Tags 字典数据 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysDictDataControl true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dict/data [post] -// @Security Bearer -func (e SysDictData) InsertSysDictData(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - req := &dto.SysDictDataControl{} - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, _ := req.GenerateM() - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - s := service.SysDictData{} - s.Orm = db - s.Log = log - err = s.Insert(object.(*system.SysDictData)) - if err != nil { - log.Errorf("Insert error, %s", err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改字典数据 -// @Description 获取JSON -// @Tags 字典数据 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysDictDataControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dict/data/{dictCode} [put] -// @Security Bearer -func (e SysDictData) UpdateSysDictData(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictDataControl{} - //更新操作 - err = req.Bind(c) - if err != nil { - log.Warnf("request validate error, %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, _ := req.GenerateM() - object.SetUpdateBy(user.GetUserId(c)) - - s := service.SysDictData{} - s.Orm = db - s.Log = log - err = s.Update(object.(*system.SysDictData)) - if err != nil { - log.Errorf("Update error, %s", err) - e.Error(http.StatusInternalServerError, err, "更新失败") - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除字典数据 -// @Description 删除数据 -// @Tags 字典数据 -// @Param dictCode path int true "dictCode" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/dict/data/{dictCode} [delete] -func (e SysDictData) DeleteSysDictData(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - req := new(dto.SysDictDataById) - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object common.ActiveRecord - object, err = req.GenerateM() - if err != nil { - log.Errorf("GenerateM error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) - - s := service.SysDictData{} - s.Orm = db - s.Log = log - err = s.Remove(req, object.(*system.SysDictData)) - if err != nil { - log.Errorf("Remove error, %s", err) - e.Error(http.StatusInternalServerError, err, "删除失败") - return - } - e.OK(object.GetId(), "删除成功") -} - -func (e SysDictData) GetSysDictDataAll(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictDataSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - log.Warnf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysDictData, 0) - s := service.SysDictData{} - s.Log = log - s.Orm = db - err = s.GetAll(req, &list) - if err != nil { - log.Errorf("GetAll error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.OK(list, "查询成功") -} diff --git a/app/admin/apis/system/dict/sys_dict_type.go b/app/admin/apis/system/dict/sys_dict_type.go deleted file mode 100644 index c2a0529..0000000 --- a/app/admin/apis/system/dict/sys_dict_type.go +++ /dev/null @@ -1,267 +0,0 @@ -package dict - -import ( - "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" - common "go-admin/common/models" -) - -type SysDictType struct { - apis.Api -} - -// @Summary 字典类型列表数据 -// @Description 获取JSON -// @Tags 字典类型 -// @Param dictName query string false "dictName" -// @Param dictId query string false "dictId" -// @Param dictType query string false "dictType" -// @Param pageSize query int false "页条数" -// @Param pageIndex query int false "页码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dict/type [get] -// @Security Bearer -func (e SysDictType) GetSysDictTypeList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictTypeSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysDictType, 0) - var count int64 - s := service.SysDictType{} - s.Log = log - s.Orm = db.Debug() - err = s.GetPage(req, &list, &count) - if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") -} - -// @Summary 通过字典id获取字典类型 -// @Description 获取JSON -// @Tags 字典类型 -// @Param dictId path int true "字典类型编码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dict/type/{dictId} [get] -// @Security Bearer -func (e SysDictType) GetSysDictType(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - req := &dto.SysDictTypeById{} - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysDictType - - s := service.SysDictType{} - s.Log = log - s.Orm = db - err = s.Get(req, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 添加字典类型 -// @Description 获取JSON -// @Tags 字典类型 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysDictTypeControl true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dict/type [post] -// @Security Bearer -func (e SysDictType) InsertSysDictType(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - req := &dto.SysDictTypeControl{} - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, _ := req.GenerateM() - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - s := service.SysDictType{} - s.Orm = db - s.Log = log - err = s.Insert(object.(*system.SysDictType)) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改字典类型 -// @Description 获取JSON -// @Tags 字典类型 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysDictTypeControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dict/type/{dictId} [put] -// @Security Bearer -func (e SysDictType) UpdateSysDictType(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictTypeControl{} - //更新操作 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, _ := req.GenerateM() - object.SetUpdateBy(user.GetUserId(c)) - - s := service.SysDictType{} - s.Orm = db - s.Log = log - err = s.Update(object.(*system.SysDictType)) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除字典类型 -// @Description 删除数据 -// @Tags 字典类型 -// @Param dictId path int true "dictId" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/dict/type/{dictId} [delete] -func (e SysDictType) DeleteSysDictType(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - req := new(dto.SysDictTypeById) - err = req.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object common.ActiveRecord - object, err = req.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) - - s := service.SysDictType{} - s.Orm = db - s.Log = log - err = s.Remove(req, object.(*system.SysDictType)) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "删除成功") -} - -// @Summary 字典类型全部数据 -// @Description 获取JSON -// @Tags 字典类型 -// @Param dictName query string false "dictName" -// @Param dictId query string false "dictId" -// @Param dictType query string false "dictType" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dict/type-option-select [get] -// @Security Bearer -func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictTypeSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysDictType, 0) - s := service.SysDictType{} - s.Log = log - s.Orm = db - err = s.GetAll(req, &list) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(list, "查询成功") -} diff --git a/app/admin/apis/system/settings.go b/app/admin/apis/system/settings.go deleted file mode 100644 index af53e0e..0000000 --- a/app/admin/apis/system/settings.go +++ /dev/null @@ -1,98 +0,0 @@ -package system - -import ( - "fmt" - "net/http" - "strings" - - "github.com/gin-gonic/gin" - - "go-admin/app/admin/models" - "go-admin/app/admin/service" - "go-admin/app/admin/service/dto" - "go-admin/common/apis" -) - -type SysSetting struct { - apis.Api -} - -// @Summary 查询系统信息 -// @Description 获取JSON -// @Tags 系统信息 -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/setting [get] -func (e SysSetting) GetSetting(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - sysSettingService := service.SysSetting{} - sysSettingService.Log = log - sysSettingService.Orm = db - var model = models.SysSetting{} - err = sysSettingService.GetSysSetting(&model) - if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - if model.Logo != "" { - if !strings.HasPrefix(model.Logo, "http") { - model.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, model.Logo) - } - } - - e.OK(model, "查询成功") -} - -// @Summary 更新或提交系统信息 -// @Description 获取JSON -// @Tags 系统信息 -// @Param data body dto.SysSettingControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/system/setting [post] -func (e SysSetting) CreateOrUpdateSetting(c *gin.Context) { - control := new(dto.SysSettingControl) - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - - sysSettingService := service.SysSetting{} - sysSettingService.Log = log - sysSettingService.Orm = db - err = sysSettingService.UpdateSysSetting(object) - if err != nil { - e.Error(http.StatusInternalServerError, err, "更新失败") - return - } - - if object.Logo != "" { - if !strings.HasPrefix(object.Logo, "http") { - object.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, object.Logo) - } - } - e.OK(object, "提交成功") -} diff --git a/app/admin/apis/system/sys_config/sys_config.go b/app/admin/apis/system/sys_config/sys_config.go deleted file mode 100644 index 977de4f..0000000 --- a/app/admin/apis/system/sys_config/sys_config.go +++ /dev/null @@ -1,277 +0,0 @@ -package sys_config - -import ( - "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" -) - -type SysConfig struct { - apis.Api -} - -func (e SysConfig) GetSysConfigList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysConfigSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - log.Errorf("参数验证失败, error:%s", err) - e.Error(500, err, "参数验证失败") - return - } - - list := make([]system.SysConfig, 0) - var count int64 - s := service.SysConfig{} - s.Log = log - s.Orm = db - err = s.GetSysConfigPage(d, &list, &count) - if err != nil { - log.Errorf("GetSysConfigPage 查询失败, error:%s", err) - e.Error(500, err, "查询失败") - return - } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") -} - -// GetSysConfigBySysApp 获取系统配置信息,主要注意这里不在验证数据权限 -func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysConfigSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - err = d.Bind(c) - if err != nil { - log.Errorf("参数验证失败, error:%s", err) - e.Error(500, err, "参数验证失败") - return - } - - // 控制只读前台的数据 - d.IsFrontend = 1 - - list := make([]system.SysConfig, 0) - s := service.SysConfig{} - s.Log = log - s.Orm = db - err = s.GetSysConfigByKey(d, &list) - if err != nil { - log.Errorf("GetSysConfigPage 查询失败, error:%s", err) - e.Error(500, err, "查询失败") - return - } - mp := make(map[string]string) - for i := 0; i < len(list); i++ { - key := list[i].ConfigKey - if key != "" { - mp[key] = list[i].ConfigValue - } - } - e.OK(mp, "查询成功") -} - -func (e SysConfig) GetSysConfig(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysConfigById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - var object system.SysConfig - - serviceSysLoginLog := service.SysConfig{} - serviceSysLoginLog.Log = log - serviceSysLoginLog.Orm = db - err = serviceSysLoginLog.GetSysConfig(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - - e.OK(object, "查看成功") -} - -func (e SysConfig) InsertSysConfig(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysConfigControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysConfig{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.InsertSysConfig(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -func (e SysConfig) UpdateSysConfig(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysConfigControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysConfig{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.UpdateSysConfig(object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "更新失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - e.OK(object.GetId(), "更新成功") -} - -func (e SysConfig) DeleteSysConfig(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysConfigById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - object, err := control.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysConfig{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.RemoveSysConfig(control, object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "删除失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") - return - } - e.OK(object.GetId(), "删除成功") -} - -// GetSysConfigByKEYForService 根据Key获取SysConfig的Service -func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - var v dto.SysConfigControl - err = v.Bind(c) - if err != nil { - log.Errorf("参数验证错误, error:%s", err) - e.Error(422, err, "参数验证失败") - return - } - s := service.SysConfig{} - s.Log = log - s.Orm = db - err = s.GetSysConfigByKEY(&v) - if err != nil { - log.Errorf("通过Key获取配置失败, error:%s", err) - e.Error(500, err, "") - return - } - e.OK(v, s.Msg) -} diff --git a/app/admin/apis/system/sys_dept/sys_dept.go b/app/admin/apis/system/sys_dept/sys_dept.go deleted file mode 100644 index 71cfa02..0000000 --- a/app/admin/apis/system/sys_dept/sys_dept.go +++ /dev/null @@ -1,294 +0,0 @@ -package sys_dept - -import ( - "github.com/go-admin-team/go-admin-core/sdk/pkg" - "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" -) - -type SysDept struct { - apis.Api -} - -// @Summary 分页部门列表数据 -// @Description 分页列表 -// @Tags 部门 -// @Param name query string false "name" -// @Param id query string false "id" -// @Param position query string false "position" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dept [get] -// @Security Bearer -func (e SysDept) GetSysDeptList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysDeptSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysDept, 0) - serviceStudent := service.SysDept{} - serviceStudent.Log = log - serviceStudent.Orm = db - list, err = serviceStudent.SetDeptPage(d) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(list, "查询成功") -} - -// @Summary 部门列表数据 -// @Description 获取JSON -// @Tags 部门 -// @Param deptId path string false "deptId" -// @Param position query string false "position" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dept/{deptId} [get] -// @Security Bearer -func (e SysDept) GetSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysDeptById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysDept - - serviceSysOperlog := service.SysDept{} - serviceSysOperlog.Log = log - serviceSysOperlog.Orm = db - err = serviceSysOperlog.GetSysDept(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 添加部门 -// @Description 获取JSON -// @Tags 部门 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysDeptControl true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dept [post] -// @Security Bearer -func (e SysDept) InsertSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysDeptControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysDept := service.SysDept{} - serviceSysDept.Orm = db - serviceSysDept.Log = log - err = serviceSysDept.InsertSysDept(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改部门 -// @Description 获取JSON -// @Tags 部门 -// @Accept application/json -// @Product application/json -// @Param id path int true "id" -// @Param data body dto.SysDeptControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dept/{deptId} [put] -// @Security Bearer -func (e SysDept) UpdateSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysDeptControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysDept := service.SysDept{} - serviceSysDept.Orm = db - serviceSysDept.Log = log - err = serviceSysDept.UpdateSysDept(object) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除部门 -// @Description 删除数据 -// @Tags 部门 -// @Param data body dto.SysDeptById true "body" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/dept [delete] -func (e SysDept) DeleteSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysDeptById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - serviceSysDept := service.SysDept{} - serviceSysDept.Orm = db - serviceSysDept.Log = log - err = serviceSysDept.RemoveSysDept(control) - if err != nil { - log.Errorf("RemoveSysDept error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "删除失败") - return - } - e.OK(control.GetId(), "删除成功") -} - -// GetDeptTree 用户管理 左侧部门树 -func (e SysDept) GetDeptTree(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysDeptSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]dto.DeptLabel, 0) - serviceStudent := service.SysDept{} - serviceStudent.Log = log - serviceStudent.Orm = db - list, err = serviceStudent.SetDeptTree(d) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - //var Dept models.SysDepts - //Dept.DeptName = c.Request.FormValue("deptName") - //Dept.Status = c.Request.FormValue("status") - //Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId")) - //result, err := Dept.SetDept(false) - //tools.HasError(err, "抱歉未找到相关信息", -1) - e.OK(list, "") -} - -func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - s := service.SysDept{} - s.Orm = db - s.Log = log - id, err := pkg.StringToInt(c.Param("roleId")) - result, err := s.SetDeptLabel() - if err != nil { - log.Errorf("SetDeptLabel error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") - } - menuIds := make([]int, 0) - if id != 0 { - menuIds, err = s.GetRoleDeptId(id) - if err != nil { - log.Errorf("抱歉未找到相关信息, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") - } - } - e.OK(gin.H{ - "depts": result, - "checkedKeys": menuIds, - }, "") -} diff --git a/app/admin/apis/system/sys_login_log/sys_login_log.go b/app/admin/apis/system/sys_login_log/sys_login_log.go deleted file mode 100644 index 2c3cbe3..0000000 --- a/app/admin/apis/system/sys_login_log/sys_login_log.go +++ /dev/null @@ -1,188 +0,0 @@ -package sys_login_log - -import ( - "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" -) - -type SysLoginLog struct { - apis.Api -} - -func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysLoginLogSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysLoginLog, 0) - var count int64 - serviceStudent := service.SysLoginLog{} - serviceStudent.Log = log - serviceStudent.Orm = db - err = serviceStudent.GetSysLoginLogPage(d, &list, &count) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") -} - -func (e SysLoginLog) GetSysLoginLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysLoginLogById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysLoginLog - - serviceSysLoginLog := service.SysLoginLog{} - serviceSysLoginLog.Log = log - serviceSysLoginLog.Orm = db - err = serviceSysLoginLog.GetSysLoginLog(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -func (e SysLoginLog) InsertSysLoginLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysLoginLogControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysLoginLog{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.InsertSysLoginLog(object) - if err != nil { - log.Errorf("InsertSysLoginLog error, %s", err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -func (e SysLoginLog) UpdateSysLoginLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysLoginLogControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysLoginLog{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.UpdateSysLoginLog(object) - if err != nil { - log.Errorf("UpdateSysLoginLog error, %s", err) - e.Error(http.StatusInternalServerError, err, "更新失败") - return - } - e.OK(object.GetId(), "更新成功") -} - -func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysLoginLogById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysLoginLog := service.SysLoginLog{} - serviceSysLoginLog.Orm = db - serviceSysLoginLog.Log = log - err = serviceSysLoginLog.RemoveSysLoginLog(control, object) - if err != nil { - log.Errorf("RemoveSysLoginLog error, %s", err) - e.Error(http.StatusInternalServerError, err, "删除失败") - return - } - e.OK(object.GetId(), "删除成功") -} diff --git a/app/admin/apis/system/sys_menu/sys_menu.go b/app/admin/apis/system/sys_menu/sys_menu.go deleted file mode 100644 index 7654b78..0000000 --- a/app/admin/apis/system/sys_menu/sys_menu.go +++ /dev/null @@ -1,369 +0,0 @@ -package sys_menu - -import ( - "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" -) - -type SysMenu struct { - apis.Api -} - -// @Summary Menu列表数据 -// @Description 获取JSON -// @Tags 菜单 -// @Param menuName query string false "menuName" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menulist [get] -// @Security Bearer -func (e SysMenu) GetSysMenuList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysMenuSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - var list *[]system.SysMenu - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Log = log - serviceSysMenu.Orm = db - list, err = serviceSysMenu.GetSysMenuPage(d) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(list, "查询成功") -} - -// @Summary Menu详情数据 -// @Description 获取JSON -// @Tags 菜单 -// @Param menuName query string false "menuName" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menu/{id} [get] -// @Security Bearer -func (e SysMenu) GetSysMenu(c *gin.Context) { - control := new(dto.SysMenuById) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysMenu - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Log = log - serviceSysMenu.Orm = db - err = serviceSysMenu.GetSysMenu(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 创建菜单 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Param menuName formData string true "menuName" -// @Param Path formData string false "Path" -// @Param Action formData string true "Action" -// @Param Permission formData string true "Permission" -// @Param ParentId formData string true "ParentId" -// @Param IsDel formData string true "IsDel" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/menu [post] -// @Security Bearer -func (e SysMenu) InsertSysMenu(c *gin.Context) { - control := new(dto.SysMenuControl) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Orm = db - serviceSysMenu.Log = log - err = serviceSysMenu.InsertSysMenu(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改菜单 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Param id path int true "id" -// @Param data body dto.SysMenuControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" -// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" -// @Router /api/v1/menu/{id} [put] -// @Security Bearer -func (e SysMenu) UpdateSysMenu(c *gin.Context) { - control := new(dto.SysMenuControl) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Orm = db - serviceSysMenu.Log = log - err = serviceSysMenu.UpdateSysMenu(object) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除菜单 -// @Description 删除数据 -// @Tags 菜单 -// @Param data body dto.SysMenuById true "body" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/menu/ [delete] -func (e SysMenu) DeleteSysMenu(c *gin.Context) { - control := new(dto.SysMenuById) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Orm = db - serviceSysMenu.Log = log - err = serviceSysMenu.RemoveSysMenu(control) - if err != nil { - log.Errorf("RemoveSysMenu error, %s", err) - e.Error(http.StatusInternalServerError, err, "删除失败") - return - } - e.OK(control.GetId(), "删除成功") -} - -// @Summary 根据角色名称获取菜单列表数据(左菜单使用) -// @Description 获取JSON -// @Tags 菜单 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menurole [get] -// @Security Bearer -func (e SysMenu) GetMenuRole(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Log = log - serviceSysMenu.Orm = db - result, err := serviceSysMenu.SetMenuRole(user.GetRoleName(c)) - - if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") - return - } - - e.OK(result, "") -} - -// @Summary 获取角色对应的菜单id数组 -// @Description 获取JSON -// @Tags 菜单 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menuids/{id} [get] -// @Security Bearer -func (e SysMenu) GetMenuIDS(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - var data system.RoleMenu - data.RoleName = c.GetString("role") - data.UpdateBy = user.GetUserId(c) - result, err := data.GetIDS(db) - if err != nil { - log.Errorf("GetIDS error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "获取失败") - return - } - e.OK(result, "") -} - -//// GetMenuTreeRoleselect 角色修改中的菜单列表 -//func (e SysMenu) GetMenuTreeRoleselect(c *gin.Context) { -// var Menu models.Menu -// var SysRole models.SysRole -// -// id, err := tools.StringToInt(c.Param("roleId")) -// SysRole.RoleId = id -// //var r *models.SysRole -// r, err := SysRole.Get() -// -// var result *[]models.MenuLable -// menuIds := make([]int, 0) -// if r.RoleKey != "admin" { -// result, err = Menu.SetMenuLabel() -// tools.HasError(err, "抱歉未找到相关信息", -1) -// if id != 0 { -// menuIds, err = SysRole.GetRoleMeunId() -// tools.HasError(err, "抱歉未找到相关信息", -1) -// } -// } -// app.Custum(c, gin.H{ -// "code": 200, -// "menus": result, -// "checkedKeys": menuIds, -// }) -//} - -// @Summary 获取菜单树 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/menuTreeselect [get] -// @Security Bearer -func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - d := new(dto.SelectRole) - - err = c.BindUri(d) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Log = log - serviceSysMenu.Orm = db - result, err := serviceSysMenu.SetSysMenuLabel() - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - s := service.SysRole{} - s.Log = log - s.Orm = db - menuIds, err := s.GetRoleMenuId(db, d.RoleId) - if err != nil { - log.Errorf("GetIDS error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") - return - } - e.OK(gin.H{ - "menus": result, - "checkedKeys": menuIds, - }, "获取成功") -} diff --git a/app/admin/apis/system/sys_opera_log/sys_opera_log.go b/app/admin/apis/system/sys_opera_log/sys_opera_log.go deleted file mode 100644 index 8a15027..0000000 --- a/app/admin/apis/system/sys_opera_log/sys_opera_log.go +++ /dev/null @@ -1,178 +0,0 @@ -package sys_opera_log - -import ( - "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" -) - -type SysOperaLog struct { - apis.Api -} - -func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysOperaLogSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysOperaLog, 0) - var count int64 - serviceStudent := service.SysOperaLog{} - serviceStudent.Log = log - serviceStudent.Orm = db - err = serviceStudent.GetSysOperaLogPage(d, &list, &count) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") -} - -func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysOperaLogById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysOperaLog - - serviceSysOperlog := service.SysOperaLog{} - serviceSysOperlog.Log = log - serviceSysOperlog.Orm = db - err = serviceSysOperlog.GetSysOperaLog(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -func (e SysOperaLog) InsertSysOperaLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysOperaLogControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysOperaLog := service.SysOperaLog{} - serviceSysOperaLog.Orm = db - serviceSysOperaLog.Log = log - err = serviceSysOperaLog.InsertSysOperaLog(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -func (e SysOperaLog) UpdateSysOperaLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysOperaLogControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysOperaLog := service.SysOperaLog{} - serviceSysOperaLog.Orm = db - serviceSysOperaLog.Log = log - err = serviceSysOperaLog.UpdateSysOperaLog(object) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysOperaLogById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - serviceSysOperaLog := service.SysOperaLog{} - serviceSysOperaLog.Orm = db - serviceSysOperaLog.Log = log - err = serviceSysOperaLog.RemoveSysOperaLog(control) - if err != nil { - log.Error(err) - return - } - e.OK(control.GetId(), "删除成功") -} diff --git a/app/admin/apis/system/sys_post/sys_post.go b/app/admin/apis/system/sys_post/sys_post.go deleted file mode 100644 index a4789bb..0000000 --- a/app/admin/apis/system/sys_post/sys_post.go +++ /dev/null @@ -1,223 +0,0 @@ -package sys_post - -import ( - "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" -) - -type SysPost struct { - apis.Api -} - -// @Summary 岗位列表数据 -// @Description 获取JSON -// @Tags 岗位 -// @Param postName query string false "postName" -// @Param postCode query string false "postCode" -// @Param postId query string false "postId" -// @Param status query string false "status" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/post [get] -// @Security Bearer -func (e SysPost) GetSysPostList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysPostSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysPost, 0) - var count int64 - serviceStudent := service.SysPost{} - serviceStudent.Log = log - serviceStudent.Orm = db - err = serviceStudent.GetSysPostPage(d, &list, &count) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") -} - -// @Summary 获取岗位信息 -// @Description 获取JSON -// @Tags 岗位 -// @Param postId path int true "postId" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/post/{postId} [get] -// @Security Bearer -func (e SysPost) GetSysPost(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysPostById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysPost - - serviceSysOperlog := service.SysPost{} - serviceSysOperlog.Log = log - serviceSysOperlog.Orm = db - err = serviceSysOperlog.GetSysPost(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 添加岗位 -// @Description 获取JSON -// @Tags 岗位 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysPostControl true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/post [post] -// @Security Bearer -func (e SysPost) InsertSysPost(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysPostControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) - - serviceSysPost := service.SysPost{} - serviceSysPost.Orm = db - serviceSysPost.Log = log - err = serviceSysPost.InsertSysPost(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改岗位 -// @Description 获取JSON -// @Tags 岗位 -// @Accept application/json -// @Product application/json -// @Param data body dto.SysPostControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/post/ [put] -// @Security Bearer -func (e SysPost) UpdateSysPost(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysPostControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) - - serviceSysPost := service.SysPost{} - serviceSysPost.Orm = db - serviceSysPost.Log = log - err = serviceSysPost.UpdateSysPost(object) - if err != nil { - log.Error(err) - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除岗位 -// @Description 删除数据 -// @Tags 岗位 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 500 {string} string "{"code": 500, "message": "删除失败"}" -// @Router /api/v1/post/{postId} [delete] -func (e SysPost) DeleteSysPost(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysPostById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - serviceSysPost := service.SysPost{} - serviceSysPost.Orm = db - serviceSysPost.Log = log - err = serviceSysPost.RemoveSysPost(control) - if err != nil { - log.Error(err) - return - } - e.OK(control.GetId(), "删除成功") -} diff --git a/app/admin/apis/system/sys_role/sys_role.go b/app/admin/apis/system/sys_role/sys_role.go deleted file mode 100644 index 20544c1..0000000 --- a/app/admin/apis/system/sys_role/sys_role.go +++ /dev/null @@ -1,279 +0,0 @@ -package sys_role - -import ( - "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" - "go-admin/common/global" -) - -type SysRole struct { - apis.Api -} - -// @Summary 角色列表数据 -// @Description Get JSON -// @Tags 角色/Role -// @Param roleName query string false "roleName" -// @Param status query string false "status" -// @Param roleKey query string false "roleKey" -// @Param pageSize query int false "页条数" -// @Param pageIndex query int false "页码" -// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/role [get] -// @Security Bearer -func (e SysRole) GetSysRoleList(c *gin.Context) { - e.Context = c - log := e.GetLogger() - d := new(dto.SysRoleSearch) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - list := make([]system.SysRole, 0) - var count int64 - s := service.SysRole{} - s.Log = log - s.Orm = db - err = s.GetSysRolePage(d, &list, &count) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") -} - -// @Summary 获取Role数据 -// @Description 获取JSON -// @Tags 角色/Role -// @Param roleId path string false "roleId" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/role/{id} [get] -// @Security Bearer -func (e SysRole) GetSysRole(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysRoleById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - var object system.SysRole - - s := service.SysRole{} - s.Log = log - s.Orm = db - err = s.GetSysRole(control, &object) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - return - } - - e.OK(object, "查看成功") -} - -// @Summary 创建角色 -// @Description 获取JSON -// @Tags 角色/Role -// @Accept application/json -// @Product application/json -// @Param data body dto.SysRoleControl true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/role [post] -// @Security Bearer -func (e SysRole) InsertSysRole(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysRoleControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //新增操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - // 设置创建人 - object.CreateBy = user.GetUserId(c) - if object.Status == "" { - object.Status = "2" - } - - s := service.SysRole{} - s.Orm = db - s.Log = log - err = s.InsertSysRole(object) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") - return - } - _, err = global.LoadPolicy(c) - if err != nil { - e.Error(http.StatusInternalServerError, err, "") - return - } - e.OK(object.GetId(), "创建成功") -} - -// @Summary 修改用户角色 -// @Description 获取JSON -// @Tags 角色/Role -// @Accept application/json -// @Product application/json -// @Param data body dto.SysRoleControl true "body" -// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" -// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" -// @Router /api/v1/role/{id} [put] -// @Security Bearer -func (e SysRole) UpdateSysRole(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysRoleControl) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.UpdateBy = user.GetUserId(c) - - s := service.SysRole{} - s.Orm = db - s.Log = log - err = s.UpdateSysRole(object) - if err != nil { - log.Error(err) - return - } - _, err = global.LoadPolicy(c) - if err != nil { - e.Error(http.StatusInternalServerError, err, "") - return - } - e.OK(object.GetId(), "更新成功") -} - -// @Summary 删除用户角色 -// @Description 删除数据 -// @Tags 角色/Role -// @Param data body dto.SysRoleById true "body" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/role [delete] -// @Security Bearer -func (e SysRole) DeleteSysRole(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.SysRoleById) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //删除操作 - err = control.Bind(c) - if err != nil { - log.Errorf("Bind error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - - s := service.SysRole{} - s.Orm = db - s.Log = log - err = s.RemoveSysRole(control) - if err != nil { - log.Error(err) - e.Error(http.StatusInternalServerError, err, "") - return - } - _, err = global.LoadPolicy(c) - if err != nil { - e.Error(http.StatusInternalServerError, err, "") - return - } - e.OK(control.GetId(), "删除成功") -} - -func (e SysRole) UpdateRoleDataScope(c *gin.Context) { - e.Context = c - log := e.GetLogger() - control := new(dto.RoleDataScopeReq) - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - - //更新操作 - err = c.Bind(control) - if err != nil { - log.Errorf("request bind error, %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - data := &system.SysRole{ - RoleId: control.RoleId, - DataScope: control.DataScope, - DeptIds: control.DeptIds, - } - data.UpdateBy = user.GetUserId(c) - s := &service.SysRole{} - s.Orm = db - s.Log = log - err = s.UpdateDataScope(data) - if err != nil { - e.Error(http.StatusInternalServerError, err, "") - return - } - e.OK(nil, "操作成功") -} diff --git a/app/admin/apis/tools/dbcolumns.go b/app/admin/apis/tools/dbcolumns.go index aa4ca76..1f82df9 100644 --- a/app/admin/apis/tools/dbcolumns.go +++ b/app/admin/apis/tools/dbcolumns.go @@ -10,6 +10,7 @@ import ( "go-admin/app/admin/models/tools" ) +// GetDBColumnList 分页列表数据 // @Summary 分页列表数据 / page list data // @Description 数据库表列分页列表 / database table column page list // @Tags 工具 / Tools diff --git a/app/admin/apis/tools/dbtables.go b/app/admin/apis/tools/dbtables.go index 12f6ae4..6c94aae 100644 --- a/app/admin/apis/tools/dbtables.go +++ b/app/admin/apis/tools/dbtables.go @@ -12,6 +12,7 @@ import ( "go-admin/app/admin/models/tools" ) +// GetDBTableList 分页列表数据 // @Summary 分页列表数据 / page list data // @Description 数据库表分页列表 / database table page list // @Tags 工具 / Tools @@ -32,7 +33,6 @@ func (e *Gen) GetDBTableList(c *gin.Context) { err = errors.New("对不起,sqlite3 或 postgres 不支持代码生成!") log.Warn(err) e.Error(403, err, "") - //c.JSON(http.StatusOK, res.ReturnError(500)) return } diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index b96c1a3..437f09e 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -2,8 +2,11 @@ package tools import ( "bytes" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" "net/http" "strconv" + "strings" "text/template" "time" @@ -12,13 +15,11 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/config" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "go-admin/app/admin/models" "go-admin/app/admin/models/tools" - "go-admin/common/apis" ) type Gen struct { - apis.Api + api.Api } func (e Gen) Preview(c *gin.Context) { @@ -218,12 +219,12 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { return } - _ = pkg.PathCreate("./app/" + tab.PackageName + "/apis/" + tab.ModuleName) + _ = pkg.PathCreate("./app/" + tab.PackageName + "/apis/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/models/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName) + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -239,25 +240,31 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { err = t6.Execute(&b6, tab) var b7 bytes.Buffer err = t7.Execute(&b7, tab) - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go") - pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+"/"+tab.BusinessName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go") - pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.BusinessName+".go") + pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") + pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go") + pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") + pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") + pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") + pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") + pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go") } func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { - e.Context = c - log := e.GetLogger() + err := e.MakeContext(c). + MakeOrm(). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } basePath := "template/" t1, err := template.ParseFiles(basePath + "api_migrate.template") if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } @@ -273,8 +280,15 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { } func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { - e.Context = c - log := api.GetRequestLogger(c) + err := e.MakeContext(c). + MakeOrm(). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + basePath := "template/v4/" routerFile := basePath + "actions/router_check_role.go.template" @@ -284,31 +298,31 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { t1, err := template.ParseFiles(basePath + "model.go.template") if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } t3, err := template.ParseFiles(routerFile) if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } t4, err := template.ParseFiles(basePath + "js.go.template") if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } t5, err := template.ParseFiles(basePath + "vue.go.template") if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } t6, err := template.ParseFiles(basePath + "dto.go.template") if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(500, err, "") return } @@ -317,7 +331,7 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName) + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -330,35 +344,37 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { var b6 bytes.Buffer err = t6.Execute(&b6, tab) - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go") + pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") + pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") + pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") + pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") + pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") } func (e Gen) GenMenuAndApi(c *gin.Context) { - log := api.GetRequestLogger(c) - e.Context = c - table := tools.SysTables{} - timeNow := pkg.GetCurrentTime() - id, err := pkg.StringToInt(c.Param("tableId")) - pkg.HasError(err, "", -1) - - db, err := pkg.GetOrm(c) + s:=service.SysMenu{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "数据库连接获取失败") + e.Logger.Error(err) + e.Error(500, err, err.Error()) return } + table := tools.SysTables{} + id, err := pkg.StringToInt(c.Param("tableId")) + pkg.HasError(err, "", -1) + + table.TableId = id - tab, _ := table.Get(db) - Mmenu := models.Menu{} - Mmenu.MenuName = tab.TBName + "Manage" + tab, _ := table.Get(e.Orm) + + Mmenu := dto.SysMenuControl{} Mmenu.Title = tab.TableComment Mmenu.Icon = "pass" - Mmenu.Path = "/" + tab.TBName + Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1) Mmenu.MenuType = "M" Mmenu.Action = "无" Mmenu.ParentId = 0 @@ -367,216 +383,95 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Mmenu.Sort = 0 Mmenu.Visible = "0" Mmenu.IsFrame = "0" - Mmenu.CreateBy = "1" - Mmenu.UpdateBy = "1" - Mmenu.CreatedAt = timeNow - Mmenu.UpdatedAt = timeNow - Mmenu.MenuId, err = Mmenu.Create(db) + Mmenu.CreateBy = 1 + s.Insert(&Mmenu) - Cmenu := models.Menu{} - Cmenu.MenuName = tab.TBName + Cmenu := dto.SysMenuControl{} + Cmenu.MenuName = tab.ClassName + "Manage" Cmenu.Title = tab.TableComment Cmenu.Icon = "pass" Cmenu.Path = tab.TBName Cmenu.MenuType = "C" Cmenu.Action = "无" - Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list" + Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list" Cmenu.ParentId = Mmenu.MenuId Cmenu.NoCache = false - Cmenu.Component = "/" + tab.BusinessName + "/index" + Cmenu.Component = "/" + tab.ModuleFrontName + "/index" Cmenu.Sort = 0 Cmenu.Visible = "0" Cmenu.IsFrame = "0" - Cmenu.CreateBy = "1" - Cmenu.UpdateBy = "1" - Cmenu.CreatedAt = timeNow - Cmenu.UpdatedAt = timeNow - Cmenu.MenuId, err = Cmenu.Create(db) + Cmenu.CreateBy = 1 + Cmenu.UpdateBy = 1 + s.Insert(&Cmenu) - MList := models.Menu{} + MList := dto.SysMenuControl{} MList.MenuName = "" MList.Title = "分页获取" + tab.TableComment MList.Icon = "" MList.Path = tab.TBName MList.MenuType = "F" MList.Action = "无" - MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query" + MList.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":query" MList.ParentId = Cmenu.MenuId MList.NoCache = false MList.Sort = 0 MList.Visible = "0" MList.IsFrame = "0" - MList.CreateBy = "1" - MList.UpdateBy = "1" - MList.CreatedAt = timeNow - MList.UpdatedAt = timeNow - MList.MenuId, err = MList.Create(db) + MList.CreateBy = 1 + MList.UpdateBy = 1 + s.Insert(&MList) - MCreate := models.Menu{} + MCreate := dto.SysMenuControl{} MCreate.MenuName = "" MCreate.Title = "创建" + tab.TableComment MCreate.Icon = "" MCreate.Path = tab.TBName MCreate.MenuType = "F" MCreate.Action = "无" - MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add" + MCreate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":add" MCreate.ParentId = Cmenu.MenuId MCreate.NoCache = false MCreate.Sort = 0 MCreate.Visible = "0" MCreate.IsFrame = "0" - MCreate.CreateBy = "1" - MCreate.UpdateBy = "1" - MCreate.CreatedAt = timeNow - MCreate.UpdatedAt = timeNow - MCreate.MenuId, err = MCreate.Create(db) + MCreate.CreateBy = 1 + MCreate.UpdateBy = 1 + s.Insert(&MCreate) - MUpdate := models.Menu{} + MUpdate := dto.SysMenuControl{} MUpdate.MenuName = "" MUpdate.Title = "修改" + tab.TableComment MUpdate.Icon = "" MUpdate.Path = tab.TBName MUpdate.MenuType = "F" MUpdate.Action = "无" - MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit" + MUpdate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":edit" MUpdate.ParentId = Cmenu.MenuId MUpdate.NoCache = false MUpdate.Sort = 0 MUpdate.Visible = "0" MUpdate.IsFrame = "0" - MUpdate.CreateBy = "1" - MUpdate.UpdateBy = "1" - MUpdate.CreatedAt = timeNow - MUpdate.UpdatedAt = timeNow - MUpdate.MenuId, err = MUpdate.Create(db) + MUpdate.CreateBy = 1 + MUpdate.UpdateBy = 1 + s.Insert(&MUpdate) - MDelete := models.Menu{} + MDelete := dto.SysMenuControl{} MDelete.MenuName = "" MDelete.Title = "删除" + tab.TableComment MDelete.Icon = "" MDelete.Path = tab.TBName MDelete.MenuType = "F" MDelete.Action = "无" - MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove" + MDelete.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":remove" MDelete.ParentId = Cmenu.MenuId MDelete.NoCache = false MDelete.Sort = 0 MDelete.Visible = "0" MDelete.IsFrame = "0" - MDelete.CreateBy = "1" - MDelete.UpdateBy = "1" - MDelete.CreatedAt = timeNow - MDelete.UpdatedAt = timeNow - MDelete.MenuId, err = MDelete.Create(db) + MDelete.CreateBy = 1 + MDelete.UpdateBy = 1 + s.Insert(&MDelete) - var InterfaceId = 63 - Amenu := models.Menu{} - Amenu.MenuName = tab.TBName - Amenu.Title = tab.TableComment - Amenu.Icon = "bug" - Amenu.Path = tab.TBName - Amenu.MenuType = "M" - Amenu.Action = "无" - Amenu.ParentId = InterfaceId - Amenu.NoCache = false - Amenu.Sort = 0 - Amenu.Visible = "1" - Amenu.IsFrame = "0" - Amenu.CreateBy = "1" - Amenu.UpdateBy = "1" - Amenu.CreatedAt = timeNow - Amenu.UpdatedAt = timeNow - Amenu.MenuId, err = Amenu.Create(db) - - AList := models.Menu{} - AList.MenuName = "" - AList.Title = "分页获取" + tab.TableComment - AList.Icon = "bug" - AList.Path = "/api/v1/" + tab.ModuleName - AList.MenuType = "A" - AList.Action = "GET" - AList.ParentId = Amenu.MenuId - AList.NoCache = false - AList.Sort = 0 - AList.Visible = "1" - AList.IsFrame = "0" - AList.CreateBy = "1" - AList.UpdateBy = "1" - AList.CreatedAt = timeNow - AList.UpdatedAt = timeNow - AList.MenuId, err = AList.Create(db) - - AGet := models.Menu{} - AGet.MenuName = "" - AGet.Title = "根据id获取" + tab.TableComment - AGet.Icon = "bug" - AGet.Path = "/api/v1/" + tab.ModuleName + "/:id" - AGet.MenuType = "A" - AGet.Action = "GET" - AGet.ParentId = Amenu.MenuId - AGet.NoCache = false - AGet.Sort = 0 - AGet.Visible = "1" - AGet.IsFrame = "0" - AGet.CreateBy = "1" - AGet.UpdateBy = "1" - AGet.CreatedAt = timeNow - AGet.UpdatedAt = timeNow - AGet.MenuId, err = AGet.Create(db) - - ACreate := models.Menu{} - ACreate.MenuName = "" - ACreate.Title = "创建" + tab.TableComment - ACreate.Icon = "bug" - ACreate.Path = "/api/v1/" + tab.ModuleName - ACreate.MenuType = "A" - ACreate.Action = "POST" - ACreate.ParentId = Amenu.MenuId - ACreate.NoCache = false - ACreate.Sort = 0 - ACreate.Visible = "1" - ACreate.IsFrame = "0" - ACreate.CreateBy = "1" - ACreate.UpdateBy = "1" - ACreate.CreatedAt = timeNow - ACreate.UpdatedAt = timeNow - ACreate.MenuId, err = ACreate.Create(db) - - AUpdate := models.Menu{} - AUpdate.MenuName = "" - AUpdate.Title = "修改" + tab.TableComment - AUpdate.Icon = "bug" - AUpdate.Path = "/api/v1/" + tab.ModuleName + "/:id" - AUpdate.MenuType = "A" - AUpdate.Action = "PUT" - AUpdate.ParentId = Amenu.MenuId - AUpdate.NoCache = false - AUpdate.Sort = 0 - AUpdate.Visible = "1" - AUpdate.IsFrame = "0" - AUpdate.CreateBy = "1" - AUpdate.UpdateBy = "1" - AUpdate.CreatedAt = timeNow - AUpdate.UpdatedAt = timeNow - AUpdate.MenuId, err = AUpdate.Create(db) - - ADelete := models.Menu{} - ADelete.MenuName = "" - ADelete.Title = "删除" + tab.TableComment - ADelete.Icon = "bug" - ADelete.Path = "/api/v1/" + tab.ModuleName - ADelete.MenuType = "A" - ADelete.Action = "DELETE" - ADelete.ParentId = Amenu.MenuId - ADelete.NoCache = false - ADelete.Sort = 0 - ADelete.Visible = "1" - ADelete.IsFrame = "0" - ADelete.CreateBy = "1" - ADelete.UpdateBy = "1" - ADelete.CreatedAt = timeNow - ADelete.UpdatedAt = timeNow - ADelete.MenuId, err = ADelete.Create(db) e.OK("", "数据生成成功!") } diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index 9a1ad61..7f37697 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -5,18 +5,19 @@ import ( "strings" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "gorm.io/gorm" "go-admin/app/admin/models/tools" - "go-admin/common/apis" ) type SysTable struct { - apis.Api + api.Api } +// GetSysTableList 分页列表数据 // @Summary 分页列表数据 // @Description 生成表分页列表 // @Tags 工具 - 生成表 @@ -25,7 +26,7 @@ type SysTable struct { // @Param pageIndex query int false "pageIndex / 页码" // @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/sys/tables/page [get] -func (e *SysTable) GetSysTableList(c *gin.Context) { +func (e SysTable) GetSysTableList(c *gin.Context) { e.Context = c log := e.GetLogger() var data tools.SysTables @@ -66,7 +67,7 @@ func (e *SysTable) GetSysTableList(c *gin.Context) { // @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/sys/tables/info/{tableId} [get] // @Security Bearer -func (e *SysTable) GetSysTables(c *gin.Context) { +func (e SysTable) GetSysTables(c *gin.Context) { e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -91,7 +92,7 @@ func (e *SysTable) GetSysTables(c *gin.Context) { e.OK(mp, "") } -func (e *SysTable) GetSysTablesInfo(c *gin.Context) { +func (e SysTable) GetSysTablesInfo(c *gin.Context) { e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -120,7 +121,7 @@ func (e *SysTable) GetSysTablesInfo(c *gin.Context) { //c.JSON(http.StatusOK, res.ReturnOK()) } -func (e *SysTable) GetSysTablesTree(c *gin.Context) { +func (e SysTable) GetSysTablesTree(c *gin.Context) { e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -151,7 +152,7 @@ func (e *SysTable) GetSysTablesTree(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/sys/tables/info [post] // @Security Bearer -func (e *SysTable) InsertSysTable(c *gin.Context) { +func (e SysTable) InsertSysTable(c *gin.Context) { e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -187,7 +188,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool var dbTable tools.DBTables var dbColumn tools.DBColumns data.TBName = tablesList[i] - data.CreateBy = 0 + data.CreateBy = user.GetUserId(c) dbTable.TableName = data.TBName dbtable, err := dbTable.Get(tx) @@ -204,12 +205,13 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool //data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend) data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend) } + data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-") data.PackageName = "admin" data.TplCategory = "crud" data.Crud = true dbcolumn, err := dbColumn.GetList(tx) - data.CreateBy = 0 + data.CreateBy = user.GetUserId(c) data.TableComment = dbtable.TableComment if dbtable.TableComment == "" { data.TableComment = data.ClassName @@ -295,7 +297,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/sys/tables/info [put] // @Security Bearer -func (e *SysTable) UpdateSysTable(c *gin.Context) { +func (e SysTable) UpdateSysTable(c *gin.Context) { var data tools.SysTables err := c.Bind(&data) pkg.HasError(err, "数据解析失败", 500) @@ -309,7 +311,7 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) { return } - data.UpdateBy = 0 + data.UpdateBy = user.GetUserId(c) result, err := data.Update(db) if err != nil { log.Errorf("Update error, %s", err.Error()) @@ -326,7 +328,7 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) { // @Success 200 {string} string "{"code": 200, "message": "删除成功"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/sys/tables/info/{tableId} [delete] -func (e *SysTable) DeleteSysTables(c *gin.Context) { +func (e SysTable) DeleteSysTables(c *gin.Context) { e.Context = c log := e.GetLogger() db, err := e.GetOrm() diff --git a/cmd/migrate/migration/models/casbinrule.go b/app/admin/models/casbin_rule.go similarity index 100% rename from cmd/migrate/migration/models/casbinrule.go rename to app/admin/models/casbin_rule.go 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..c33ffd6 100644 --- a/app/admin/models/system/datascope.go +++ b/app/admin/models/datascope.go @@ -1,4 +1,4 @@ -package system +package models import ( "errors" diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 0e1d5f0..2c71030 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -1,343 +1,154 @@ package models -import ( - "errors" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - "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:"-"` - models.ModelTime -} - -func (Menu) TableName() string { - return "sys_menu" -} - -type MenuLable struct { - Id int `json:"id" gorm:"-"` - Label string `json:"label" gorm:"-"` - Children []MenuLable `json:"children" gorm:"-"` -} - -type Menus 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 []Menu `json:"children" gorm:"-"` - - CreateBy string `json:"createBy" gorm:"column:create_by"` - UpdateBy string `json:"updateBy" gorm:"column:update_by"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - BaseModel -} - -func (Menus) TableName() string { - return "sys_menu" -} - -type MenuRole struct { - Menus - IsSelect bool `json:"is_select" gorm:"-"` -} - -type MS []Menu - -//func (e *Menu) GetByMenuId() (Menu Menu, err error) { +//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:"-"` // -// table := orm.Eloquent.Table(e.TableName()) -// table = table.Where("menu_id = ?", e.MenuId) -// if err = table.Find(&Menu).Error; err != nil { -// return -// } -// return +// models.ModelTime //} - -//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 (Menu) TableName() string { +// return "sys_menu" //} - -//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 +//type MenuLable struct { +// Id int `json:"id" gorm:"-"` +// Label string `json:"label" gorm:"-"` +// Children []MenuLable `json:"children" gorm:"-"` //} - -//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) +//type Menus 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"` // -// ml = append(ml, menusInfo) -// } -// return &ml, err +// Visible string `json:"visible" gorm:"column:visible"` +// Children []Menu `json:"children" gorm:"-"` +// +// CreateBy string `json:"createBy" gorm:"column:create_by"` +// UpdateBy string `json:"updateBy" gorm:"column:update_by"` +// DataScope string `json:"dataScope" gorm:"-"` +// Params string `json:"params" gorm:"-"` +// BaseModel //} - -//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 (Menus) TableName() string { +// return "sys_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 +//type MenuRole struct { +// Menus +// IsSelect bool `json:"is_select" gorm:"-"` //} - -//func (e *MenuRole) Get(tx *gorm.DB) (Menus []MenuRole, err error) { +// +//type MS []Menu +// +//func (e *Menu) Get(tx *gorm.DB) (Menus []Menu, 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 +// if e.Path != "" { +// table = table.Where("path = ?", e.Path) // } -// 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 e.Action != "" { +// table = table.Where("action = ?", e.Action) // } -// 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 != "" { - table = table.Where("menu_name = ?", e.MenuName) - } - if e.Path != "" { - table = table.Where("path = ?", e.Path) - } - if e.Action != "" { - table = table.Where("action = ?", e.Action) - } - if e.MenuType != "" { - table = table.Where("menu_type = ?", e.MenuType) - } - - if err = table.Order("sort").Find(&Menus).Error; err != nil { - return - } - return -} - -func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) { - table := tx.Table(e.TableName()) - if e.MenuName != "" { - table = table.Where("menu_name = ?", e.MenuName) - } - if e.Title != "" { - table = table.Where("title = ?", e.Title) - } - if e.Visible != "" { - table = table.Where("visible = ?", e.Visible) - } - if e.MenuType != "" { - table = table.Where("menu_type = ?", e.MenuType) - } - - // 数据权限控制 - dataPermission := new(system.DataPermission) - dataPermission.UserId, _ = pkg.StringToInt(e.DataScope) - table, err = dataPermission.GetDataScope("sys_menu", table) - if err != nil { - return nil, err - } - if err = table.Order("sort").Find(&Menus).Error; err != nil { - return - } - return -} - -func (e *Menu) Create(tx *gorm.DB) (id int, err error) { - result := tx.Table(e.TableName()).Create(&e) - if result.Error != nil { - err = result.Error - return - } - err = InitPaths(tx, e) - if err != nil { - return - } - id = e.MenuId - return -} - -func InitPaths(tx *gorm.DB, menu *Menu) (err error) { - parentMenu := new(Menu) - if menu.ParentId != 0 { - tx.Table("sys_menu").Where("menu_id = ?", menu.ParentId).First(parentMenu) - if parentMenu.Paths == "" { - err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") - return - } - menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId) - } else { - menu.Paths = "/0/" + pkg.IntToString(menu.MenuId) - } - 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 +// if e.MenuType != "" { +// table = table.Where("menu_type = ?", e.MenuType) // } // -// //参数1:是要修改的数据 -// //参数2:是修改的数据 -// if err = tx.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { +// if err = table.Order("sort").Find(&Menus).Error; err != nil { +// return +// } +// return +//} +// +//func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) { +// table := tx.Table(e.TableName()) +// if e.MenuName != "" { +// table = table.Where("menu_name = ?", e.MenuName) +// } +// if e.Title != "" { +// table = table.Where("title = ?", e.Title) +// } +// if e.Visible != "" { +// table = table.Where("visible = ?", e.Visible) +// } +// if e.MenuType != "" { +// table = table.Where("menu_type = ?", e.MenuType) +// } +// +// // 数据权限控制 +// dataPermission := new(DataPermission) +// dataPermission.UserId, _ = pkg.StringToInt(e.DataScope) +// table, err = dataPermission.GetDataScope("sys_menu", table) +// if err != nil { +// return nil, err +// } +// if err = table.Order("sort").Find(&Menus).Error; err != nil { +// return +// } +// return +//} +// +//func (e *Menu) Create(tx *gorm.DB) (id int, err error) { +// result := tx.Table(e.TableName()).Create(&e) +// if result.Error != nil { +// err = result.Error // return // } // err = InitPaths(tx, e) // if err != nil { // return // } +// id = e.MenuId // 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 +// +//func InitPaths(tx *gorm.DB, menu *Menu) (err error) { +// parentMenu := new(Menu) +// if menu.ParentId != 0 { +// tx.Table("sys_menu").Where("menu_id = ?", menu.ParentId).First(parentMenu) +// if parentMenu.Paths == "" { +// err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") +// return +// } +// menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId) +// } else { +// menu.Paths = "/0/" + pkg.IntToString(menu.MenuId) // } -// success = true +// tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) // return //} diff --git a/app/admin/models/role.go b/app/admin/models/role.go index ef2086d..861d020 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"` diff --git a/app/admin/models/system/role_dept.go b/app/admin/models/role_dept.go similarity index 92% rename from app/admin/models/system/role_dept.go rename to app/admin/models/role_dept.go index 526f42e..0a794e0 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 { 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..414d6e8 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" diff --git a/app/admin/models/sys_api.go b/app/admin/models/sys_api.go new file mode 100644 index 0000000..dc85db2 --- /dev/null +++ b/app/admin/models/sys_api.go @@ -0,0 +1,74 @@ +package models + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/go-admin-team/go-admin-core/sdk" + "github.com/go-admin-team/go-admin-core/sdk/runtime" + "github.com/go-admin-team/go-admin-core/storage" + + "go-admin/common/models" +) + +type SysApi struct { + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"size:128;comment:handle"` + Title string `json:"title" gorm:"size:128;comment:标题"` + Path string `json:"path" gorm:"size:128;comment:地址"` + Action string `json:"action" gorm:"size:16;comment:请求类型"` + Type string `json:"type" gorm:"size:16;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 +} + +func SaveSysApi(message storage.Messager) (err error) { + var rb []byte + rb, err = json.Marshal(message.GetValues()) + if err != nil { + fmt.Errorf("json Marshal error, %s", err.Error()) + return err + } + + var l runtime.Routers + err = json.Unmarshal(rb, &l) + if err != nil { + fmt.Errorf("json Unmarshal error, %s", err.Error()) + return err + } + dbList := sdk.Runtime.GetDb() + for _, d := range dbList { + for _, v := range l.List { + if v.HttpMethod != "HEAD" || + strings.Contains(v.RelativePath, "/swagger/") || + strings.Contains(v.RelativePath, "/static/") || + strings.Contains(v.RelativePath, "/form-generator/") || + strings.Contains(v.RelativePath, "/sys/tables") { + err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}). + Attrs(SysApi{Handle: v.Handler}). + FirstOrCreate(&SysApi{}). + //Update("handle", v.Handler). + Error + if err != nil { + err := fmt.Errorf("Models SaveSysApi error: %s \r\n ", err.Error()) + return err + } + } + } + } + return nil +} diff --git a/app/admin/models/sys_category.go b/app/admin/models/sys_category.go deleted file mode 100644 index 219394c..0000000 --- a/app/admin/models/sys_category.go +++ /dev/null @@ -1,29 +0,0 @@ -package models - -import ( - "go-admin/common/models" -) - -type SysCategory struct { - models.Model - Name string `json:"name" gorm:"type:varchar(255);comment:名称"` // - Img string `json:"img" gorm:"type:varchar(255);comment:图标"` // - Sort int `json:"sort" gorm:"type:int(4);comment:排序"` // - Status int `json:"status" gorm:"type:int(1);comment:状态"` // - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` // - models.ControlBy - models.ModelTime -} - -func (SysCategory) TableName() string { - return "sys_category" -} - -func (e *SysCategory) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysCategory) GetId() interface{} { - return e.Id -} \ No newline at end of file diff --git a/app/admin/models/sys_config.go b/app/admin/models/sys_config.go new file mode 100644 index 0000000..8bd0727 --- /dev/null +++ b/app/admin/models/sys_config.go @@ -0,0 +1,30 @@ +package models + +import ( + "go-admin/common/models" +) + +type SysConfig struct { + models.Model + ConfigName string `json:"configName" gorm:"size:128;comment:ConfigName"` // + ConfigKey string `json:"configKey" gorm:"size:128;comment:ConfigKey"` // + ConfigValue string `json:"configValue" gorm:"size:255;comment:ConfigValue"` // + ConfigType string `json:"configType" gorm:"size:64;comment:ConfigType"` + IsFrontend int `json:"isFrontend" gorm:"size:64;comment:是否前台"` // + Remark string `json:"remark" gorm:"size:128;comment:Remark"` // + models.ControlBy + models.ModelTime +} + +func (SysConfig) TableName() string { + return "sys_config" +} + +func (e *SysConfig) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysConfig) GetId() interface{} { + return e.Id +} 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..4de08b2 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" diff --git a/app/admin/models/sys_dict_data.go b/app/admin/models/sys_dict_data.go new file mode 100644 index 0000000..2108c17 --- /dev/null +++ b/app/admin/models/sys_dict_data.go @@ -0,0 +1,35 @@ +package models + +import ( + "go-admin/common/models" +) + +type SysDictData struct { + models.ControlBy + models.ModelTime + + DictCode int `json:"dictCode" gorm:"primaryKey;column:dict_code;autoIncrement;comment:主键编码"` + DictSort int `json:"dictSort" gorm:"size:20;comment:DictSort"` + DictLabel string `json:"dictLabel" gorm:"size:128;comment:DictLabel"` + DictValue string `json:"dictValue" gorm:"size:255;comment:DictValue"` + DictType string `json:"dictType" gorm:"size:64;comment:DictType"` + CssClass string `json:"cssClass" gorm:"size:128;comment:CssClass"` + ListClass string `json:"listClass" gorm:"size:128;comment:ListClass"` + IsDefault string `json:"isDefault" gorm:"size:8;comment:IsDefault"` + Status string `json:"status" gorm:"size:4;comment:Status"` + Default string `json:"default" gorm:"size:8;comment:Default"` + Remark string `json:"remark" gorm:"size:255;comment:Remark"` +} + +func (SysDictData) TableName() string { + return "sys_dict_data" +} + +func (e *SysDictData) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysDictData) GetId() interface{} { + return e.DictCode +} diff --git a/app/admin/models/system/sys_dict_type.go b/app/admin/models/sys_dict_type.go similarity index 56% rename from app/admin/models/system/sys_dict_type.go rename to app/admin/models/sys_dict_type.go index dfc053d..735cb87 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" @@ -9,10 +9,10 @@ type SysDictType struct { models.ModelTime ID int `json:"id" gorm:"primaryKey;column:dict_id;autoIncrement;comment:主键编码"` - DictName string `json:"dictName" gorm:"type:varchar(128);comment:DictName"` - DictType string `json:"dictType" gorm:"type:varchar(128);comment:DictType"` - Status string `json:"status" gorm:"type:varchar(4);comment:Status"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:Remark"` + DictName string `json:"dictName" gorm:"size:128;comment:DictName"` + DictType string `json:"dictType" gorm:"size:128;comment:DictType"` + Status string `json:"status" gorm:"size:4;comment:Status"` + Remark string `json:"remark" gorm:"size:255;comment:Remark"` } func (SysDictType) TableName() string { diff --git a/app/admin/models/sys_file_info.go b/app/admin/models/sys_file_info.go deleted file mode 100644 index 598969e..0000000 --- a/app/admin/models/sys_file_info.go +++ /dev/null @@ -1,31 +0,0 @@ -package models - -import ( - "go-admin/common/models" -) - -type SysFileInfo struct { - models.Model - Type string `json:"type" gorm:"type:varchar(255);comment:类型"` // - Name string `json:"name" gorm:"type:varchar(255);comment:名称"` // - Size string `json:"size" gorm:"type:int(11);comment:大小"` // - PId int `json:"pId" gorm:"type:int(11);comment:目录"` // - Source string `json:"source" gorm:"type:varchar(255);comment:来源"` // - Url string `json:"url" gorm:"type:varchar(255);comment:地址"` // - FullUrl string `json:"fullUrl" gorm:"type:varchar(255);comment:全地址"` // - models.ControlBy - models.ModelTime -} - -func (SysFileInfo) TableName() string { - return "sys_file_info" -} - -func (e *SysFileInfo) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysFileInfo) GetId() interface{} { - return e.Id -} diff --git a/app/admin/models/system/sys_login_log.go b/app/admin/models/sys_login_log.go similarity index 61% rename from app/admin/models/system/sys_login_log.go rename to app/admin/models/sys_login_log.go index 626428a..263f582 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" @@ -14,16 +14,16 @@ import ( type SysLoginLog struct { models.Model - Username string `json:"username" gorm:"type:varchar(128);comment:用户名"` - Status string `json:"status" gorm:"type:varchar(4);comment:状态"` - Ipaddr string `json:"ipaddr" gorm:"type:varchar(255);comment:ip地址"` - LoginLocation string `json:"loginLocation" gorm:"type:varchar(255);comment:归属地"` - Browser string `json:"browser" gorm:"type:varchar(255);comment:浏览器"` - Os string `json:"os" gorm:"type:varchar(255);comment:系统"` - Platform string `json:"platform" gorm:"type:varchar(255);comment:固件"` - LoginTime time.Time `json:"loginTime" gorm:"type:timestamp;comment:登录时间"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` - Msg string `json:"msg" gorm:"type:varchar(255);comment:信息"` + Username string `json:"username" gorm:"size:128;comment:用户名"` + Status string `json:"status" gorm:"size:4;comment:状态"` + Ipaddr string `json:"ipaddr" gorm:"size:255;comment:ip地址"` + LoginLocation string `json:"loginLocation" gorm:"size:255;comment:归属地"` + Browser string `json:"browser" gorm:"size:255;comment:浏览器"` + Os string `json:"os" gorm:"size:255;comment:系统"` + Platform string `json:"platform" gorm:"size:255;comment:固件"` + LoginTime time.Time `json:"loginTime" gorm:"comment:登录时间"` + Remark string `json:"remark" gorm:"size:255;comment:备注"` + Msg string `json:"msg" gorm:"size:255;comment:信息"` CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` models.ControlBy diff --git a/app/admin/models/system/sys_menu.go b/app/admin/models/sys_menu.go similarity index 54% rename from app/admin/models/system/sys_menu.go rename to app/admin/models/sys_menu.go index dbcf803..cd520e3 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,37 +19,17 @@ 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:"-"` - Children []SysMenu `json:"children" gorm:"-"` + Children []SysMenu `json:"children,omitempty" gorm:"-"` IsSelect bool `json:"is_select" gorm:"-"` models.ControlBy 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:"-"` -} - func (SysMenu) TableName() string { return "sys_menu" } @@ -61,4 +41,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/sys_opera_log.go b/app/admin/models/sys_opera_log.go new file mode 100644 index 0000000..a120a40 --- /dev/null +++ b/app/admin/models/sys_opera_log.go @@ -0,0 +1,80 @@ +package models + +import ( + "encoding/json" + "errors" + "time" + + log "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/sdk" + "github.com/go-admin-team/go-admin-core/storage" + + "go-admin/common/models" +) + +type SysOperaLog struct { + models.Model + Title string `json:"title" gorm:"size:255;comment:操作模块"` + BusinessType string `json:"businessType" gorm:"size:128;comment:操作类型"` + BusinessTypes string `json:"businessTypes" gorm:"size:128;comment:BusinessTypes"` + Method string `json:"method" gorm:"size:128;comment:函数"` + RequestMethod string `json:"requestMethod" gorm:"size:128;comment:请求方式"` + OperatorType string `json:"operatorType" gorm:"size:128;comment:操作类型"` + OperName string `json:"operName" gorm:"size:128;comment:操作者"` + DeptName string `json:"deptName" gorm:"size:128;comment:部门名称"` + OperUrl string `json:"operUrl" gorm:"size:255;comment:访问地址"` + OperIp string `json:"operIp" gorm:"size:128;comment:客户端ip"` + OperLocation string `json:"operLocation" gorm:"size:128;comment:访问位置"` + OperParam string `json:"operParam" gorm:"size:255;comment:请求参数"` + Status string `json:"status" gorm:"size:4;comment:操作状态"` + OperTime time.Time `json:"operTime" gorm:"comment:操作时间"` + JsonResult string `json:"jsonResult" gorm:"size:255;comment:返回数据"` + Remark string `json:"remark" gorm:"size:255;comment:备注"` + LatencyTime string `json:"latencyTime" gorm:"size:128;comment:耗时"` + UserAgent string `json:"userAgent" gorm:"size:255;comment:ua"` + CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` + UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` + models.ControlBy +} + +func (SysOperaLog) TableName() string { + return "sys_opera_log" +} + +func (e *SysOperaLog) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysOperaLog) GetId() interface{} { + return e.Id +} + +// SaveOperaLog 从队列中获取操作日志 +func SaveOperaLog(message storage.Messager) (err error) { + //准备db + db := sdk.Runtime.GetDbByKey(message.GetPrefix()) + if db == nil { + err = errors.New("db not exist") + log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error()) + return err + } + var rb []byte + rb, err = json.Marshal(message.GetValues()) + if err != nil { + log.Errorf("json Marshal error, %s", err.Error()) + return err + } + var l SysOperaLog + err = json.Unmarshal(rb, &l) + if err != nil { + log.Errorf("json Unmarshal error, %s", err.Error()) + return err + } + err = db.Create(&l).Error + if err != nil { + log.Errorf("db create error, %s", err.Error()) + return err + } + return nil +} diff --git a/app/admin/models/system/sys_post.go b/app/admin/models/sys_post.go similarity index 90% rename from app/admin/models/system/sys_post.go rename to app/admin/models/sys_post.go index a2dc3cd..c51f890 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" @@ -6,7 +6,7 @@ type SysPost struct { PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 PostName string `gorm:"size:128;" json:"postName"` //岗位名称 PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 - Sort int `gorm:"" json:"sort"` //岗位排序 + Sort int `gorm:"size:4;" json:"sort"` //岗位排序 Status int `gorm:"size:4;" json:"status"` //状态 Remark string `gorm:"size:255;" json:"remark"` //描述 models.ControlBy @@ -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/sys_role.go b/app/admin/models/sys_role.go new file mode 100644 index 0000000..2965635 --- /dev/null +++ b/app/admin/models/sys_role.go @@ -0,0 +1,34 @@ +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;"` + Params string `json:"params" gorm:"-"` + MenuIds []int `json:"menuIds" gorm:"-"` + DeptIds []int `json:"deptIds" gorm:"-"` + SysMenu *[]SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"` + models.ControlBy + models.ModelTime +} + +func (SysRole) TableName() string { + return "sys_role" +} + +func (e *SysRole) Generate() models.ActiveRecord { + o := *e + return &o +} + +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 55% rename from app/admin/models/system/sys_user.go rename to app/admin/models/sys_user.go index f866bde..614dbb7 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" @@ -10,19 +10,19 @@ type SysUser struct { models.ControlBy models.ModelTime UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` - Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` - Password string `json:"-" gorm:"type:varchar(128);comment:密码"` - NickName string `json:"nickName" gorm:"type:varchar(128);comment:昵称"` - Phone string `json:"phone" gorm:"type:varchar(11);comment:手机号"` - RoleId int `json:"roleId" gorm:"type:bigint(20);comment:角色ID"` - Salt string `json:"-" gorm:"type:varchar(255);comment:加盐"` - Avatar string `json:"avatar" gorm:"type:varchar(255);comment:头像"` - Sex string `json:"sex" gorm:"type:varchar(255);comment:性别"` - Email string `json:"email" gorm:"type:varchar(128);comment:邮箱"` - DeptId int `json:"deptId" gorm:"type:bigint(20);comment:部门"` - PostId int `json:"postId" gorm:"type:bigint(20);comment:岗位"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` - Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + Username string `json:"username" gorm:"size:64;comment:用户名"` + Password string `json:"-" gorm:"size:128;comment:密码"` + NickName string `json:"nickName" gorm:"size:128;comment:昵称"` + Phone string `json:"phone" gorm:"size:11;comment:手机号"` + RoleId int `json:"roleId" gorm:"size:20;comment:角色ID"` + Salt string `json:"-" gorm:"size:255;comment:加盐"` + Avatar string `json:"avatar" gorm:"size:255;comment:头像"` + Sex string `json:"sex" gorm:"size:255;comment:性别"` + Email string `json:"email" gorm:"size:128;comment:邮箱"` + DeptId int `json:"deptId" gorm:"size:20;comment:部门"` + PostId int `json:"postId" gorm:"size:20;comment:岗位"` + Remark string `json:"remark" gorm:"size:255;comment:备注"` + Status string `json:"status" gorm:"size:4;comment:状态"` DeptIds []int `json:"deptIds" gorm:"-"` PostIds []int `json:"postIds" gorm:"-"` RoleIds []int `json:"roleIds" gorm:"-"` diff --git a/app/admin/models/system.go b/app/admin/models/system.go deleted file mode 100644 index 05dd1e7..0000000 --- a/app/admin/models/system.go +++ /dev/null @@ -1,44 +0,0 @@ -package models - -import ( - "go-admin/common/models" -) - -type SysSetting struct { - SettingsId int `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"type:varchar(256);"` - Logo string `json:"logo" gorm:"type:varchar(256);"` - models.ModelTime -} - -func (SysSetting) TableName() string { - return "sys_setting" -} - -func (s *SysSetting) GetId() interface{} { - return s.SettingsId -} - -//查询 -//func (s *SysSetting) Get() (create SysSetting, err error) { -// result := orm.Eloquent.Table("sys_setting").First(&create) -// if result.Error != nil { -// err = result.Error -// return -// } -// return create, nil -//} - -//修改 -//func (s *SysSetting) Update() (update SysSetting, err error) { -// if err = orm.Eloquent.Table("sys_setting").Model(&update).Where("settings_id = ?", s.SettingsId).Updates(&s).Error; err != nil { -// return -// } -// return -//} - -type ResponseSystemConfig struct { - Name string `json:"name" binding:"required"` // 名称 - Logo string `json:"logo" binding:"required"` // 头像 - SettingsId int `json:"settings_id" binding:"required"` // 头像 -} diff --git a/app/admin/models/system/sys_config.go b/app/admin/models/system/sys_config.go deleted file mode 100644 index 0075b5e..0000000 --- a/app/admin/models/system/sys_config.go +++ /dev/null @@ -1,30 +0,0 @@ -package system - -import ( - "go-admin/common/models" -) - -type SysConfig struct { - models.Model - ConfigName string `json:"configName" gorm:"type:varchar(128);comment:ConfigName"` // - ConfigKey string `json:"configKey" gorm:"type:varchar(128);comment:ConfigKey"` // - ConfigValue string `json:"configValue" gorm:"type:varchar(255);comment:ConfigValue"` // - ConfigType string `json:"configType" gorm:"type:varchar(64);comment:ConfigType"` - IsFrontend int `json:"isFrontend" gorm:"type:varchar(64);comment:是否前台"` // - Remark string `json:"remark" gorm:"type:varchar(128);comment:Remark"` // - models.ControlBy - models.ModelTime -} - -func (SysConfig) TableName() string { - return "sys_config" -} - -func (e *SysConfig) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysConfig) GetId() interface{} { - return e.Id -} diff --git a/app/admin/models/system/sys_dict_data.go b/app/admin/models/system/sys_dict_data.go deleted file mode 100644 index f2f20e9..0000000 --- a/app/admin/models/system/sys_dict_data.go +++ /dev/null @@ -1,35 +0,0 @@ -package system - -import ( - "go-admin/common/models" -) - -type SysDictData struct { - models.ControlBy - models.ModelTime - - DictCode int `json:"dictCode" gorm:"primaryKey;column:dict_code;autoIncrement;comment:主键编码"` - DictSort int `json:"dictSort" gorm:"type:bigint(20);comment:DictSort"` - DictLabel string `json:"dictLabel" gorm:"type:varchar(128);comment:DictLabel"` - DictValue string `json:"dictValue" gorm:"type:varchar(255);comment:DictValue"` - DictType string `json:"dictType" gorm:"type:varchar(64);comment:DictType"` - CssClass string `json:"cssClass" gorm:"type:varchar(128);comment:CssClass"` - ListClass string `json:"listClass" gorm:"type:varchar(128);comment:ListClass"` - IsDefault string `json:"isDefault" gorm:"type:varchar(8);comment:IsDefault"` - Status string `json:"status" gorm:"type:varchar(4);comment:Status"` - Default string `json:"default" gorm:"type:varchar(8);comment:Default"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:Remark"` -} - -func (SysDictData) TableName() string { - return "sys_dict_data" -} - -func (e *SysDictData) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysDictData) GetId() interface{} { - return e.DictCode -} diff --git a/app/admin/models/system/sys_opera_log.go b/app/admin/models/system/sys_opera_log.go deleted file mode 100644 index b8a83eb..0000000 --- a/app/admin/models/system/sys_opera_log.go +++ /dev/null @@ -1,85 +0,0 @@ -package system - -import ( - "encoding/json" - "errors" - "time" - - log "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/sdk" - "github.com/go-admin-team/go-admin-core/storage" - - "go-admin/common/models" -) - -type SysOperaLog struct { - models.Model - Title string `json:"title" gorm:"type:varchar(255);comment:操作模块"` - BusinessType string `json:"businessType" gorm:"type:varchar(128);comment:操作类型"` - BusinessTypes string `json:"businessTypes" gorm:"type:varchar(128);comment:BusinessTypes"` - Method string `json:"method" gorm:"type:varchar(128);comment:函数"` - RequestMethod string `json:"requestMethod" gorm:"type:varchar(128);comment:请求方式"` - OperatorType string `json:"operatorType" gorm:"type:varchar(128);comment:操作类型"` - OperName string `json:"operName" gorm:"type:varchar(128);comment:操作者"` - DeptName string `json:"deptName" gorm:"type:varchar(128);comment:部门名称"` - OperUrl string `json:"operUrl" gorm:"type:varchar(255);comment:访问地址"` - OperIp string `json:"operIp" gorm:"type:varchar(128);comment:客户端ip"` - OperLocation string `json:"operLocation" gorm:"type:varchar(128);comment:访问位置"` - OperParam string `json:"operParam" gorm:"type:varchar(255);comment:请求参数"` - Status string `json:"status" gorm:"type:varchar(4);comment:操作状态"` - OperTime time.Time `json:"operTime" gorm:"type:timestamp;comment:操作时间"` - JsonResult string `json:"jsonResult" gorm:"type:varchar(255);comment:返回数据"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` - LatencyTime string `json:"latencyTime" gorm:"type:varchar(128);comment:耗时"` - UserAgent string `json:"userAgent" gorm:"type:varchar(255);comment:ua"` - CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` - UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` - models.ControlBy -} - -func (SysOperaLog) TableName() string { - return "sys_opera_log" -} - -func (e *SysOperaLog) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysOperaLog) GetId() interface{} { - return e.Id -} - -// SaveOperaLog 从队列中获取操作日志 -func SaveOperaLog(message storage.Messager) (err error) { - //准备db - db := sdk.Runtime.GetDbByKey(message.GetPrefix()) - if db == nil { - err = errors.New("db not exist") - log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error()) - return err - } - var rb []byte - rb, err = json.Marshal(message.GetValues()) - if err != nil { - log.Errorf("json Marshal error, %s", err.Error()) - return err - } - var l SysOperaLog - err = json.Unmarshal(rb, &l) - if err != nil { - log.Errorf("json Unmarshal error, %s", err.Error()) - return err - } - if l.Title == "" { - m := &SysMenu{} - db.Model(m).Select("Title").Where("action = ?", l.Method).Where("path = ?", message.GetValues()["_fullPath"]).First(m) - l.Title = m.Title - } - err = db.Create(&l).Error - if err != nil { - log.Errorf("db create error, %s", err.Error()) - return err - } - return nil -} diff --git a/app/admin/models/system/sys_role.go b/app/admin/models/system/sys_role.go deleted file mode 100644 index 3def8e1..0000000 --- a/app/admin/models/system/sys_role.go +++ /dev/null @@ -1,33 +0,0 @@ -package system - -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;"` - Params string `json:"params" gorm:"-"` - MenuIds []int `json:"menuIds" gorm:"-"` - DeptIds []int `json:"deptIds" gorm:"-"` - models.ControlBy - models.ModelTime -} - -func (SysRole) TableName() string { - return "sys_role" -} - -func (e *SysRole) Generate() models.ActiveRecord { - o := *e - return &o -} - -func (e *SysRole) GetId() interface{} { - return e.RoleId -} diff --git a/app/admin/models/tools/dbcolumns.go b/app/admin/models/tools/dbcolumns.go index ef41f44..46d9bc6 100644 --- a/app/admin/models/tools/dbcolumns.go +++ b/app/admin/models/tools/dbcolumns.go @@ -2,11 +2,10 @@ package tools import ( "errors" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - - "gorm.io/gorm" "github.com/go-admin-team/go-admin-core/sdk/config" + "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gorm.io/gorm" ) type DBColumns struct { @@ -68,4 +67,4 @@ func (e *DBColumns) GetList(tx *gorm.DB) ([]DBColumns, error) { return doc, err } return doc, nil -} +} \ No newline at end of file diff --git a/app/admin/models/tools/systables.go b/app/admin/models/tools/systables.go index 39c9aa5..8fe4291 100644 --- a/app/admin/models/tools/systables.go +++ b/app/admin/models/tools/systables.go @@ -1,44 +1,47 @@ package tools import ( - "gorm.io/gorm" + common "go-admin/common/models" "strings" + "gorm.io/gorm" + "go-admin/app/admin/models" ) type SysTables struct { - TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 - TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 - TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 - ClassName string `gorm:"size:255;" json:"className"` //类名 - TplCategory string `gorm:"size:255;" json:"tplCategory"` // - PackageName string `gorm:"size:255;" json:"packageName"` //包名 - ModuleName string `gorm:"size:255;" json:"moduleName"` //模块名 - BusinessName string `gorm:"size:255;" json:"businessName"` // - FunctionName string `gorm:"size:255;" json:"functionName"` //功能名称 - FunctionAuthor string `gorm:"size:255;" json:"functionAuthor"` //功能作者 - PkColumn string `gorm:"size:255;" json:"pkColumn"` - PkGoField string `gorm:"size:255;" json:"pkGoField"` - PkJsonField string `gorm:"size:255;" json:"pkJsonField"` - Options string `gorm:"size:255;" json:"options"` - TreeCode string `gorm:"size:255;" json:"treeCode"` - TreeParentCode string `gorm:"size:255;" json:"treeParentCode"` - TreeName string `gorm:"size:255;" json:"treeName"` - Tree bool `gorm:"size:1;" json:"tree"` - Crud bool `gorm:"size:1;" json:"crud"` - Remark string `gorm:"size:255;" json:"remark"` - IsDataScope int `gorm:"size:1;" json:"isDataScope"` - IsActions int `gorm:"size:1;" json:"isActions"` - IsAuth int `gorm:"size:1;" json:"isAuth"` - IsLogicalDelete string `gorm:"size:1;" json:"isLogicalDelete"` - LogicalDelete bool `gorm:"size:1;" json:"logicalDelete"` - LogicalDeleteColumn string `gorm:"size:128;" json:"logicalDeleteColumn"` - CreateBy int `gorm:"size:128;" json:"createBy"` - UpdateBy int `gorm:"size:128;" json:"updateBy"` - DataScope string `gorm:"-" json:"dataScope"` - Params Params `gorm:"-" json:"params"` - Columns []SysColumns `gorm:"-" json:"columns"` + TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 + TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 + TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 + ClassName string `gorm:"size:255;" json:"className"` //类名 + TplCategory string `gorm:"size:255;" json:"tplCategory"` // + PackageName string `gorm:"size:255;" json:"packageName"` //包名 + ModuleName string `gorm:"size:255;" json:"moduleName"` //go文件名 + ModuleFrontName string `gorm:"size:255;comment:前端文件名;" json:"moduleFrontName"` //前端文件名 + BusinessName string `gorm:"size:255;" json:"businessName"` // + FunctionName string `gorm:"size:255;" json:"functionName"` //功能名称 + FunctionAuthor string `gorm:"size:255;" json:"functionAuthor"` //功能作者 + PkColumn string `gorm:"size:255;" json:"pkColumn"` + PkGoField string `gorm:"size:255;" json:"pkGoField"` + PkJsonField string `gorm:"size:255;" json:"pkJsonField"` + Options string `gorm:"size:255;" json:"options"` + TreeCode string `gorm:"size:255;" json:"treeCode"` + TreeParentCode string `gorm:"size:255;" json:"treeParentCode"` + TreeName string `gorm:"size:255;" json:"treeName"` + Tree bool `gorm:"size:1;default:0;" json:"tree"` + Crud bool `gorm:"size:1;default:1;" json:"crud"` + Remark string `gorm:"size:255;" json:"remark"` + IsDataScope int `gorm:"size:1;" json:"isDataScope"` + IsActions int `gorm:"size:1;" json:"isActions"` + IsAuth int `gorm:"size:1;" json:"isAuth"` + IsLogicalDelete string `gorm:"size:1;" json:"isLogicalDelete"` + LogicalDelete bool `gorm:"size:1;" json:"logicalDelete"` + LogicalDeleteColumn string `gorm:"size:128;" json:"logicalDeleteColumn"` + common.ModelTime + common.ControlBy + DataScope string `gorm:"-" json:"dataScope"` + Params Params `gorm:"-" json:"params"` + Columns []SysColumns `gorm:"-" json:"columns"` models.BaseModel } diff --git a/app/admin/router/gen_router.go b/app/admin/router/gen_router.go new file mode 100644 index 0000000..9f7e952 --- /dev/null +++ b/app/admin/router/gen_router.go @@ -0,0 +1,56 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/admin/apis" + "go-admin/app/admin/apis/tools" +) + +func init() { + routerCheckRole = append(routerCheckRole, sysNoCheckRoleRouter, registerDBRouter, registerSysTableRouter) +} + +func sysNoCheckRoleRouter(v1 *gin.RouterGroup ,authMiddleware *jwt.GinJWTMiddleware) { + r1 := v1.Group("") + { + sys := apis.System{} + r1.GET("/getCaptcha", sys.GenerateCaptchaHandler) + } + + r := v1.Group("").Use(authMiddleware.MiddlewareFunc()) + { + gen := tools.Gen{} + r.GET("/gen/preview/:tableId", gen.Preview) + r.GET("/gen/toproject/:tableId", gen.GenCode) + r.GET("/gen/apitofile/:tableId", gen.GenApiToFile) + r.GET("/gen/todb/:tableId", gen.GenMenuAndApi) + sysTable := tools.SysTable{} + r.GET("/gen/tabletree", sysTable.GetSysTablesTree) + } +} + +func registerDBRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + db := v1.Group("/db").Use(authMiddleware.MiddlewareFunc()) + { + gen := tools.Gen{} + db.GET("/tables/page", gen.GetDBTableList) + db.GET("/columns/page", gen.GetDBColumnList) + } +} + +func registerSysTableRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + tables := v1.Group("/sys/tables") + { + sysTable := tools.SysTable{} + tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetSysTableList) + tablesInfo := tables.Group("/info").Use(authMiddleware.MiddlewareFunc()) + { + tablesInfo.POST("", sysTable.InsertSysTable) + tablesInfo.PUT("", sysTable.UpdateSysTable) + tablesInfo.DELETE("/:tableId", sysTable.DeleteSysTables) + tablesInfo.GET("/:tableId", sysTable.GetSysTables) + tablesInfo.GET("", sysTable.GetSysTablesInfo) + } + } +} \ No newline at end of file diff --git a/app/admin/router/init_router.go b/app/admin/router/init_router.go index 8fe9d82..61fb978 100644 --- a/app/admin/router/init_router.go +++ b/app/admin/router/init_router.go @@ -6,12 +6,7 @@ import ( "github.com/gin-gonic/gin" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk" - "github.com/go-admin-team/go-admin-core/sdk/api" - "github.com/go-admin-team/go-admin-core/sdk/config" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - common "go-admin/common/middleware" - "go-admin/common/middleware/handler" ) // InitRouter 路由初始化,不要怀疑,这里用到了 @@ -19,8 +14,8 @@ func InitRouter() { var r *gin.Engine h := sdk.Runtime.GetEngine() if h == nil { - h = gin.New() - sdk.Runtime.SetEngine(h) + log.Fatal("not found engine...") + os.Exit(-1) } switch h.(type) { case *gin.Engine: @@ -29,14 +24,7 @@ func InitRouter() { log.Fatal("not support other engine") os.Exit(-1) } - if config.SslConfig.Enable { - r.Use(handler.TlsHandler()) - } - r.Use(common.Sentinel()). - Use(common.RequestId(pkg.TrafficKey)). - Use(api.SetRequestLogger) - common.InitMiddleware(r) // the jwt middleware authMiddleware, err := common.AuthInit() if err != nil { diff --git a/app/admin/router/monitor.go b/app/admin/router/monitor.go deleted file mode 100644 index b6cf2fa..0000000 --- a/app/admin/router/monitor.go +++ /dev/null @@ -1,32 +0,0 @@ -package router - -import ( - "github.com/go-admin-team/go-admin-core/sdk" - "net/http" - - "github.com/gin-gonic/gin" - log "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/tools/transfer" - "github.com/prometheus/client_golang/prometheus/promhttp" -) - -func Monitor() { - var r *gin.Engine - h := sdk.Runtime.GetEngine() - if h == nil { - h = gin.New() - sdk.Runtime.SetEngine(h) - } - switch h.(type) { - case *gin.Engine: - r = h.(*gin.Engine) - default: - log.Fatal("not support other engine") - } - //开发环境启动监控指标 - r.GET("/metrics", transfer.Handler(promhttp.Handler())) - //健康检查 - r.GET("/health", func(c *gin.Context) { - c.Status(http.StatusOK) - }) -} diff --git a/app/admin/router/router.go b/app/admin/router/router.go index ed28347..c226eee 100644 --- a/app/admin/router/router.go +++ b/app/admin/router/router.go @@ -27,25 +27,16 @@ func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gi func examplesNoCheckRoleRouter(r *gin.Engine) { // 可根据业务需求来设置接口版本 v1 := r.Group("/api/v1") - // 空接口防止v1定义无使用报错 - v1.GET("/nilcheckrole", nil) - for _, f := range routerNoCheckRole { f(v1) } - - // {{无需认证路由自动补充在此处请勿删除}} - //registerSysFileInfoRouter(v1) } // 需要认证的路由示例 func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) { // 可根据业务需求来设置接口版本 v1 := r.Group("/api/v1") - // 空接口防止v1定义无使用报错 - v1.GET("/checkrole", nil) - for _, f := range routerCheckRole { f(v1, authMiddleware) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_api.go b/app/admin/router/sys_api.go new file mode 100644 index 0000000..8272df3 --- /dev/null +++ b/app/admin/router/sys_api.go @@ -0,0 +1,24 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + + "go-admin/app/admin/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysApiRouter) +} + +// registerSysApiRouter +func registerSysApiRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.SysApi{} + r := v1.Group("/sys-api").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.PUT("/:id", api.Update) + } +} diff --git a/app/admin/router/sys_china_area_data.go b/app/admin/router/sys_china_area_data.go deleted file mode 100644 index 0dca109..0000000 --- a/app/admin/router/sys_china_area_data.go +++ /dev/null @@ -1,25 +0,0 @@ -package router - -import ( - "github.com/gin-gonic/gin" - jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/sys_china_area_data" - middleware2 "go-admin/common/middleware" -) - -func init() { - routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter) -} - -// 需认证的路由代码 -func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_china_area_data.SysChinaAreaData{} - r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) - { - r.GET("", api.GetSysChinaAreaDataList) - r.GET("/:id", api.GetSysChinaAreaData) - r.POST("", api.InsertSysChinaAreaData) - r.PUT("/:id", api.UpdateSysChinaAreaData) - r.DELETE("", api.DeleteSysChinaAreaData) - } -} diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go index 8b3541c..532e7c4 100644 --- a/app/admin/router/sys_config.go +++ b/app/admin/router/sys_config.go @@ -1,10 +1,11 @@ package router import ( + "go-admin/app/admin/apis" + "go-admin/common/middleware" + "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_config" - middleware2 "go-admin/common/middleware" ) func init() { @@ -13,15 +14,14 @@ func init() { // 需认证的路由代码 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_config.SysConfig{} - r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysConfig{} + r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - - r.GET("", api.GetSysConfigList) - r.GET("/:id", api.GetSysConfig) - r.POST("", api.InsertSysConfig) - r.PUT("/:id", api.UpdateSysConfig) - r.DELETE("", api.DeleteSysConfig) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("", api.Delete) } r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc()) @@ -34,4 +34,10 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd r2.GET("", api.GetSysConfigBySysApp) } -} \ No newline at end of file + r3 := v1.Group("/set-config").Use(authMiddleware.MiddlewareFunc()) + { + r3.PUT("", api.Update2Set) + r3.GET("", api.Get2Set) + } + +} diff --git a/app/admin/router/sys_dept.go b/app/admin/router/sys_dept.go index 7ce7edd..79d7f8d 100644 --- a/app/admin/router/sys_dept.go +++ b/app/admin/router/sys_dept.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_dept" - middleware2 "go-admin/common/middleware" + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,19 +13,20 @@ func init() { // 需认证的路由代码 func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_dept.SysDept{} - r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysDept{} + + r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysDeptList) - r.GET("/:id", api.GetSysDept) - r.POST("", api.InsertSysDept) - r.PUT("/:id", api.UpdateSysDept) - r.DELETE("/:id", api.DeleteSysDept) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("/:id", api.Delete) } r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()) { - r1.GET("/deptTree", api.GetDeptTree) + r1.GET("/deptTree", api.Get2Tree) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_dict.go b/app/admin/router/sys_dict.go new file mode 100644 index 0000000..729ab64 --- /dev/null +++ b/app/admin/router/sys_dict.go @@ -0,0 +1,37 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/admin/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerDictRouter) +} + +func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + dictApi := apis.SysDictType{} + dataApi := apis.SysDictData{} + dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + + dicts.GET("/data", dataApi.GetPage) + dicts.GET("/data/:dictCode", dataApi.Get) + dicts.POST("/data", dataApi.Insert) + dicts.PUT("/data/:dictCode", dataApi.Update) + dicts.DELETE("/data", dataApi.Delete) + + dicts.GET("/type-option-select", dictApi.GetAll) + dicts.GET("/type", dictApi.GetPage) + dicts.GET("/type/:id", dictApi.Get) + dicts.POST("/type", dictApi.Insert) + dicts.PUT("/type/:id", dictApi.Update) + dicts.DELETE("/type", dictApi.Delete) + } + opSelect := v1.Group("/dict-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + opSelect.GET("/option-select", dataApi.GetSysDictDataAll) + } +} diff --git a/app/admin/router/sys_file_dir.go b/app/admin/router/sys_file_dir.go deleted file mode 100644 index d2d4719..0000000 --- a/app/admin/router/sys_file_dir.go +++ /dev/null @@ -1,25 +0,0 @@ -package router - -import ( - "github.com/gin-gonic/gin" - jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/sys_file" - middleware2 "go-admin/common/middleware" -) - -func init() { - routerCheckRole = append(routerCheckRole, registerSysFileDirRouter) -} - -// 需认证的路由代码 -func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_file.SysFileDir{} - r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) - { - r.GET("", api.GetSysFileDirList) - r.GET("/:id", api.GetSysFileDir) - r.POST("", api.InsertSysFileDir) - r.PUT("/:id", api.UpdateSysFileDir) - r.DELETE("/:id", api.DeleteSysFileDir) - } -} diff --git a/app/admin/router/sys_file_info.go b/app/admin/router/sys_file_info.go deleted file mode 100644 index 5cd1d45..0000000 --- a/app/admin/router/sys_file_info.go +++ /dev/null @@ -1,25 +0,0 @@ -package router - -import ( - "github.com/gin-gonic/gin" - jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/sys_file" - middleware2 "go-admin/common/middleware" -) - -func init() { - routerCheckRole = append(routerCheckRole, registerSysFileInfoRouter) -} - -// 需认证的路由代码 -func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_file.SysFileInfo{} - r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) - { - r.GET("", api.GetSysFileInfoList) - r.GET("/:id", api.GetSysFileInfo) - r.POST("", api.InsertSysFileInfo) - r.PUT("/:id", api.UpdateSysFileInfo) - r.DELETE("/:id", api.DeleteSysFileInfo) - } -} diff --git a/app/admin/router/sys_login_log.go b/app/admin/router/sys_login_log.go index b813357..61b4e83 100644 --- a/app/admin/router/sys_login_log.go +++ b/app/admin/router/sys_login_log.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_login_log" - middleware2 "go-admin/common/middleware" + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,13 +13,12 @@ func init() { // 需认证的路由代码 func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_login_log.SysLoginLog{} - r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysLoginLog{} + + r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysLoginLogList) - r.GET("/:id", api.GetSysLoginLog) - r.POST("", api.InsertSysLoginLog) - r.PUT("/:id", api.UpdateSysLoginLog) - r.DELETE("", api.DeleteSysLoginLog) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.DELETE("", api.Delete) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_menu.go b/app/admin/router/sys_menu.go index 8d7b300..b5cad5a 100644 --- a/app/admin/router/sys_menu.go +++ b/app/admin/router/sys_menu.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_menu" - middleware2 "go-admin/common/middleware" + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,27 +13,21 @@ func init() { // 需认证的路由代码 func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_menu.SysMenu{} - //menu := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - //{ - // menu.GET("/:id", system.GetMenu) - // menu.POST("", system.InsertMenu) - // menu.PUT("", system.UpdateMenu) - // menu.DELETE("/:id", system.DeleteMenu) - //} - r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysMenu{} + + r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysMenuList) - r.GET("/:id", api.GetSysMenu) - r.POST("", api.InsertSysMenu) - r.PUT("/:id", api.UpdateSysMenu) - r.DELETE("/:id", api.DeleteSysMenu) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("", api.Delete) } r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()) { r1.GET("/menurole", api.GetMenuRole) - r1.GET("/menuids", api.GetMenuIDS) + //r1.GET("/menuids", api.GetMenuIDS) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_opera_log.go b/app/admin/router/sys_opera_log.go index 37e0db5..d24d54f 100644 --- a/app/admin/router/sys_opera_log.go +++ b/app/admin/router/sys_opera_log.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_opera_log" - middleware2 "go-admin/common/middleware" + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,13 +13,11 @@ func init() { // 需认证的路由代码 func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_opera_log.SysOperaLog{} - r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysOperaLog{} + r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysOperaLogList) - r.GET("/:id", api.GetSysOperaLog) - r.POST("", api.InsertSysOperaLog) - r.PUT("/:id", api.UpdateSysOperaLog) - r.DELETE("", api.DeleteSysOperaLog) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.DELETE("", api.Delete) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_post.go b/app/admin/router/sys_post.go index a77f861..f62ec78 100644 --- a/app/admin/router/sys_post.go +++ b/app/admin/router/sys_post.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_post" - middleware2 "go-admin/common/middleware" + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,13 +13,13 @@ func init() { // 需认证的路由代码 func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_post.SysPost{} - r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysPost{} + r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysPostList) - r.GET("/:id", api.GetSysPost) - r.POST("", api.InsertSysPost) - r.PUT("/:id", api.UpdateSysPost) - r.DELETE("/:id", api.DeleteSysPost) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("/:id", api.Delete) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_role.go b/app/admin/router/sys_role.go index 9ad9efa..5bfdd2a 100644 --- a/app/admin/router/sys_role.go +++ b/app/admin/router/sys_role.go @@ -3,8 +3,9 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/system/sys_role" - middleware2 "go-admin/common/middleware" + + "go-admin/app/admin/apis" + "go-admin/common/middleware" ) func init() { @@ -13,14 +14,18 @@ func init() { // 需认证的路由代码 func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_role.SysRole{} - r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + api := apis.SysRole{} + r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", api.GetSysRoleList) - r.GET("/:id", api.GetSysRole) - r.POST("", api.InsertSysRole) - r.PUT("/:id", api.UpdateSysRole) - r.DELETE("", api.DeleteSysRole) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("", api.Delete) + } + r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()) + { + r1.PUT("/role-status", api.Update2Status) + r1.PUT("/roledatascope", api.Update2DataScope) } - v1.PUT("/roledatascope", api.UpdateRoleDataScope) } diff --git a/app/admin/router/sys_router.go b/app/admin/router/sys_router.go index ee4addf..3af90e7 100644 --- a/app/admin/router/sys_router.go +++ b/app/admin/router/sys_router.go @@ -1,6 +1,7 @@ package router import ( + "go-admin/app/admin/apis" "mime" "github.com/gin-gonic/gin" @@ -9,13 +10,6 @@ import ( ginSwagger "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" - "go-admin/app/admin/apis/monitor" - "go-admin/app/admin/apis/public" - "go-admin/app/admin/apis/system" - "go-admin/app/admin/apis/system/dict" - "go-admin/app/admin/apis/system/sys_dept" - "go-admin/app/admin/apis/system/sys_menu" - "go-admin/app/admin/apis/tools" "go-admin/common/middleware" "go-admin/common/middleware/handler" _ "go-admin/docs" @@ -28,8 +22,6 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou sysStaticFileRouter(g) // swagger;注意:生产环境可以注释掉 sysSwaggerRouter(g) - // 无需认证 - sysNoCheckRoleRouter(g) // 需要认证 sysCheckRoleRouterInit(g, authMiddleware) return g @@ -41,7 +33,7 @@ func sysBaseRouter(r *gin.RouterGroup) { go ws.WebsocketManager.SendService() go ws.WebsocketManager.SendAllService() - r.GET("/", system.HelloWorld) + r.GET("/", apis.HelloWorld) r.GET("/info", handler.Ping) } @@ -58,53 +50,6 @@ func sysSwaggerRouter(r *gin.RouterGroup) { r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) } -func sysNoCheckRoleRouter(r *gin.RouterGroup) { - v1 := r.Group("/api/v1") - - m := monitor.Monitor{} - v1.GET("/monitor/server", m.ServerInfo) - sys := system.System{} - v1.GET("/getCaptcha", sys.GenerateCaptchaHandler) - gen := tools.Gen{} - v1.GET("/gen/preview/:tableId", gen.Preview) - v1.GET("/gen/toproject/:tableId", gen.GenCode) - v1.GET("/gen/apitofile/:tableId", gen.GenApiToFile) - - v1.GET("/gen/todb/:tableId", gen.GenMenuAndApi) - sysTable := tools.SysTable{} - v1.GET("/gen/tabletree", sysTable.GetSysTablesTree) - - registerDBRouter(v1) - registerSysTableRouter(v1) - registerPublicRouter(v1) - registerSysSettingRouter(v1) -} - -func registerDBRouter(api *gin.RouterGroup) { - db := api.Group("/db") - { - gen := tools.Gen{} - db.GET("/tables/page", gen.GetDBTableList) - db.GET("/columns/page", gen.GetDBColumnList) - } -} - -func registerSysTableRouter(v1 *gin.RouterGroup) { - systables := v1.Group("/sys/tables") - { - sysTable := tools.SysTable{} - systables.GET("/page", sysTable.GetSysTableList) - tablesinfo := systables.Group("/info") - { - tablesinfo.POST("", sysTable.InsertSysTable) - tablesinfo.PUT("", sysTable.UpdateSysTable) - tablesinfo.DELETE("/:tableId", sysTable.DeleteSysTables) - tablesinfo.GET("/:tableId", sysTable.GetSysTables) - tablesinfo.GET("", sysTable.GetSysTablesInfo) - } - } -} - func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient) r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient) @@ -115,108 +60,17 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle v1.GET("/refresh_token", authMiddleware.RefreshHandler) //registerPageRouter(v1, authMiddleware) registerBaseRouter(v1, authMiddleware) - registerDictRouter(v1, authMiddleware) - //registerSysUserRouter(v1, authMiddleware) - //registerUserCenterRouter(v1, authMiddleware) + //registerDictRouter(v1, authMiddleware) } func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_menu.SysMenu{} - api2 := sys_dept.SysDept{} + api := apis.SysMenu{} + api2 := apis.SysDept{} v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - //v1auth.GET("/getinfo", system.GetInfo) v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect) - v1.GET("/menuTreeselect", api.GetMenuTreeSelect) + //v1.GET("/menuTreeselect", api.GetMenuTreeSelect) v1auth.GET("/roleDeptTreeselect/:roleId", api2.GetDeptTreeRoleSelect) - //GetDeptTreeRoleselect) v1auth.POST("/logout", handler.LogOut) } } - -//func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// v1auth.GET("/sysUserList", system.GetSysUserList) -// } -//} - -//func registerUserCenterRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// user.GET("/profile", system.GetSysUserProfile) -// user.POST("/avatar", system.InsetSysUserAvatar) -// user.PUT("/pwd", system.SysUserUpdatePwd) -// } -//} - -//func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// post := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// post.GET("/:postId", system.GetPost) -// post.POST("", system.InsertPost) -// post.PUT("", system.UpdatePost) -// post.DELETE("/:postId", system.DeletePost) -// } -//} - -//func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// sysuser.GET("/:userId", system.GetSysUser) -// sysuser.GET("/", system.GetSysUserInit) -// sysuser.POST("", system.InsertSysUser) -// sysuser.PUT("", system.UpdateSysUser) -// sysuser.DELETE("/:userId", system.DeleteSysUser) -// } -//} - -func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - dictApi := dict.SysDictType{} - dataApi := dict.SysDictData{} - dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - - dicts.GET("/data", dataApi.GetSysDictDataList) - dicts.GET("/data/:dictCode", dataApi.GetSysDictData) - dicts.POST("/data", dataApi.InsertSysDictData) - dicts.PUT("/data/:dictCode", dataApi.UpdateSysDictData) - dicts.DELETE("/data", dataApi.DeleteSysDictData) - - dicts.GET("/type-option-select", dictApi.GetSysDictTypeAll) - dicts.GET("/type", dictApi.GetSysDictTypeList) - dicts.GET("/type/:id", dictApi.GetSysDictType) - dicts.POST("/type", dictApi.InsertSysDictType) - dicts.PUT("/type/:id", dictApi.UpdateSysDictType) - dicts.DELETE("/type", dictApi.DeleteSysDictType) - } - v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).GET("/data-all", dataApi.GetSysDictDataAll) -} - -//func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// dept := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// dept.GET("/:deptId", system.GetDept) -// dept.POST("", system.InsertDept) -// dept.PUT("", system.UpdateDept) -// dept.DELETE("/:id", system.DeleteDept) -// } -//} -func registerSysSettingRouter(v1 *gin.RouterGroup) { - api := system.SysSetting{} - m := monitor.Monitor{} - setting := v1.Group("/setting") - { - setting.GET("", api.GetSetting) - setting.POST("", api.CreateOrUpdateSetting) - setting.GET("/serverInfo", m.ServerInfo) - } -} - -func registerPublicRouter(v1 *gin.RouterGroup) { - p := v1.Group("/public") - { - file := public.File{} - p.POST("/uploadFile", file.UploadFile) - } -} diff --git a/app/admin/router/sys_user.go b/app/admin/router/sys_user.go index 59e4a67..ceb79b7 100644 --- a/app/admin/router/sys_user.go +++ b/app/admin/router/sys_user.go @@ -3,9 +3,9 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/sys_user" + "go-admin/app/admin/apis" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,24 +14,26 @@ func init() { // 需认证的路由代码 func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := sys_user.SysUser{} - r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction()) + api := apis.SysUser{} + r := v1.Group("/sys-user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) { - r.GET("", api.GetSysUserList) - r.GET("/:id", api.GetSysUser) - r.POST("", api.InsertSysUser) - r.PUT("", api.UpdateSysUser) - r.DELETE("", api.DeleteSysUser) + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("", api.Update) + r.DELETE("", api.Delete) } - user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction()) + user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) { - user.GET("/profile", api.GetSysUserProfile) - user.POST("/avatar", api.InsetSysUserAvatar) - user.PUT("/pwd", api.SysUserUpdatePwd) + user.GET("/profile", api.GetProfile) + user.POST("/avatar", api.InsetAvatar) + user.PUT("/pwd", api.UpdatePwd) + user.PUT("/pwd/reset", api.ResetPwd) + user.PUT("/status", api.UpdateStatus) } v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()) { v1auth.GET("/getinfo", api.GetInfo) } -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go new file mode 100644 index 0000000..48fac28 --- /dev/null +++ b/app/admin/service/dto/sys_api.go @@ -0,0 +1,73 @@ +package dto + +import ( + "go-admin/app/admin/models" + "go-admin/common/dto" + common "go-admin/common/models" +) + +type SysApiSearch struct { + dto.Pagination `search:"-"` + Title string `form:"title" search:"type:contains;column:title;table:sys_api" comment:"标题"` + Path string `form:"path" search:"type:contains;column:path;table:sys_api" comment:"地址"` + Action string `form:"action" search:"type:exact;column:action;table:sys_api" comment:"类型"` + ParentId string `form:"parentId" search:"type:exact;column:parent_id;table:sys_api" comment:"按钮id"` + SysApiOrder +} + +type SysApiOrder struct { + TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"` + PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"` +} + +func (m *SysApiSearch) GetNeedSearch() interface{} { + return *m +} + +type SysApiControl struct { + Id int `uri:"id" comment:"编码"` // 编码 + Handle string `json:"handle" comment:"handle"` + Title string `json:"title" comment:"标题"` + Path string `json:"path" comment:"地址"` + Type string `json:"type" comment:""` + Action string `json:"action" comment:"类型"` + common.ControlBy +} + +func (s *SysApiControl) Generate(model *models.SysApi) { + if s.Id != 0 { + model.Id = s.Id + } + model.Handle = s.Handle + model.Title = s.Title + model.Path = s.Path + model.Type = s.Type + model.Action = s.Action +} + +func (s *SysApiControl) GetId() interface{} { + return s.Id +} + +type SysApiById struct { + dto.ObjectById + common.ControlBy +} + +func (s *SysApiById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } + return s.Id +} + +func (s *SysApiById) Generate() dto.Control { + o := *s + return &o +} + +func (s *SysApiById) GenerateM() (common.ActiveRecord, error) { + return &models.SysApi{}, nil +} diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index ab277db..e0356bd 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -1,13 +1,7 @@ package dto import ( - "encoding/json" - - "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/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -15,80 +9,88 @@ import ( // SysConfigSearch 列表或者搜索使用结构体 type SysConfigSearch struct { dto.Pagination `search:"-"` - ConfigName string `form:"configName" search:"type:contains;column:config_name;table:sys_config" comment:""` - ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config" comment:""` - ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config" comment:""` - IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""` + ConfigName string `form:"configName" search:"type:contains;column:config_name;table:sys_config"` + ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"` + ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config"` + IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"` + SysConfigOrder +} + +type SysConfigOrder struct { + IdOrder string `search:"type:order;column:id;table:sys_config" form:"idOrder"` + ConfigNameOrder string `search:"type:order;column:config_name;table:sys_config" form:"configNameOrder"` + ConfigKeyOrder string `search:"type:order;column:config_key;table:sys_config" form:"configKeyOrder"` + ConfigTypeOrder string `search:"type:order;column:config_type;table:sys_config" form:"configTypeOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_config" form:"createdAtOrder"` } func (m *SysConfigSearch) GetNeedSearch() interface{} { return *m } -// Bind 映射上下文中的结构体数据 -func (m *SysConfigSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - // SysConfigControl 增、改使用的结构体 type SysConfigControl struct { - ID int `uri:"Id" comment:"编码"` // 编码 + Id int `uri:"Id" comment:"编码"` // 编码 ConfigName string `json:"configName" comment:""` ConfigKey string `uri:"configKey" json:"configKey" comment:""` ConfigValue string `json:"configValue" comment:""` ConfigType string `json:"configType" comment:""` IsFrontend int `json:"isFrontend"` Remark string `json:"remark" comment:""` -} - -// Bind 映射上下文中的结构体数据 -func (s *SysConfigControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBindBodyWith(s, binding.JSON) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err + common.ControlBy } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysConfigControl) Generate() (*system.SysConfig, error) { - return &system.SysConfig{ - Model: common.Model{Id: s.ID}, - ConfigName: s.ConfigName, - ConfigKey: s.ConfigKey, - ConfigValue: s.ConfigValue, - ConfigType: s.ConfigType, - IsFrontend: s.IsFrontend, - Remark: s.Remark, - }, nil +func (s *SysConfigControl) Generate(model *models.SysConfig) { + if s.Id == 0 { + model.Model = common.Model{Id: s.Id} + } + model.ConfigName = s.ConfigName + model.ConfigKey = s.ConfigKey + model.ConfigValue = s.ConfigValue + model.ConfigType = s.ConfigType + model.IsFrontend = s.IsFrontend + model.Remark = s.Remark + } // GetId 获取数据对应的ID func (s *SysConfigControl) GetId() interface{} { - return s.ID + return s.Id +} + +// GetSetSysConfigReq 增、改使用的结构体 +type GetSetSysConfigReq struct { + ConfigKey string `json:"configKey" comment:""` + ConfigValue string `json:"configValue" comment:""` +} + +// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 +func (s *GetSetSysConfigReq) Generate(model *models.SysConfig) { + model.ConfigValue = s.ConfigValue +} + +type UpdateSetSysConfigReq map[string]string + +// SysConfigByKeyReq 根据Key获取配置 +type SysConfigByKeyReq struct { + ConfigKey string `uri:"configKey" search:"type:contains;column:config_key;table:sys_config"` +} + +func (m *SysConfigByKeyReq) GetNeedSearch() interface{} { + return *m +} + +type GetSysConfigByKEYForServiceResp struct { + ConfigKey string `json:"configKey" comment:""` + ConfigValue string `json:"configValue" comment:""` } // SysConfigById 获取单个或者删除的结构体 type SysConfigById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` + Id int `uri:"id"` + Ids []int `json:"ids"` + common.ControlBy } func (s *SysConfigById) Generate() *SysConfigById { @@ -103,21 +105,3 @@ func (s *SysConfigById) GetId() interface{} { } return s.Id } - -func (s *SysConfigById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { - return &system.SysConfig{}, nil -} diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index f9c652e..e7c8ba7 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -1,17 +1,13 @@ package dto import ( - "encoding/json" + "go-admin/app/admin/models" + common "go-admin/common/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" ) -// SysConfigSearch 列表或者搜索使用结构体 +// SysDeptSearch 列表或者搜索使用结构体 type SysDeptSearch struct { dto.Pagination `search:"-"` DeptId int `form:"deptId" search:"type:exact;column:dept_id;table:sys_dept" comment:"id"` //id @@ -29,17 +25,8 @@ func (m *SysDeptSearch) GetNeedSearch() interface{} { return *m } -// Bind 映射上下文中的结构体数据 -func (m *SysDeptSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} -// SysConfigControl 增、改使用的结构体 +// SysDeptControl 增、改使用的结构体 type SysDeptControl struct { DeptId int `uri:"id" comment:"编码"` // 编码 ParentId int `form:"parentId" comment:"上级部门"` //上级部门 @@ -50,42 +37,22 @@ type SysDeptControl struct { Phone string `form:"phone" comment:"手机"` //手机 Email string `form:"email" comment:"邮箱"` //邮箱 Status string `form:"status" comment:"状态"` //状态 + common.ControlBy } -// Bind 映射上下文中的结构体数据 -func (s *SysDeptControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err +// Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型 +func (s *SysDeptControl) Generate(model *models.SysDept) { + if s.DeptId != 0 { + model.DeptId = s.DeptId } - err = ctx.ShouldBindBodyWith(s, binding.JSON) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err -} - -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysDeptControl) Generate() (*system.SysDept, error) { - return &system.SysDept{ - DeptId: s.DeptId, - DeptName: s.DeptName, - ParentId: s.ParentId, - DeptPath: s.DeptPath, - Sort: s.Sort, - Leader: s.Leader, - Phone: s.Phone, - Email: s.Email, - Status: s.Status, - }, nil + model.DeptName = s.DeptName + model.ParentId = s.ParentId + model.DeptPath = s.DeptPath + model.Sort = s.Sort + model.Leader = s.Leader + model.Phone = s.Phone + model.Email = s.Email + model.Status = s.Status } // GetId 获取数据对应的ID @@ -93,7 +60,7 @@ func (s *SysDeptControl) GetId() interface{} { return s.DeptId } -// SysConfigById 获取单个或者删除的结构体 +// SysDeptById 获取单个或者删除的结构体 type SysDeptById struct { Id int `uri:"id"` Ids []int `json:"ids"` @@ -105,29 +72,19 @@ func (s *SysDeptById) Generate() *SysDeptById { } func (s *SysDeptById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } return s.Id } -func (s *SysDeptById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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..46083ca 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -1,12 +1,7 @@ package dto import ( - "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/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -24,20 +19,6 @@ func (m *SysDictDataSearch) GetNeedSearch() interface{} { return *m } -func (m *SysDictDataSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -func (m *SysDictDataSearch) Generate() dto.Index { - o := *m - return &o -} - type SysDictDataControl struct { Id int `uri:"dictCode" comment:""` DictSort int `json:"dictSort" comment:""` @@ -50,41 +31,22 @@ type SysDictDataControl struct { Status string `json:"status" comment:""` Default string `json:"default" comment:""` Remark string `json:"remark" comment:""` + common.ControlBy } -func (s *SysDictDataControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} +func (s *SysDictDataControl) Generate(model *models.SysDictData) { -func (s *SysDictDataControl) Generate() dto.Control { - cp := *s - return &cp -} - -func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{ - DictCode: s.Id, - DictSort: s.DictSort, - DictLabel: s.DictLabel, - DictValue: s.DictValue, - DictType: s.DictType, - CssClass: s.CssClass, - ListClass: s.ListClass, - IsDefault: s.IsDefault, - Status: s.Status, - Default: s.Default, - Remark: s.Remark, - }, nil + model.DictCode = s.Id + model.DictSort = s.DictSort + model.DictLabel = s.DictLabel + model.DictValue = s.DictValue + model.DictType = s.DictType + model.CssClass = s.CssClass + model.ListClass = s.ListClass + model.IsDefault = s.IsDefault + model.Status = s.Status + model.Default = s.Default + model.Remark = s.Remark } func (s *SysDictDataControl) GetId() interface{} { @@ -94,33 +56,17 @@ func (s *SysDictDataControl) GetId() interface{} { type SysDictDataById struct { Id int `uri:"dictCode"` Ids []int `json:"ids"` -} - -func (s *SysDictDataById) Bind(ctx *gin.Context) error { - if ctx.Request.Method == http.MethodDelete { - err := ctx.ShouldBind(&s.Ids) - if err != nil { - return err - } - if len(s.Ids) > 0 { - return nil - } - } - return ctx.ShouldBindUri(s) + common.ControlBy } func (s *SysDictDataById) GetId() interface{} { if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) return s.Ids } return s.Id } -func (s *SysDictDataById) Generate() dto.Control { - cp := *s - return &cp -} - func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{}, nil + return &models.SysDictData{}, nil } diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 377a7dd..80517fd 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -1,10 +1,8 @@ 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" ) @@ -17,64 +15,32 @@ type SysDictTypeSearch struct { Status int `form:"status" search:"type:exact;column:status;table:sys_dict_type"` } +type SysDictTypeOrder struct { + DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dictIdOrder"` +} + func (m *SysDictTypeSearch) GetNeedSearch() interface{} { return *m } -func (m *SysDictTypeSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -func (m *SysDictTypeSearch) Generate() dto.Index { - o := *m - return &o -} - type SysDictTypeControl struct { - Id int `uri:"id" comment:""` // - - DictName string `json:"dictName" comment:""` - - DictType string `json:"dictType" comment:""` - - Status string `json:"status" comment:""` - - Remark string `json:"remark" comment:""` + Id int `uri:"id"` + DictName string `json:"dictName"` + DictType string `json:"dictType"` + Status string `json:"status"` + Remark string `json:"remark"` + common.ControlBy } -func (s *SysDictTypeControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err +func (s *SysDictTypeControl) Generate(model *models.SysDictType) { + if s.Id != 0 { + model.ID = s.Id } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} + model.DictName = s.DictName + model.DictType = s.DictType + model.Status = s.Status + model.Remark = s.Remark -func (s *SysDictTypeControl) Generate() dto.Control { - cp := *s - return &cp -} - -func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{ - - ID: s.Id, - DictName: s.DictName, - DictType: s.DictType, - Status: s.Status, - Remark: s.Remark, - }, nil } func (s *SysDictTypeControl) GetId() interface{} { @@ -83,6 +49,7 @@ func (s *SysDictTypeControl) GetId() interface{} { type SysDictTypeById struct { dto.ObjectById + common.ControlBy } func (s *SysDictTypeById) Generate() dto.Control { @@ -90,6 +57,14 @@ func (s *SysDictTypeById) Generate() dto.Control { return &cp } +func (s *SysDictTypeById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } + return s.Id +} + func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{}, nil + return &models.SysDictType{}, nil } diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 1984713..d5f36d7 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -1,12 +1,9 @@ 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" ) @@ -17,21 +14,18 @@ type SysLoginLogSearch struct { Status string `form:"status" search:"type:exact;column:status;table:sys_login_log" comment:"状态"` Ipaddr string `form:"ipaddr" search:"type:exact;column:ipaddr;table:sys_login_log" comment:"ip地址"` LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"` + BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_login_log" comment:"创建时间"` + EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_login_log" comment:"创建时间"` +} + +type SysLoginLogOrder struct { + HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"` } func (m *SysLoginLogSearch) GetNeedSearch() interface{} { return *m } -func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - type SysLoginLogControl struct { ID int `uri:"Id" comment:"主键"` // 主键 Username string `json:"username" comment:"用户名"` @@ -46,22 +40,8 @@ type SysLoginLogControl struct { Msg string `json:"msg" comment:"信息"` } -func (s *SysLoginLogControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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, @@ -83,31 +63,18 @@ func (s *SysLoginLogControl) GetId() interface{} { type SysLoginLogById struct { Id int `uri:"id"` Ids []int `json:"ids"` + common.ControlBy } func (s *SysLoginLogById) GetId() interface{} { return s.Id } -func (s *SysLoginLogById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(&s.Ids) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - func (s *SysLoginLogById) Generate() *SysLoginLogById { cp := *s 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..7447d74 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -1,104 +1,81 @@ package dto import ( - "encoding/json" + "go-admin/app/admin/models" + common "go-admin/common/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" ) // SysMenuSearch 列表或者搜索使用结构体 type SysMenuSearch struct { dto.Pagination `search:"-"` - ParentId int `form:"parentId" search:"type:exact;column:parent_id;table:sys_dept" comment:"上级部门"` //上级部门 - DeptPath string `form:"deptPath" search:"type:exact;column:dept_path;table:sys_dept" comment:""` //路径 - DeptName string `form:"deptName" search:"type:exact;column:dept_name;table:sys_dept" comment:"部门名称"` //部门名称 - Sort int `form:"sort" search:"type:exact;column:sort;table:sys_dept" comment:"排序"` //排序 - Leader string `form:"leader" search:"type:exact;column:leader;table:sys_dept" comment:"负责人"` //负责人 - Phone string `form:"phone" search:"type:exact;column:phone;table:sys_dept" comment:"手机"` //手机 - Email string `form:"email" search:"type:exact;column:email;table:sys_dept" comment:"邮箱"` //邮箱 - Status string `form:"status" search:"type:exact;column:status;table:sys_dept" comment:"状态"` //状态 + Title string `form:"title" search:"type:contains;column:title;table:sys_menu" comment:"菜单名称"` // 菜单名称 + Visible int `form:"visible" search:"type:exact;column:visible;table:sys_menu" comment:"显示状态"` // 显示状态 } func (m *SysMenuSearch) GetNeedSearch() interface{} { return *m } -// Bind 映射上下文中的结构体数据 -func (m *SysMenuSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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 + common.ControlBy } -// Bind 映射上下文中的结构体数据 -func (s *SysMenuControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBindBodyWith(s, binding.JSON) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err +func (s *SysMenuControl) SetCreateBy(id int) { + s.CreateBy = id } -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysMenuControl) Generate() (*system.SysMenu, error) { - return &system.SysMenu{ - MenuId: s.MenuId, - MenuName: s.MenuName, - Title: s.Title, - Icon: s.Icon, - Path: s.Path, - Paths: s.Paths, - MenuType: s.MenuType, - Action: s.Action, - Permission: s.Permission, - ParentId: s.ParentId, - NoCache: s.NoCache, - Breadcrumb: s.Breadcrumb, - Component: s.Component, - Sort: s.Sort, - Visible: s.Visible, - IsFrame: s.IsFrame, - }, nil +func (s *SysMenuControl) SetUpdateBy(id int) { + s.UpdateBy = id +} + +// Generate 结构体数据转化 从 Control 至 model 对应的模型 +func (s *SysMenuControl) Generate(model *models.SysMenu) { + if s.MenuId != 0 { + model.MenuId = s.MenuId + } + model.MenuName = s.MenuName + model.Title = s.Title + model.Icon = s.Icon + model.Path = s.Path + model.Paths = s.Paths + model.MenuType = s.MenuType + model.Action = s.Action + model.SysApi = s.SysApi + model.Permission = s.Permission + model.ParentId = s.ParentId + model.NoCache = s.NoCache + model.Breadcrumb = s.Breadcrumb + model.Component = s.Component + model.Sort = s.Sort + model.Visible = s.Visible + model.IsFrame = s.IsFrame + if s.CreateBy != 0 { + model.CreateBy = s.CreateBy + } + if s.UpdateBy != 0 { + model.UpdateBy = s.UpdateBy + } } // GetId 获取数据对应的ID @@ -106,10 +83,11 @@ func (s *SysMenuControl) GetId() interface{} { return s.MenuId } -// SysConfigById 获取单个或者删除的结构体 +// SysMenuById 获取单个或者删除的结构体 type SysMenuById struct { Id int `uri:"id"` Ids []int `json:"ids"` + common.ControlBy } func (s *SysMenuById) Generate() *SysMenuById { @@ -118,38 +96,28 @@ func (s *SysMenuById) Generate() *SysMenuById { } func (s *SysMenuById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } return s.Id } -func (s *SysMenuById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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 { - Id int `json:"id" gorm:"-"` - Label string `json:"label" gorm:"-"` - Children []MenuLabel `json:"children" gorm:"-"` + Id int `json:"id,omitempty" gorm:"-"` + Label string `json:"label,omitempty" gorm:"-"` + Children []MenuLabel `json:"children,omitempty" gorm:"-"` } 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..a30b6f4 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -3,37 +3,27 @@ package dto import ( "time" - "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/api" - - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) type SysOperaLogSearch struct { dto.Pagination `search:"-"` - - Title string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"` - Method string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"` - RequestMethod string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式"` - OperUrl string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"` - OperIp string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"` + Title string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"` + Method string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"` + RequestMethod string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式"` + OperUrl string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"` + OperIp string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"` + Status int `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态"` + BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_opera_log" comment:"创建时间"` + EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_opera_log" comment:"创建时间"` } func (m *SysOperaLogSearch) GetNeedSearch() interface{} { return *m } -func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - type SysOperaLogControl struct { ID int `uri:"Id" comment:"编码"` // 编码 Title string `json:"title" comment:"操作模块"` @@ -56,22 +46,8 @@ type SysOperaLogControl struct { UserAgent string `json:"userAgent" comment:"ua"` } -func (s *SysOperaLogControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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, @@ -111,20 +87,6 @@ func (s *SysOperaLogById) GetId() interface{} { return s.Id } -func (s *SysOperaLogById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(&s.Ids) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - func (s *SysOperaLogById) SetUpdateBy(id int) { } diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index 95cc81f..fdde48e 100644 --- a/app/admin/service/dto/sys_post.go +++ b/app/admin/service/dto/sys_post.go @@ -1,42 +1,28 @@ package dto import ( - "encoding/json" + "go-admin/app/admin/models" + common "go-admin/common/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" ) // SysPostSearch 列表或者搜索使用结构体 type SysPostSearch struct { dto.Pagination `search:"-"` - PostId int `form:"postId" search:"type:exact;column:post_id;table:sys_post" comment:"id"` // id - PostName string `form:"postName" search:"type:exact;column:post_name;table:sys_post" comment:"名称"` // 名称 - PostCode string `form:"postCode" search:"type:exact;column:post_code;table:sys_post" comment:"编码"` // 编码 - Sort int `form:"sort" search:"type:exact;column:sort;table:sys_post" comment:"排序"` // 排序 - Status int `form:"status" search:"type:exact;column:status;table:sys_post" comment:"状态"` // 状态 - Remark string `form:"remark" search:"type:exact;column:remark;table:sys_post" comment:"备注"` // 备注 + PostId int `form:"postId" search:"type:exact;column:post_id;table:sys_post" comment:"id"` // id + PostName string `form:"postName" search:"type:contains;column:post_name;table:sys_post" comment:"名称"` // 名称 + PostCode string `form:"postCode" search:"type:contains;column:post_code;table:sys_post" comment:"编码"` // 编码 + Sort int `form:"sort" search:"type:exact;column:sort;table:sys_post" comment:"排序"` // 排序 + Status int `form:"status" search:"type:exact;column:status;table:sys_post" comment:"状态"` // 状态 + Remark string `form:"remark" search:"type:exact;column:remark;table:sys_post" comment:"备注"` // 备注 } func (m *SysPostSearch) GetNeedSearch() interface{} { return *m } -// Bind 映射上下文中的结构体数据 -func (m *SysPostSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -// SysConfigControl 增、改使用的结构体 +// SysPostControl 增、改使用的结构体 type SysPostControl struct { PostId int `uri:"id" comment:"id"` // id PostName string `form:"postName" comment:"名称"` // 名称 @@ -44,39 +30,25 @@ type SysPostControl struct { Sort int `form:"sort" comment:"排序"` // 排序 Status int `form:"status" comment:"状态"` // 状态 Remark string `form:"remark" comment:"备注"` // 备注 -} - -// Bind 映射上下文中的结构体数据 -func (s *SysPostControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBindBodyWith(s, binding.JSON) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err + common.ControlBy } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysPostControl) Generate() (*system.SysPost, error) { - return &system.SysPost{ - PostId: s.PostId, - PostName: s.PostName, - PostCode: s.PostCode, - Sort: s.Sort, - Status: s.Status, - Remark: s.Remark, - }, nil +func (s *SysPostControl) Generate(model *models.SysPost) { + if s.PostId != 0 { + model.PostId = s.PostId + } + model.PostName = s.PostName + model.PostCode = s.PostCode + model.Sort = s.Sort + model.Status = s.Status + model.Remark = s.Remark + if s.ControlBy.UpdateBy != 0 { + model.UpdateBy = s.UpdateBy + } + if s.ControlBy.CreateBy != 0 { + model.CreateBy = s.CreateBy + } } // GetId 获取数据对应的ID @@ -84,35 +56,30 @@ func (s *SysPostControl) GetId() interface{} { return s.PostId } -// SysConfigById 获取单个或者删除的结构体 +// SysPostById 获取单个或者删除的结构体 type SysPostById struct { Id int `uri:"id"` Ids []int `json:"ids"` + common.ControlBy } -func (s *SysPostById) Generate() *SysPostById { - cp := *s - return &cp +func (s *SysPostById) Generate(model *models.SysPost) { + if s.ControlBy.UpdateBy != 0 { + model.UpdateBy = s.UpdateBy + } + if s.ControlBy.CreateBy != 0 { + model.CreateBy = s.CreateBy + } } func (s *SysPostById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } return s.Id } -func (s *SysPostById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.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..9eb7a83 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -1,13 +1,9 @@ package dto import ( - "encoding/json" + "go-admin/app/admin/models" + common "go-admin/common/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" ) @@ -26,69 +22,56 @@ type SysRoleSearch struct { DataScope string `form:"dataScope" search:"type:exact;column:data_scope;table:sys_role" comment:"是否管理员"` } +type SysRoleOrder struct { + RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleIdOrder"` + RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleNameOrder"` + RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"` +} + func (m *SysRoleSearch) GetNeedSearch() interface{} { return *m } -// Bind 映射上下文中的结构体数据 -func (m *SysRoleSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -// SysConfigControl 增、改使用的结构体 type SysRoleControl struct { - RoleId int `uri:"id" comment:"角色编码"` // 角色编码 - RoleName string `form:"roleName" comment:"角色名称"` // 角色名称 - Status string `form:"status" comment:"状态"` // 状态 - RoleKey string `form:"roleKey" comment:"角色代码"` // 角色代码 - RoleSort int `form:"roleSort" comment:"角色排序"` // 角色排序 - Flag string `form:"flag" comment:"标记"` // 标记 - Remark string `form:"remark" comment:"备注"` // 备注 - Admin bool `form:"admin" comment:"是否管理员"` - DataScope string `form:"dataScope"` - MenuIds []int `json:"menuIds"` + RoleId int `uri:"id" comment:"角色编码"` // 角色编码 + RoleName string `form:"roleName" comment:"角色名称"` // 角色名称 + Status string `form:"status" comment:"状态"` // 状态 + RoleKey string `form:"roleKey" comment:"角色代码"` // 角色代码 + RoleSort int `form:"roleSort" comment:"角色排序"` // 角色排序 + Flag string `form:"flag" comment:"标记"` // 标记 + Remark string `form:"remark" comment:"备注"` // 备注 + Admin bool `form:"admin" comment:"是否管理员"` + DataScope string `form:"dataScope"` + SysMenu []models.SysMenu `form:"sysMenu"` + MenuIds []int `form:"menuIds"` + common.ControlBy } -// Bind 映射上下文中的结构体数据 -func (s *SysRoleControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindBodyWith(s, binding.JSON) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - err = ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err +func (s *SysRoleControl) SetCreateBy(id int) { + s.CreateBy = id } -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysRoleControl) Generate() (*system.SysRole, error) { - return &system.SysRole{ - RoleId: s.RoleId, - RoleName: s.RoleName, - Status: s.Status, - RoleKey: s.RoleKey, - RoleSort: s.RoleSort, - Flag: s.Flag, - Remark: s.Remark, - Admin: s.Admin, - DataScope: s.DataScope, - MenuIds: s.MenuIds, - }, nil +func (s *SysRoleControl) SetUpdateBy(id int) { + s.UpdateBy = id +} + +// Generate 结构体数据转化 +func (s *SysRoleControl) Generate(model *models.SysRole) { + if s.RoleId != 0 { + model.RoleId = s.RoleId + } + model.RoleName = s.RoleName + model.Status = s.Status + model.RoleKey = s.RoleKey + model.RoleSort = s.RoleSort + model.Flag = s.Flag + model.Remark = s.Remark + model.Admin = s.Admin + model.DataScope = s.DataScope + model.SysMenu = &s.SysMenu + } // GetId 获取数据对应的ID @@ -96,7 +79,25 @@ func (s *SysRoleControl) GetId() interface{} { return s.RoleId } -// SysConfigById 获取单个或者删除的结构体 +type UpdateStatusReq struct { + RoleId int `form:"roleId" comment:"角色编码"` // 角色编码 + Status string `form:"status" comment:"状态"` // 状态 + common.ControlBy +} + +func (s *UpdateStatusReq) Generate(model *models.SysRole) { + if s.RoleId != 0 { + model.RoleId = s.RoleId + } + model.Status = s.Status +} + +func (s *UpdateStatusReq) GetId() interface{} { + return s.RoleId +} + + +// SysRoleById 获取单个或者删除的结构体 type SysRoleById struct { dto.ObjectById } @@ -107,11 +108,15 @@ func (s *SysRoleById) Generate() *SysRoleById { } func (s *SysRoleById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } 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 角色数据权限修改 @@ -123,4 +128,4 @@ type RoleDataScopeReq struct { type DeptIdList struct { DeptId int `json:"DeptId"` -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_setting.go b/app/admin/service/dto/sys_setting.go deleted file mode 100644 index 5a8c771..0000000 --- a/app/admin/service/dto/sys_setting.go +++ /dev/null @@ -1,88 +0,0 @@ -package dto - -import ( - "encoding/json" - - "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/api" - - "go-admin/app/admin/models" -) - -// SysConfigControl 增、改使用的结构体 -type SysSettingControl struct { - SettingsId int `json:"settings_id" binding:"required"` // 头像 - Name string `json:"name" binding:"required"` // 名称 - Logo string `json:"logo" binding:"required"` // 头像 -} - -// Bind 映射上下文中的结构体数据 -func (s *SysSettingControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - - err := ctx.ShouldBind(s) - if err != nil { - log.Errorf("ShouldBind error: %s", err.Error()) - return err - } - - err = ctx.ShouldBindUri(s) - if err != nil { - log.Errorf("ShouldBindUri error: %s", err.Error()) - return err - } - var jsonStr []byte - jsonStr, err = json.Marshal(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - ctx.Set("body", string(jsonStr)) - return err -} - -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysSettingControl) Generate() (*models.SysSetting, error) { - return &models.SysSetting{ - SettingsId: s.SettingsId, - Name: s.Name, - Logo: s.Logo, - }, nil -} - -// GetId 获取数据对应的ID -func (s *SysSettingControl) GetId() interface{} { - return s.SettingsId -} - -// SysConfigById 获取单个或者删除的结构体 -type SysSettingById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` -} - -func (s *SysSettingById) Generate() *SysSettingById { - cp := *s - return &cp -} - -func (s *SysSettingById) GetId() interface{} { - return s.Id -} - -func (s *SysSettingById) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("ShouldBindUri error: %s", err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -func (s *SysSettingById) GenerateM() (*models.SysSetting, error) { - return &models.SysSetting{}, nil -} diff --git a/app/admin/service/dto/systables.go b/app/admin/service/dto/sys_tables.go similarity index 100% rename from app/admin/service/dto/systables.go rename to app/admin/service/dto/sys_tables.go diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 97826ac..91b0bb1 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -1,97 +1,109 @@ 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" ) type SysUserSearch struct { dto.Pagination `search:"-"` - UserId int `form:"UserId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"` + UserId int `form:"userId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"` Username string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"` NickName string `form:"nickName" search:"type:contains;column:nick_name;table:sys_user" comment:"昵称"` Phone string `form:"phone" search:"type:contains;column:phone;table:sys_user" comment:"手机号"` RoleId string `form:"roleId" search:"type:exact;column:role_id;table:sys_user" comment:"角色ID"` Sex string `form:"sex" search:"type:exact;column:sex;table:sys_user" comment:"性别"` Email string `form:"email" search:"type:contains;column:email;table:sys_user" comment:"邮箱"` - DeptId string `form:"deptId" search:"type:exact;column:dept_id;table:sys_user" comment:"部门"` PostId string `form:"postId" search:"type:exact;column:post_id;table:sys_user" comment:"岗位"` Status string `form:"status" search:"type:exact;column:status;table:sys_user" comment:"状态"` + DeptJoin `search:"type:left;on:dept_id:dept_id;table:sys_user;join:sys_dept"` + SysUserOrder +} + +type SysUserOrder struct { + UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userIdOrder"` + UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"` +} + +type DeptJoin struct { + DeptId string `search:"type:contains;column:dept_path;table:sys_dept" form:"deptId"` } func (m *SysUserSearch) GetNeedSearch() interface{} { return *m } -func (m *SysUserSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err +type ResetSysUserPwdReq struct { + UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID + Password string `json:"password" comment:"密码" binding:"required"` + common.ControlBy } -func (m *SysUserSearch) Generate() dto.Index { - o := *m - return &o +func (s *ResetSysUserPwdReq) GetId() interface{} { + return s.UserId +} + +func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) { + if s.UserId != 0 { + model.UserId = s.UserId + } + model.Password = s.Password +} + +type UpdateSysUserStatusReq struct { + UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID + Status string `json:"status" comment:"状态" binding:"required"` + common.ControlBy +} + +func (s *UpdateSysUserStatusReq) GetId() interface{} { + return s.UserId +} + +func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) { + if s.UserId != 0 { + model.UserId = s.UserId + } + model.Status = s.Status } type SysUserControl struct { UserId int `json:"userId" comment:"用户ID"` // 用户ID - Username string `json:"username" comment:"用户名"` + Username string `json:"username" comment:"用户名" binding:"required"` Password string `json:"password" comment:"密码"` - NickName string `json:"nickName" comment:"昵称"` - Phone string `json:"phone" comment:"手机号"` + NickName string `json:"nickName" comment:"昵称" binding:"required"` + Phone string `json:"phone" comment:"手机号" binding:"required"` RoleId int `json:"roleId" comment:"角色ID"` Avatar string `json:"avatar" comment:"头像"` Sex string `json:"sex" comment:"性别"` - Email string `json:"email" comment:"邮箱"` - DeptId int `json:"deptId" comment:"部门"` + Email string `json:"email" comment:"邮箱" binding:"required,email"` + DeptId int `json:"deptId" comment:"部门" binding:"required"` PostId int `json:"postId" comment:"岗位"` Remark string `json:"remark" comment:"备注"` - Status string `json:"status" comment:"状态"` + Status string `json:"status" comment:"状态" binding:"required" default:"1"` + common.ControlBy } -func (s *SysUserControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - //err := ctx.ShouldBindUri(s) - //if err != nil { - // log.Debugf("ShouldBindUri error: %s", err.Error()) - // return err - //} - err := ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) +func (s *SysUserControl) Generate(model *models.SysUser) { + if s.UserId != 0 { + model.UserId = s.UserId } - return err -} - -func (s *SysUserControl) Generate() dto.Control { - cp := *s - return &cp -} - -func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{ - UserId: s.UserId, - Username: s.Username, - Password: s.Password, - NickName: s.NickName, - Phone: s.Phone, - RoleId: s.RoleId, - Avatar: s.Avatar, - Sex: s.Sex, - Email: s.Email, - DeptId: s.DeptId, - PostId: s.PostId, - Remark: s.Remark, - Status: s.Status, - }, nil + model.Username = s.Username + model.Password = s.Password + model.NickName = s.NickName + model.Phone = s.Phone + model.RoleId = s.RoleId + model.Avatar = s.Avatar + model.Sex = s.Sex + model.Email = s.Email + model.DeptId = s.DeptId + model.PostId = s.PostId + model.Remark = s.Remark + model.Status = s.Status } func (s *SysUserControl) GetId() interface{} { @@ -100,15 +112,19 @@ func (s *SysUserControl) GetId() interface{} { type SysUserById struct { dto.ObjectById + common.ControlBy } -func (s *SysUserById) Generate() dto.Control { - cp := *s - return &cp +func (s *SysUserById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } + return s.Id } func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{}, nil + return &models.SysUser{}, nil } // PassWord 密码 diff --git a/app/admin/service/sys_api.go b/app/admin/service/sys_api.go new file mode 100644 index 0000000..e4ac217 --- /dev/null +++ b/app/admin/service/sys_api.go @@ -0,0 +1,110 @@ +package service + +import ( + "errors" + "fmt" + + "github.com/go-admin-team/go-admin-core/sdk/runtime" + "github.com/go-admin-team/go-admin-core/sdk/service" + "gorm.io/gorm" + + "go-admin/app/admin/models" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" + cDto "go-admin/common/dto" +) + +type SysApi struct { + service.Service +} + +// GetPage 获取SysApi列表 +func (e *SysApi) GetPage(c *dto.SysApiSearch, p *actions.DataPermission, list *[]models.SysApi, count *int64) error { + var err error + var data models.SysApi + + err = e.Orm.Debug().Model(&data). + Scopes( + cDto.MakeCondition(c.GetNeedSearch()), + cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), + actions.Permission(data.TableName(), p), + ). + Find(list).Limit(-1).Offset(-1). + Count(count).Error + if err != nil { + e.Log.Errorf("Service GetSysApiPage error:%s", err) + return err + } + return nil +} + +// Get 获取SysApi对象with id +func (e *SysApi) Get(d *dto.SysApiById, p *actions.DataPermission, model *models.SysApi) *SysApi { + var data models.SysApi + err := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ). + First(model, d.GetId()).Error + if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { + err = errors.New("查看对象不存在或无权查看") + e.Log.Errorf("Service GetSysApi error:%s", err) + _ = e.AddError(err) + return e + } + if err != nil { + e.Log.Errorf("db error:%s", err) + _ = e.AddError(err) + return e + } + return e +} + +// Update 修改SysApi对象 +func (e *SysApi) Update(c *dto.SysApiControl, p *actions.DataPermission) error { + var model = models.SysApi{} + db := e.Orm.Debug().First(&model, c.GetId()) + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + c.Generate(&model) + db = e.Orm.Save(&model) + if err := db.Error; err != nil { + e.Log.Errorf("Service UpdateSysApi error:%s", err) + return err + } + + return nil +} + +// Remove 删除SysApi +func (e *SysApi) Remove(d *dto.SysApiById, p *actions.DataPermission) error { + var data models.SysApi + + db := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ).Delete(&data, d.GetId()) + if err := db.Error; err != nil { + e.Log.Errorf("Service RemoveSysApi error:%s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权删除该数据") + } + return nil +} + +// CheckStorageSysApi 创建SysApi对象 +func (e *SysApi) CheckStorageSysApi(c *[]runtime.Router) error { + for _, v := range *c { + err := e.Orm.Debug().Where(models.SysApi{Path: v.RelativePath, Action: v.HttpMethod}). + Attrs(models.SysApi{Handle: v.Handler}). + FirstOrCreate(&models.SysApi{}).Error + if err != nil { + err := fmt.Errorf("Service CheckStorageSysApi error: %s \r\n ", err.Error()) + return err + } + } + return nil +} diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index a79ead1..7d9c5e9 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -2,11 +2,12 @@ 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" - common "go-admin/common/models" - "go-admin/common/service" + + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" ) @@ -14,12 +15,9 @@ type SysConfig struct { service.Service } -// GetSysConfigPage 获取SysConfig列表 -func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error { - var err error - var data system.SysConfig - - err = e.Orm.Model(&data). +// GetPage 获取SysConfig列表 +func (e *SysConfig) GetPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error { + err := e.Orm. Scopes( cDto.MakeCondition(c.GetNeedSearch()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), @@ -33,28 +31,9 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC return nil } -func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error { - var err error - var data system.SysConfig - - err = e.Orm.Model(&data). - Scopes( - cDto.MakeCondition(c.GetNeedSearch()), - ). - Find(list).Error - if err != nil { - e.Log.Errorf("Service GetSysConfigByKey error:%s", err) - return err - } - return nil -} - -// GetSysConfig 获取SysConfig对象 -func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { - var data system.SysConfig - - err := e.Orm.Model(&data). - First(model, d.GetId()).Error +// Get 获取SysConfig对象 +func (e *SysConfig) Get(d *dto.SysConfigById, model *models.SysConfig) error { + err := e.Orm.First(model, d.GetId()).Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") e.Log.Errorf("Service GetSysConfigPage error:%s", err) @@ -67,13 +46,12 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) return nil } -// InsertSysConfig 创建SysConfig对象 -func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { +// Insert 创建SysConfig对象 +func (e *SysConfig) Insert(c *dto.SysConfigControl) error { var err error - var data system.SysConfig - - err = e.Orm.Model(&data). - Create(model).Error + var data models.SysConfig + c.Generate(&data) + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("Service InsertSysConfig error:%s", err) return err @@ -81,13 +59,13 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { return nil } -// UpdateSysConfig 修改SysConfig对象 -func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { +// Update 修改SysConfig对象 +func (e *SysConfig) Update(c *dto.SysConfigControl) error { var err error - - db := e.Orm.Model(&system.SysConfig{Model: common.Model{ - Id: c.GetId().(int), - }}).Updates(c) + var model = models.SysConfig{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + db := e.Orm.Save(&model) err = db.Error if err != nil { e.Log.Errorf("Service UpdateSysConfig error:%s", err) @@ -100,12 +78,70 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { return nil } -// RemoveSysConfig 删除SysConfig -func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error { +// SetSysConfig 修改SysConfig对象 +func (e *SysConfig) SetSysConfig(c *[]dto.GetSetSysConfigReq) error { var err error - var data system.SysConfig + for _, req := range *c { + var model = models.SysConfig{} + e.Orm.Where("config_key = ?", req.ConfigKey).First(&model) + if model.Id != 0 { + req.Generate(&model) + db := e.Orm.Save(&model) + err = db.Error + if err != nil { + e.Log.Errorf("Service SetSysConfig error:%s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + } + } + return nil +} - db := e.Orm.Model(&data).Delete(c, d.Ids) +func (e *SysConfig) GetForSet(c *[]dto.GetSetSysConfigReq) error { + var err error + var data models.SysConfig + + err = e.Orm.Model(&data). + Find(c).Error + if err != nil { + e.Log.Errorf("Service GetSysConfigPage error:%s", err) + return err + } + return nil +} + +func (e *SysConfig) UpdateForSet(c *[]dto.GetSetSysConfigReq) error { + m := *c + for _, req := range m { + var data models.SysConfig + if err := e.Orm.Where("config_key = ?", req.ConfigKey). + First(&data).Error; err != nil { + e.Log.Errorf("Service GetSysConfigPage error:%s", err) + return err + } + if data.ConfigValue != req.ConfigValue { + data.ConfigValue = req.ConfigValue + + if err := e.Orm.Save(&data).Error; err != nil { + e.Log.Errorf("Service GetSysConfigPage error:%s", err) + return err + } + } + + } + + return nil +} + +// Remove 删除SysConfig +func (e *SysConfig) Remove(d *dto.SysConfigById) error { + var err error + var data models.SysConfig + + db := e.Orm.Delete(&data, d.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Service RemoveSysConfig error:%s", err) @@ -118,16 +154,29 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e return nil } -// GetSysConfigByKEY 根据Key获取SysConfig -func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { +// GetWithKey 根据Key获取SysConfig +func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigByKEYForServiceResp) error { var err error - var data system.SysConfig - data.ConfigKey = c.ConfigKey - err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error + var data models.SysConfig + err = e.Orm.Table(data.TableName()).Where("config_key = ?", c.ConfigKey).First(resp).Error if err != nil { - e.Log.Errorf("Service GetSysConfigByKEY error:%s", err) + e.Log.Errorf("At Service GetSysConfigByKEY Error:%s", err) return err } return nil } + +func (e *SysConfig) GetWithKeyList(c *dto.SysConfigSearch, list *[]models.SysConfig) error { + var err error + err = e.Orm. + Scopes( + cDto.MakeCondition(c.GetNeedSearch()), + ). + Find(list).Error + if err != nil { + e.Log.Errorf("Service GetSysConfigByKey error:%s", err) + return err + } + return nil +} diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index 3971957..05238b3 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -2,24 +2,27 @@ 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/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/service" + + "github.com/go-admin-team/go-admin-core/sdk/service" ) type SysDept struct { service.Service } -// GetSysDeptPage 获取SysDept列表 -func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) error { +// GetPage 获取SysDept列表 +func (e *SysDept) GetPage(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -33,10 +36,10 @@ func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) e return nil } -// GetSysDept 获取SysDept对象 -func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { +// Get 获取SysDept对象 +func (e *SysDept) Get(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()) @@ -53,56 +56,64 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { return nil } -// InsertSysDept 创建SysDept对象 -func (e *SysDept) InsertSysDept(model *system.SysDept) error { +// Insert 创建SysDept对象 +func (e *SysDept) Insert(c *dto.SysDeptControl) error { var err error - var data system.SysDept - - err = e.Orm.Model(&data). - Create(model).Error + var data models.SysDept + c.Generate(&data) + err = e.Orm.Create(data).Error if err != nil { e.Log.Errorf("db error:%s", err) return err } - deptPath := "/" + pkg.IntToString(model.DeptId) - if model.ParentId != 0 { - var deptP system.SysDept - e.Orm.Model(&data).First(&deptP, model.ParentId) + deptPath := pkg.IntToString(data.DeptId) + "/" + if data.ParentId != 0 { + var deptP models.SysDept + e.Orm.First(&deptP, data.ParentId) deptPath = deptP.DeptPath + deptPath } else { - deptPath = "/0" + deptPath + deptPath = "/0/" + deptPath } var mp = map[string]string{} mp["dept_path"] = deptPath - if err := e.Orm.Model(&model).Update("dept_path", deptPath).Error; err != nil { + if err := e.Orm.Update("dept_path", deptPath).Error; err != nil { e.Log.Errorf("db error:%s", err) return err } return nil } -// UpdateSysDept 修改SysDept对象 -func (e *SysDept) UpdateSysDept(c *system.SysDept) error { +// Update 修改SysDept对象 +func (e *SysDept) Update(c *dto.SysDeptControl) error { var err error - db := e.Orm.Model(&system.SysDept{ - DeptId: c.GetId().(int), - }). - Where(c.GetId()).Updates(c) + var model = models.SysDept{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + + deptPath := pkg.IntToString(model.DeptId) + "/" + if model.ParentId != 0 { + var deptP models.SysDept + e.Orm.First(&deptP, model.ParentId) + deptPath = deptP.DeptPath + deptPath + } else { + deptPath = "/0/" + deptPath + } + model.DeptPath = deptPath + db := e.Orm.Save(&model) if db.Error != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("UpdateSysDept error:%s", err) return err } if db.RowsAffected == 0 { return errors.New("无权更新该数据") } - return nil } -// RemoveSysDept 删除SysDept -func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { +// Remove 删除SysDept +func (e *SysDept) Remove(d *dto.SysDeptById) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { @@ -118,9 +129,9 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { } // GetSysDeptList 获取组织数据 -func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) error { +func (e *SysDept) getList(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -136,8 +147,8 @@ 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 - err = e.getSysDeptList(c, &list) + var list []models.SysDept + err = e.getList(c, &list) m = make([]dto.DeptLabel, 0) for i := 0; i < len(list); i++ { @@ -155,15 +166,15 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err erro } // Call 递归构造组织数据 -func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { - list := *deptlist +func deptTreeCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { + list := *deptList min := make([]dto.DeptLabel, 0) for j := 0; j < len(list); j++ { if dept.Id != list[j].ParentId { continue } mi := dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}} - ms := deptTreeCall(deptlist, mi) + ms := deptTreeCall(deptList, mi) min = append(min, ms) } dept.Children = min @@ -171,32 +182,27 @@ 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 - err = e.getSysDeptList(c, &list) - - //m := make([]models.SysDept, 0) +func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) { + var list []models.SysDept + err = e.getList(c, &list) for i := 0; i < len(list); i++ { if list[i].ParentId != 0 { continue } info := e.deptPageCall(&list, list[i]) - m = append(m, info) } 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 @@ -207,17 +213,16 @@ 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) - } menu.Children = min return menu } // GetRoleDeptId 获取角色的部门ID集合 -func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) { +func (e *SysDept) GetWithRoleId(roleId int) ([]int, error) { deptIds := make([]int, 0) deptList := make([]dto.DeptIdList, 0) if err := e.Orm.Table("sys_role_dept"). @@ -228,22 +233,19 @@ func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) { Find(&deptList).Error; err != nil { return nil, err } - for i := 0; i < len(deptList); i++ { deptIds = append(deptIds, deptList[i].DeptId) } - return deptIds, nil } 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()) return } - m = make([]dto.DeptLabel, 0) var item dto.DeptLabel for i := range list { @@ -253,28 +255,24 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { item = dto.DeptLabel{} item.Id = list[i].DeptId item.Label = list[i].DeptName - deptInfo := digitDeptLabel(&list, item) - + deptInfo := deptLabelCall(&list, item) m = append(m, deptInfo) } return } -// digitDeptLabel -func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { +// deptLabelCall +func deptLabelCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptList - var mi dto.DeptLabel min := make([]dto.DeptLabel, 0) for j := 0; j < len(list); j++ { - if dept.Id != list[j].ParentId { continue } mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}} - ms := digitDeptLabel(deptList, mi) + ms := deptLabelCall(deptList, mi) min = append(min, ms) - } dept.Children = min return dept diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 0effb4c..31c22df 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -3,12 +3,12 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "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" ) type SysDictData struct { @@ -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,12 +55,11 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) err } // Insert 创建对象 -func (e *SysDictData) Insert(model *system.SysDictData) error { +func (e *SysDictData) Insert(c *dto.SysDictDataControl) error { var err error - var data system.SysDictData - - err = e.Orm.Model(&data). - Create(model).Error + var data = new(models.SysDictData) + c.Generate(data) + err = e.Orm.Create(data).Error if err != nil { e.Log.Errorf("db error: %s", err) return err @@ -69,12 +68,13 @@ func (e *SysDictData) Insert(model *system.SysDictData) error { } // Update 修改对象 -func (e *SysDictData) Update(c *system.SysDictData) error { +func (e *SysDictData) Update(c *dto.SysDictDataControl) error { var err error - db := e.Orm.Model(&system.SysDictData{ - DictCode: c.GetId().(int), - }).Updates(c) - if db.Error != nil { + var model = models.SysDictData{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + db := e.Orm.Save(model) + if err = db.Error; err != nil { e.Log.Errorf("db error: %s", err) return err } @@ -86,11 +86,11 @@ func (e *SysDictData) Update(c *system.SysDictData) error { } // Remove 删除 -func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) error { +func (e *SysDictData) Remove(c *dto.SysDictDataById) error { var err error - var data system.SysDictData + var data models.SysDictData - db := e.Orm.Model(&data).Delete(c, d.GetId()) + db := e.Orm.Delete(&data, c.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) @@ -104,9 +104,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( diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index 4ba2742..6afbea6 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -3,12 +3,12 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "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" ) type SysDictType struct { @@ -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,12 +35,10 @@ 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 - db := e.Orm.Model(&data). - First(model, d.GetId()) + db := e.Orm.First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") @@ -55,12 +53,11 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) err } // Insert 创建对象 -func (e *SysDictType) Insert(model *system.SysDictType) error { +func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error { var err error - var data system.SysDictType - - err = e.Orm.Model(&data). - Create(model).Error + var data models.SysDictType + c.Generate(&data) + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("db error: %s", err) return err @@ -69,11 +66,12 @@ func (e *SysDictType) Insert(model *system.SysDictType) error { } // Update 修改对象 -func (e *SysDictType) Update(c *system.SysDictType) error { +func (e *SysDictType) Update(c *dto.SysDictTypeControl) error { var err error - db := e.Orm.Model(&system.SysDictType{ - ID: c.GetId().(int), - }).Updates(c) + var model = models.SysDictType{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + db := e.Orm.Save(&model) if db.Error != nil { e.Log.Errorf("db error: %s", err) return err @@ -86,11 +84,11 @@ 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) error { var err error - var data system.SysDictType + var data models.SysDictType - db := e.Orm.Model(&data).Delete(c, d.GetId()) + db := e.Orm.Delete(&data, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) @@ -104,9 +102,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( diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index d231c02..1cdf9b6 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -3,13 +3,12 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - common "go-admin/common/models" - "go-admin/common/service" ) type SysLoginLog struct { @@ -17,9 +16,9 @@ type SysLoginLog struct { } // GetSysLoginLogPage 获取SysLoginLog列表 -func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error { +func (e *SysLoginLog) GetPage(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,12 +35,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) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) error { var err error - var data system.SysLoginLog - - db := e.Orm.Model(&data). - First(model, d.GetId()) + db := e.Orm.First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") @@ -55,44 +51,12 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo return nil } -// InsertSysLoginLog 创建SysLoginLog对象 -func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { - var err error - var data system.SysLoginLog - - err = e.Orm.Model(&data). - Create(model).Error - if err != nil { - e.Log.Errorf("db error:%s", err) - return err - } - return nil -} - -// UpdateSysLoginLog 修改SysLoginLog对象 -func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { - var err error - var data system.SysLoginLog - - db := e.Orm.Model(&data). - Where("id = ?", c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf("db error:%s", err) - return err - } - if db.RowsAffected == 0 { - return errors.New("无权更新该数据") - - } - return nil -} - // RemoveSysLoginLog 删除SysLoginLog -func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error { +func (e *SysLoginLog) Remove(c *dto.SysLoginLogById) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog - db := e.Orm.Model(&data).Delete(c, d.Ids) + db := e.Orm.Delete(&data, c.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 13ffe0a..5fb48ed 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -2,91 +2,104 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/pkg" - "go-admin/app/admin/models/system" + "gorm.io/gorm" + + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/service" - "gorm.io/gorm" + cModels "go-admin/common/models" + + "github.com/go-admin-team/go-admin-core/sdk/service" ) type SysMenu struct { service.Service } -// GetSysMenuPage 获取SysMenu列表 -func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error) { - var m = make([]system.SysMenu, 0) - var err error - var menu = make([]system.SysMenu, 0) - err = e.getSysMenuPage(c, &menu) +// GetPage 获取SysMenu列表 +func (e *SysMenu) GetPage(c *dto.SysMenuSearch, menus *[]models.SysMenu) *SysMenu { + var menu = make([]models.SysMenu, 0) + err := e.getPage(c, &menu).Error + if err != nil { + _ = e.AddError(err) + return e + } for i := 0; i < len(menu); i++ { if menu[i].ParentId != 0 { continue } menusInfo := menuCall(&menu, menu[i]) - - m = append(m, menusInfo) + *menus = append(*menus, menusInfo) } - return &m, err + return e } -// getSysMenuPage 菜单列表 -func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +// getPage 菜单分页列表 +func (e *SysMenu) getPage(c *dto.SysMenuSearch, list *[]models.SysMenu) *SysMenu { var err error - var data system.SysMenu + var data models.SysMenu err = e.Orm.Model(&data). Scopes( cDto.OrderDest("sort", false), cDto.MakeCondition(c.GetNeedSearch()), - ). + ).Preload("SysApi"). Find(list).Error if err != nil { - e.Log.Errorf("db error:%s", err) - return err + e.Log.Errorf("getSysMenuPage error:%s", err) + _ = e.AddError(err) + return e } - return nil + return e } -// GetSysMenu 获取SysMenu对象 -func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { +// Get 获取SysMenu对象 +func (e *SysMenu) Get(d *dto.SysMenuById, model *models.SysMenu) *SysMenu { 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) { err = errors.New("查看对象不存在或无权查看") - e.Log.Errorf("db error:%s", err) - return err + e.Log.Errorf("GetSysMenu error:%s", err) + _ = e.AddError(err) + return e } - if db.Error != nil { - e.Log.Errorf("db error:%s", err) - return err - } - return nil -} - -// InsertSysMenu 创建SysMenu对象 -func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error { - var err error - var data system.SysMenu - - err = e.Orm.Model(&data). - Create(model).Error if err != nil { e.Log.Errorf("db error:%s", err) - return err + _ = e.AddError(err) + return e } - return nil + apis := make([]int, 0) + for _, v := range model.SysApi { + apis = append(apis, v.Id) + } + model.Apis = apis + return e } -func (e *SysMenu) initPaths(menu *system.SysMenu) error { +// Insert 创建SysMenu对象 +func (e *SysMenu) Insert(c *dto.SysMenuControl) *SysMenu { var err error - var data system.SysMenu - parentMenu := new(system.SysMenu) + var data models.SysMenu + c.Generate(&data) + err = e.Orm.Create(&data).Error + if err != nil { + e.Log.Errorf("db error:%s", err) + _ = e.AddError(err) + } + c.MenuId = data.MenuId + return e +} + +func (e *SysMenu) initPaths(menu *models.SysMenu) error { + var err error + var data models.SysMenu + parentMenu := new(models.SysMenu) if menu.ParentId != 0 { e.Orm.Model(&data).First(parentMenu, menu.ParentId) if parentMenu.Paths == "" { @@ -101,46 +114,64 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error { return err } -// UpdateSysMenu 修改SysMenu对象 -func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { +// Update 修改SysMenu对象 +func (e *SysMenu) Update(c *dto.SysMenuControl) *SysMenu { var err error - var data system.SysMenu - - db := e.Orm.Model(&data). - Where("menu_id = ?", c.GetId()).Updates(c) + tx := e.Orm.Debug().Begin() + defer func() { + if err != nil { + tx.Rollback() + } else { + tx.Commit() + } + }() + var alist = make([]models.SysApi, 0) + var model = models.SysMenu{} + tx.Preload("SysApi").First(&model, c.GetId()) + tx.Where("id in ?", c.Apis).Find(&alist) + err = tx.Model(&model).Association("SysApi").Delete(model.SysApi) + if err != nil { + e.Log.Errorf("delete policy error:%s", err) + _ = e.AddError(err) + return e + } + c.Generate(&model) + model.SysApi = alist + db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model) if db.Error != nil { e.Log.Errorf("db error:%s", err) - return err + _ = e.AddError(err) + return e } if db.RowsAffected == 0 { - return errors.New("无权更新该数据") - + _ = e.AddError(errors.New("无权更新该数据")) + return e } - return nil + return e } -// RemoveSysMenu 删除SysMenu -func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { +// Remove 删除SysMenu +func (e *SysMenu) Remove(d *dto.SysMenuById) *SysMenu { var err error - var data system.SysMenu + var data models.SysMenu - db := e.Orm.Model(&data).Delete(&data, d.GetId()) + db := e.Orm.Model(&data).Delete(&data, d.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) - return err + _ = e.AddError(err) } if db.RowsAffected == 0 { err = errors.New("无权删除该数据") - return err + _ = e.AddError(err) } - return nil + return e } -// GetSysMenuList 获取菜单数据 -func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +// GetList 获取菜单数据 +func (e *SysMenu) GetList(c *dto.SysMenuSearch, list *[]models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu err = e.Orm.Model(&data). Scopes( @@ -154,10 +185,10 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e return nil } -// SetSysMenuTree 设置菜单数据 -func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { - var list []system.SysMenu - err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list) +// SetLabel 修改角色中 设置菜单基础数据 +func (e *SysMenu) SetLabel() (m []dto.MenuLabel, err error) { + var list []models.SysMenu + err = e.GetList(&dto.SysMenuSearch{}, &list) m = make([]dto.MenuLabel, 0) for i := 0; i < len(list); i++ { @@ -174,31 +205,42 @@ func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { return } -// 左侧菜单 -func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, err error) { - var table *gorm.DB - var data system.SysMenu - - if roleName == "admin" { - table = e.Orm.Model(&data).Select("sys_menu.*") - table = table.Where(" menu_type in ('M','C')") - } else { - table = e.Orm.Model(&data).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) +// GetSysMenuByRoleName 左侧菜单 +func (e *SysMenu) GetSysMenuByRoleName(roleName ...string) ([]models.SysMenu, error) { + var MenuList []models.SysMenu + var role models.SysRole + var err error + admin := false + for _, s := range roleName { + if s == "admin" { + admin = true + } } - err = table.Order("sort").Find(&Menus).Error + if len(roleName) > 0 && admin { + var data []models.SysMenu + err = e.Orm.Where(" menu_type in ('M','C')"). + Order("sort"). + Find(&data). + Error + MenuList = data + } else { + err = e.Orm.Model(&role).Preload("SysMenu", func(db *gorm.DB) *gorm.DB { + return db.Where(" menu_type in ('M','C')").Order("sort") + }).Where("role_name in ?", roleName).Find(&role). + Error + MenuList = *role.SysMenu + } if err != nil { e.Log.Errorf("db error:%s", err) - return } - return + return MenuList, err } // menuLabelCall 递归构造组织数据 -func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { - list := *elist +func menuLabelCall(eList *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel { + list := *eList min := make([]dto.MenuLabel, 0) for j := 0; j < len(list); j++ { @@ -211,7 +253,7 @@ func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { mi.Label = list[j].Title mi.Children = []dto.MenuLabel{} if list[j].MenuType != "F" { - ms := menuLabelCall(elist, mi) + ms := menuLabelCall(eList, mi) min = append(min, ms) } else { min = append(min, mi) @@ -225,16 +267,17 @@ func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { return dept } -func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { - list := *menulist +// menuCall 构建菜单树 +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 @@ -250,55 +293,55 @@ 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.SysApi = list[j].SysApi + mi.Children = []models.SysMenu{} - if mi.MenuType != "F" { - ms := menuCall(menulist, mi) + if mi.MenuType != cModels.Button { + ms := menuCall(menuList, mi) min = append(min, ms) - } else { min = append(min, mi) } - } menu.Children = min return menu } -func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { - +// SetMenuRole 获取左侧菜单树使用 +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 } menusInfo := menuCall(&menus, menus[i]) - m = append(m, menusInfo) } return } -func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err error) { - var data system.SysMenu +func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) { + var MenuList []models.SysMenu + var role models.SysRole + var err error - var table *gorm.DB if roleName == "admin" { - table = e.Orm.Model(&data).Select("sys_menu.*") - table = table.Where(" menu_type in ('M','C')") + var data []models.SysMenu + err = e.Orm.Where(" menu_type in ('M','C')").Order("sort").Find(&data).Error + MenuList = data } else { - table = e.Orm.Model(&data).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) + role.RoleKey = roleName + err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB { + return db.Where(" menu_type in ('M','C')").Order("sort") + }).Find(&role).Error + if role.SysMenu != nil { + MenuList = *role.SysMenu + } } - err = table.Scopes( - cDto.OrderDest("sort", false), - ).Find(&Menus).Error if err != nil { e.Log.Errorf("db error:%s", err) - return } - return + return MenuList, err } diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index 8ab3292..c38fec7 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -2,11 +2,12 @@ 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" - common "go-admin/common/models" - "go-admin/common/service" + + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" ) @@ -14,10 +15,10 @@ type SysOperaLog struct { service.Service } -// GetSysOperaLogPage 获取SysOperaLog列表 -func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]system.SysOperaLog, count *int64) error { +// GetPage 获取SysOperaLog列表 +func (e *SysOperaLog) GetPage(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,9 +34,9 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste return nil } -// GetSysOperaLog 获取SysOperaLog对象 -func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error { - var data system.SysOperaLog +// Get 获取SysOperaLog对象 +func (e *SysOperaLog) Get(d *dto.SysOperaLogById, model *models.SysOperaLog) error { + var data models.SysOperaLog err := e.Orm.Model(&data). First(model, d.GetId()).Error @@ -51,10 +52,10 @@ func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOp return nil } -// InsertSysOperaLog 创建SysOperaLog对象 -func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { +// Insert 创建SysOperaLog对象 +func (e *SysOperaLog) Insert(model *models.SysOperaLog) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog err = e.Orm.Model(&data). Create(model).Error @@ -65,28 +66,10 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { return nil } -// UpdateSysOperaLog 修改SysOperaLog对象 -func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { +// Remove 删除SysOperaLog +func (e *SysOperaLog) Remove(d *dto.SysOperaLogById) error { var err error - - db := e.Orm.Model(&system.SysOperaLog{Model: common.Model{ - Id: c.GetId().(int), - }}).Updates(c) - if err = db.Error; err != nil { - e.Log.Errorf("Service UpdateSysOperaLog error:%s", err.Error()) - return err - } - if db.RowsAffected == 0 { - return errors.New("无权更新该数据") - - } - return nil -} - -// 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).Delete(&data, d.Ids) if err = db.Error; err != nil { diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index e879db4..b6ed287 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -3,12 +3,12 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "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" ) type SysPost struct { @@ -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 *dto.SysPostControl) error { var err error - var data system.SysPost + var data models.SysPost err = e.Orm.Model(&data). Create(model).Error @@ -69,12 +69,13 @@ func (e *SysPost) InsertSysPost(model *system.SysPost) error { } // UpdateSysPost 修改SysPost对象 -func (e *SysPost) UpdateSysPost(c *system.SysPost) error { +func (e *SysPost) UpdateSysPost(c *dto.SysPostControl) error { var err error - var data system.SysPost + var model = models.SysPost{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) - db := e.Orm.Model(&data). - Where("post_id = ?", c.GetId()).Updates(c) + db := e.Orm.Save(&model) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -89,7 +90,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 { diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index ce9c87c..7d38065 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -3,25 +3,26 @@ package service import ( "errors" + "github.com/casbin/casbin/v2" + + "github.com/go-admin-team/go-admin-core/sdk/service" "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" ) type SysRole struct { service.Service } -// GetSysRolePage 获取SysRole列表 -func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, count *int64) error { +// GetPage 获取SysRole列表 +func (e *SysRole) GetPage(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). + err = e.Orm.Model(&data).Preload("SysMenu"). Scopes( cDto.MakeCondition(c.GetNeedSearch()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), @@ -35,10 +36,9 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c return nil } -// GetSysRole 获取SysRole对象 -func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { +// Get 获取SysRole对象 +func (e *SysRole) Get(d *dto.SysRoleById, model *models.SysRole) error { var err error - db := e.Orm.First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { @@ -50,7 +50,7 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { e.Log.Errorf("db error:%s", err) return err } - model.MenuIds, err = e.GetRoleMenuId(e.Orm, model.RoleId) + model.MenuIds, err = e.GetRoleMenuId(model.RoleId) if err != nil { e.Log.Errorf("get menuIds error, %s", err.Error()) return err @@ -58,11 +58,18 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { return nil } -// InsertSysRole 创建SysRole对象 -func (e *SysRole) InsertSysRole(c *system.SysRole) error { +// Insert 创建SysRole对象 +func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error { var err error - var data system.SysRole - + var data models.SysRole + var dataMenu []models.SysMenu + err = e.Orm.Preload("SysApi").Where("menu_id in ?", c.MenuIds).Find(&dataMenu).Error + if err != nil { + e.Log.Errorf("db error:%s", err) + return err + } + c.SysMenu = dataMenu + c.Generate(&data) tx := e.Orm.Begin() defer func() { if err != nil { @@ -72,29 +79,34 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error { } }() - err = tx.Model(&data). - Create(c).Error + err = tx.Create(&data).Error if err != nil { e.Log.Errorf("db error:%s", err) return err } - if len(c.MenuIds) > 0 { - s := SysRoleMenu{} - s.Orm = e.Orm - s.Log = e.Log - err = s.ReloadRule(tx, c.RoleId, c.MenuIds) - if err != nil { - e.Log.Errorf("reload casbin rule error, %", err.Error()) - return err + + for _, menu := range dataMenu { + for _, api := range menu.SysApi { + _, err = cb.AddNamedPolicy("p", data.RoleKey, api.Path, api.Action) } } + _ = cb.SavePolicy() + //if len(c.MenuIds) > 0 { + // s := SysRoleMenu{} + // s.Orm = e.Orm + // s.Log = e.Log + // err = s.ReloadRule(tx, c.RoleId, c.MenuIds) + // if err != nil { + // e.Log.Errorf("reload casbin rule error, %", err.Error()) + // return err + // } + //} return nil } -// UpdateSysRole 修改SysRole对象 -func (e *SysRole) UpdateSysRole(c *system.SysRole) error { +// Update 修改SysRole对象 +func (e *SysRole) Update(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error { var err error - tx := e.Orm.Debug().Begin() defer func() { if err != nil { @@ -103,8 +115,19 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { tx.Commit() } }() - db := tx.Model(&c). - Where(" role_id = ?", c.GetId()).Updates(c) + var model = models.SysRole{} + var mlist = make([]models.SysMenu, 0) + tx.Preload("SysMenu").First(&model, c.GetId()) + tx.Preload("SysApi").Where("menu_id in ?", c.MenuIds).Find(&mlist) + err = tx.Model(&model).Association("SysMenu").Delete(model.SysMenu) + if err != nil { + e.Log.Errorf("delete policy error:%s", err) + return err + } + c.Generate(&model) + model.SysMenu = &mlist + db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model) + if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -113,29 +136,25 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { return errors.New("无权更新该数据") } - var t system.RoleMenu - err = t.DeleteRoleMenu(tx, c.RoleId) + _, err = cb.RemoveFilteredPolicy(0, model.RoleKey) if err != nil { - e.Log.Errorf("delete role menu error, %", err.Error()) + e.Log.Errorf("delete policy error:%s", err) return err } - if len(c.MenuIds) > 0 { - s := SysRoleMenu{} - s.Orm = e.Orm - s.Log = e.Log - err = s.ReloadRule(tx, c.RoleId, c.MenuIds) - if err != nil { - e.Log.Errorf("reload casbin rule error, %", err.Error()) - return err + + for _, menu := range mlist { + for _, api := range menu.SysApi { + _, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action) } } + _ = cb.SavePolicy() return nil } -// RemoveSysRole 删除SysRole -func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { +// Remove 删除SysRole +func (e *SysRole) Remove(d *dto.SysRoleById) error { var err error - var data system.SysRole + var data models.SysRole tx := e.Orm.Begin() defer func() { @@ -170,25 +189,21 @@ func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { } // 获取角色对应的菜单ids -func (e *SysRole) GetRoleMenuId(tx *gorm.DB, roleId int) ([]int, error) { +func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) { menuIds := make([]int, 0) - menuList := make([]models.MenuIdList, 0) - if err := tx.Table("sys_role_menu"). - Select("sys_role_menu.menu_id"). - Where("role_id = ? ", roleId). - Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu "+ - "LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? and parent_id is not null)", roleId). - Find(&menuList).Error; err != nil { + model := models.SysRole{} + model.RoleId = roleId + if err := e.Orm.Model(&model).Preload("SysMenu").First(&model).Error; err != nil { return nil, err } - - for i := 0; i < len(menuList); i++ { - menuIds = append(menuIds, menuList[i].MenuId) + l := *model.SysMenu + for i := 0; i < len(l); i++ { + menuIds = append(menuIds, l[i].MenuId) } 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 +212,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], } @@ -222,3 +237,31 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { } return err } + +// UpdateStatus 修改SysRole对象status +func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error { + var err error + + tx := e.Orm.Debug().Begin() + defer func() { + if err != nil { + tx.Rollback() + } else { + tx.Commit() + } + }() + var model = models.SysRole{} + tx.First(&model, c.GetId()) + c.Generate(&model) + db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model) + + if db.Error != nil { + e.Log.Errorf("db error:%s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + + return nil +} diff --git a/app/admin/service/sys_role_menu.go b/app/admin/service/sys_role_menu.go index 0f271c9..23fb78b 100644 --- a/app/admin/service/sys_role_menu.go +++ b/app/admin/service/sys_role_menu.go @@ -2,89 +2,90 @@ 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" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" + + "go-admin/app/admin/models" ) +// SysRoleMenu 即将弃用结构体 type SysRoleMenu struct { service.Service } -func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err error) { - var role system.SysRole - - msgID := e.MsgID - - menu := make([]models.Menu, 0) - roleMenu := make([]system.RoleMenu, len(menuId)) - casbinRule := make([]system.CasbinRule, 0) - //先删除所有的 - err = e.DeleteRoleMenu(tx, roleId) - if err != nil { - return - } - - // 在事务中做一些数据库操作(从这一点使用'tx',而不是'db') - err = tx.Where("role_id = ?", roleId).First(&role).Error - if err != nil { - log.Errorf("msgID[%s] get role error, %s", msgID, err.Error()) - return - } - err = tx.Where("menu_id in (?)", menuId). - //Select("path, action, menu_id, menu_type"). - Find(&menu).Error - if err != nil { - log.Errorf("msgID[%s] get menu error, %s", msgID, err.Error()) - return - } - for i := range menu { - roleMenu[i] = system.RoleMenu{ - RoleId: role.RoleId, - MenuId: menu[i].MenuId, - RoleName: role.RoleKey, - } - if menu[i].MenuType == "A" { - casbinRule = append(casbinRule, system.CasbinRule{ - PType: "p", - V0: role.RoleKey, - V1: menu[i].Path, - V2: menu[i].Action, - }) - } - } - err = tx.Create(&roleMenu).Error - if err != nil { - log.Errorf("msgID[%s] batch create role's menu error, %s", msgID, err.Error()) - return - } - if len(casbinRule) > 0 { - err = tx.Create(&casbinRule).Error - if err != nil { - log.Errorf("msgID[%s] batch create casbin rule error, %s", msgID, err.Error()) - return - } - } - - return -} +//func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err error) { +// var role models.SysRole +// +// msgID := e.MsgID +// +// menu := make([]models.Menu, 0) +// roleMenu := make([]models.RoleMenu, len(menuId)) +// casbinRule := make([]models.CasbinRule, 0) +// //先删除所有的 +// err = e.DeleteRoleMenu(tx, roleId) +// if err != nil { +// return +// } +// +// // 在事务中做一些数据库操作(从这一点使用'tx',而不是'db') +// err = tx.Where("role_id = ?", roleId).First(&role).Error +// if err != nil { +// log.Errorf("msgID[%s] get role error, %s", msgID, err.Error()) +// return +// } +// err = tx.Where("menu_id in (?)", menuId). +// //Select("path, action, menu_id, menu_type"). +// Find(&menu).Error +// if err != nil { +// log.Errorf("msgID[%s] get menu error, %s", msgID, err.Error()) +// return +// } +// for i := range menu { +// roleMenu[i] = models.RoleMenu{ +// RoleId: role.RoleId, +// MenuId: menu[i].MenuId, +// RoleName: role.RoleKey, +// } +// if menu[i].MenuType == "A" { +// casbinRule = append(casbinRule, models.CasbinRule{ +// PType: "p", +// V0: role.RoleKey, +// V1: menu[i].Path, +// V2: menu[i].Action, +// }) +// } +// } +// err = tx.Create(&roleMenu).Error +// if err != nil { +// log.Errorf("msgID[%s] batch create role's menu error, %s", msgID, err.Error()) +// return +// } +// if len(casbinRule) > 0 { +// err = tx.Create(&casbinRule).Error +// if err != nil { +// log.Errorf("msgID[%s] batch create casbin rule error, %s", msgID, err.Error()) +// return +// } +// } +// +// return +//} 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 +93,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 +101,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") diff --git a/app/admin/service/sys_setting.go b/app/admin/service/sys_setting.go deleted file mode 100644 index 5e61c0a..0000000 --- a/app/admin/service/sys_setting.go +++ /dev/null @@ -1,52 +0,0 @@ -package service - -import ( - "errors" - - "gorm.io/gorm" - - "go-admin/app/admin/models" - "go-admin/common/service" -) - -type SysSetting struct { - service.Service -} - -// GetSysSetting 获取SysSetting对象 -func (e *SysSetting) GetSysSetting(model *models.SysSetting) error { - var err error - var data models.SysSetting - - db := e.Orm.Model(&data). - First(model) - err = db.Error - if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { - err = errors.New("查看对象不存在或无权查看") - e.Log.Errorf("db error:%s", err) - return err - } - if db.Error != nil { - e.Log.Errorf("db error:%s", err) - return err - } - return nil -} - -// UpdateSysSetting 修改SysSetting对象 -func (e *SysSetting) UpdateSysSetting(c *models.SysSetting) error { - var err error - var data models.SysSetting - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf("db error:%s", err) - return err - } - if db.RowsAffected == 0 { - return errors.New("无权更新该数据") - - } - return nil -} diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index d485e08..c70c0a0 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -2,16 +2,16 @@ package service import ( "errors" + "go-admin/app/admin/models" + "go-admin/app/admin/service/dto" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/common/actions" cDto "go-admin/common/dto" - common "go-admin/common/models" - "go-admin/common/service" ) type SysUser struct { @@ -19,17 +19,16 @@ 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 *dto.SysUserSearch, 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). + err = e.Orm.Debug().Preload("Dept"). Scopes( cDto.MakeCondition(c.GetNeedSearch()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), actions.Permission(data.TableName(), p), ). - Preload("Dept"). Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { @@ -40,22 +39,20 @@ 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 err error - var data system.SysUser +func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error { + var data models.SysUser - db := e.Orm.Model(&data). + err := e.Orm.Model(&data).Debug(). Scopes( actions.Permission(data.TableName(), p), ). - First(model, d.GetId()) - err = db.Error + First(model, d.GetId()).Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") e.Log.Errorf("db error: %s", err) return err } - if db.Error != nil { + if err != nil { e.Log.Errorf("db error: %s", err) return err } @@ -63,12 +60,22 @@ func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *s } // InsertSysUser 创建SysUser对象 -func (e *SysUser) InsertSysUser(model common.ActiveRecord) error { +func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error { var err error - var data system.SysUser - - err = e.Orm.Model(&data). - Create(model).Error + var data models.SysUser + var i int64 + err = e.Orm.Model(&data).Where("username = ?", c.Username).Count(&i).Error + if err != nil { + e.Log.Errorf("db error: %s", err) + return err + } + if i > 0 { + err := errors.New("用户名已存在!") + e.Log.Errorf("db error: %s", err) + return err + } + c.Generate(&data) + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("db error: %s", err) return err @@ -77,41 +84,91 @@ func (e *SysUser) InsertSysUser(model common.ActiveRecord) error { } // UpdateSysUser 修改SysUser对象 -func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission) error { +func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission) error { var err error - - db := e.Orm.Model(c). - Scopes( - actions.Permission(c.TableName(), p), - ).Where("user_id = ?", c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf("db error: %s", err) + var model models.SysUser + db := e.Orm.Scopes( + actions.Permission(model.TableName(), p), + ).First(&model, c.GetId()) + if err = db.Error; err != nil { + e.Log.Errorf("Service UpdateSysUser error: %s", err) return err } if db.RowsAffected == 0 { return errors.New("无权更新该数据") } + c.Generate(&model) + err = e.Orm.Save(&model).Error + if err != nil { + e.Log.Errorf("Service UpdateSysUser error: %s", err) + return err + } + return nil +} + +// UpdateSysUserStatus 更新用户状态 +func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error { + var err error + var model models.SysUser + db := e.Orm.Scopes( + actions.Permission(model.TableName(), p), + ).First(&model, c.GetId()) + if err = db.Error; err != nil { + e.Log.Errorf("Service UpdateSysUser error: %s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + + } + c.Generate(&model) + err = e.Orm.Save(&model).Error + if err != nil { + e.Log.Errorf("Service UpdateSysUser error: %s", err) + return err + } + return nil +} + +// ResetSysUserPwd 重置用户密码 +func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error { + var err error + var model models.SysUser + db := e.Orm.Scopes( + actions.Permission(model.TableName(), p), + ).First(&model, c.GetId()) + if err = db.Error; err != nil { + e.Log.Errorf("At Service ResetSysUserPwd error: %s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + c.Generate(&model) + err = e.Orm.Save(&model).Error + if err != nil { + e.Log.Errorf("At Service ResetSysUserPwd error: %s", err) + return err + } return nil } // RemoveSysUser 删除SysUser -func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error { +func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error { var err error - var data system.SysUser + var data models.SysUser db := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), - ).Delete(c, d.GetId()) - if db.Error != nil { - err = db.Error - e.Log.Errorf("Delete error: %s", err) + ).Delete(&data, c.GetId()) + if err = db.Error; err != nil { + e.Log.Errorf("Error found in RemoveSysUser : %s", err) return err } if db.RowsAffected == 0 { - err = errors.New("无权删除该数据") - return err + return errors.New("无权删除该数据") } return nil } @@ -123,12 +180,13 @@ 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( actions.Permission(c.TableName(), p), - ).Where("user_id = ?", id).Select("UserId", "Password", "Salt").First(c).Error + ).Select("UserId", "Password", "Salt"). + First(c, id).Error if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return errors.New("无权更新该数据") @@ -161,8 +219,8 @@ 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 { - err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error +func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error { + err := e.Orm.Preload("Dept").First(user, c.GetId()).Error if err != nil { return err } diff --git a/app/cms/models/sys_category.go b/app/cms/models/sys_category.go new file mode 100644 index 0000000..76f3c9b --- /dev/null +++ b/app/cms/models/sys_category.go @@ -0,0 +1,29 @@ +package models + +import ( + "go-admin/common/models" +) + +type SysCategory struct { + models.Model + Name string `json:"name" gorm:"size:255;comment:名称"` // + Img string `json:"img" gorm:"size:255;comment:图标"` // + Sort int `json:"sort" gorm:"size:4;comment:排序"` // + Status int `json:"status" gorm:"size:1;comment:状态"` // + Remark string `json:"remark" gorm:"size:255;comment:备注"` // + models.ControlBy + models.ModelTime +} + +func (SysCategory) TableName() string { + return "sys_category" +} + +func (e *SysCategory) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysCategory) GetId() interface{} { + return e.Id +} diff --git a/app/admin/models/sys_content.go b/app/cms/models/sys_content.go similarity index 50% rename from app/admin/models/sys_content.go rename to app/cms/models/sys_content.go index 093d2ba..99922cb 100644 --- a/app/admin/models/sys_content.go +++ b/app/cms/models/sys_content.go @@ -6,13 +6,13 @@ import ( type SysContent struct { models.Model - CateId int `json:"cateId" gorm:"type:int(11);comment:分类id"` - Name string `json:"name" gorm:"type:varchar(255);comment:名称"` - Status int `json:"status" gorm:"type:int(1);comment:状态"` - Img string `json:"img" gorm:"type:varchar(255);comment:图片"` + CateId int `json:"cateId" gorm:"size:11;comment:分类id"` + Name string `json:"name" gorm:"size:255;comment:名称"` + Status int `json:"status" gorm:"size:1;comment:状态"` + Img string `json:"img" gorm:"size:255;comment:图片"` Content string `json:"content" gorm:"type:text;comment:内容"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` - Sort int `json:"sort" gorm:"type:int(4);comment:排序"` + Remark string `json:"remark" gorm:"size:255;comment:备注"` + Sort int `json:"sort" gorm:"size:4;comment:排序"` models.ControlBy models.ModelTime } @@ -30,4 +30,4 @@ func (e *SysContent) Generate() models.ActiveRecord { func (e *SysContent) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/app/cms/router/init_router.go b/app/cms/router/init_router.go new file mode 100644 index 0000000..783669a --- /dev/null +++ b/app/cms/router/init_router.go @@ -0,0 +1,36 @@ +package router + +import ( + _ "github.com/go-admin-team/go-admin-core/sdk/pkg" + "os" + + "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/sdk" + common "go-admin/common/middleware" +) + +// InitRouter 路由初始化,不要怀疑,这里用到了 +func InitRouter() { + var r *gin.Engine + h := sdk.Runtime.GetEngine() + if h == nil { + log.Fatal("not found engine...") + os.Exit(-1) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } + // the jwt middleware + authMiddleware, err := common.AuthInit() + if err != nil { + log.Fatalf("JWT Init Error, %s", err.Error()) + } + + // 注册业务路由 + initRouter(r, authMiddleware) +} diff --git a/app/cms/router/router.go b/app/cms/router/router.go new file mode 100644 index 0000000..8c893a2 --- /dev/null +++ b/app/cms/router/router.go @@ -0,0 +1,42 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" +) + +var ( + routerNoCheckRole = make([]func(*gin.RouterGroup), 0) + routerCheckRole = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0) +) + +// initRouter 路由示例 +func initRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine { + + // 无需认证的路由 + noCheckRoleRouter(r) + // 需要认证的路由 + checkRoleRouter(r, authMiddleware) + + return r +} + +// noCheckRoleRouter 无需认证的路由示例 +func noCheckRoleRouter(r *gin.Engine) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerNoCheckRole { + f(v1) + } +} + +// checkRoleRouter 需要认证的路由示例 +func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerCheckRole { + f(v1, authMiddleware) + } +} diff --git a/app/admin/router/sys_category.go b/app/cms/router/sys_category.go similarity index 87% rename from app/admin/router/sys_category.go rename to app/cms/router/sys_category.go index df8322a..7cb4280 100644 --- a/app/admin/router/sys_category.go +++ b/app/cms/router/sys_category.go @@ -2,11 +2,11 @@ package router import ( "github.com/gin-gonic/gin" - middleware2 "go-admin/common/middleware" + "go-admin/app/cms/models" + "go-admin/app/cms/service/dto" + "go-admin/common/middleware" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" "go-admin/common/actions" ) @@ -16,7 +16,7 @@ func init() { // 需认证的路由代码 func registerSysCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { model := &models.SysCategory{} r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} { diff --git a/app/admin/router/sys_content.go b/app/cms/router/sys_content.go similarity index 72% rename from app/admin/router/sys_content.go rename to app/cms/router/sys_content.go index 133d724..aac6da2 100644 --- a/app/admin/router/sys_content.go +++ b/app/cms/router/sys_content.go @@ -3,10 +3,10 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" + "go-admin/app/cms/models" + "go-admin/app/cms/service/dto" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -16,14 +16,8 @@ func init() { // 需认证的路由代码 func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - //r.GET("", sys_content.GetSysContentList) - //r.GET("/:id", sys_content.GetSysContent) - //r.POST("", sys_content.InsertSysContent) - //r.PUT("", sys_content.UpdateSysContent) - //r.DELETE("/:id", sys_content.DeleteSysContent) - model := &models.SysContent{} r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysContentSearch), func() interface{} { list := make([]models.SysContent, 0) diff --git a/app/admin/service/dto/sys_category.go b/app/cms/service/dto/sys_category.go similarity index 65% rename from app/admin/service/dto/sys_category.go rename to app/cms/service/dto/sys_category.go index 88ca258..aad1255 100644 --- a/app/admin/service/dto/sys_category.go +++ b/app/cms/service/dto/sys_category.go @@ -2,20 +2,19 @@ package dto import ( "errors" - vd "github.com/bytedance/go-tagexpr/v2/validator" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" + "go-admin/app/cms/models" - "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) type SysCategorySearch struct { dto.Pagination `search:"-"` - Name string `form:"name" search:"type:exact;column:name;table:sys_category" comment:"名称" vd:"?"` - Status string `form:"status" search:"type:exact;column:status;table:sys_category" comment:"状态" vd:"?"` - CateId int `form:"cateId" search:"type:exact;column:cate_id;table:sys_category" comment:"分类id" vd:"?"` + Name string `form:"name" search:"type:exact;column:name;table:sys_category" comment:"名称"` + Status string `form:"status" search:"type:exact;column:status;table:sys_category" comment:"状态"` + CateId int `form:"cateId" search:"type:exact;column:cate_id;table:sys_category" comment:"分类id"` } func (m *SysCategorySearch) GetNeedSearch() interface{} { @@ -30,10 +29,6 @@ func (m *SysCategorySearch) Bind(ctx *gin.Context) error { log.Debugf("ShouldBind error: %s", err.Error()) } - if err = vd.Validate(m); err != nil { - log.Errorf("Validate error: %s", err.Error()) - return err - } return err } @@ -43,12 +38,12 @@ func (m *SysCategorySearch) Generate() dto.Index { } type SysCategoryControl struct { - ID int `uri:"Id" comment:"标识"` - Name string `json:"name" comment:"名称" vd:"len($)>0 && $!=' '; msg:'invalid name: 不能是空字符串'"` - Img string `json:"img" comment:"图标" vd:"?"` - Sort int `json:"sort" comment:"排序" vd:"?"` - Status int `json:"status" comment:"状态" vd:"$>0; msg:'invalid status: 状态无效'"` - Remark string `json:"remark" comment:"备注" vd:"?"` + Id int `uri:"Id" comment:"标识"` + Name string `json:"name" comment:"名称"` + Img string `json:"img" comment:"图标"` + Sort int `json:"sort" comment:"排序"` + Status int `json:"status" comment:"状态"` + Remark string `json:"remark" comment:"备注"` } func (s *SysCategoryControl) Bind(ctx *gin.Context) error { @@ -63,10 +58,7 @@ func (s *SysCategoryControl) Bind(ctx *gin.Context) error { log.Errorf("ShouldBind error: %s", err.Error()) err = errors.New("数据绑定出错") } - if err1 := vd.Validate(s); err != nil { - log.Errorf("Validate error: %s", err1.Error()) - return err1 - } + return err } @@ -77,7 +69,7 @@ func (s *SysCategoryControl) Generate() dto.Control { func (s *SysCategoryControl) GenerateM() (common.ActiveRecord, error) { return &models.SysCategory{ - Model: common.Model{Id: s.ID}, + Model: common.Model{Id: s.Id}, Name: s.Name, Img: s.Img, Sort: s.Sort, @@ -87,11 +79,11 @@ func (s *SysCategoryControl) GenerateM() (common.ActiveRecord, error) { } func (s *SysCategoryControl) GetId() interface{} { - return s.ID + return s.Id } type SysCategoryById struct { - dto.ObjectById `vd:"?"` + dto.ObjectById } func (s *SysCategoryById) Generate() dto.Control { @@ -101,4 +93,4 @@ func (s *SysCategoryById) Generate() dto.Control { func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) { return &models.SysCategory{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_content.go b/app/cms/service/dto/sys_content.go similarity index 94% rename from app/admin/service/dto/sys_content.go rename to app/cms/service/dto/sys_content.go index f1c366a..c96632f 100644 --- a/app/admin/service/dto/sys_content.go +++ b/app/cms/service/dto/sys_content.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/cms/models" - "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -35,7 +35,7 @@ func (m *SysContentSearch) Generate() dto.Index { } type SysContentControl struct { - ID int `uri:"ID" comment:""` // + Id int `uri:"Id" comment:""` // CateId int `json:"cateId" comment:""` Name string `json:"name" comment:""` Status int `json:"status" comment:""` @@ -66,7 +66,7 @@ func (s *SysContentControl) Generate() dto.Control { func (s *SysContentControl) GenerateM() (common.ActiveRecord, error) { return &models.SysContent{ - Model: common.Model{s.ID}, + Model: common.Model{s.Id}, CateId: s.CateId, Name: s.Name, Status: s.Status, @@ -78,7 +78,7 @@ func (s *SysContentControl) GenerateM() (common.ActiveRecord, error) { } func (s *SysContentControl) GetId() interface{} { - return s.ID + return s.Id } type SysContentById struct { @@ -92,4 +92,4 @@ func (s *SysContentById) Generate() dto.Control { func (s *SysContentById) GenerateM() (common.ActiveRecord, error) { return &models.SysContent{}, nil -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_job/sys_job.go b/app/jobs/apis/sys_job.go similarity index 71% rename from app/admin/apis/sys_job/sys_job.go rename to app/jobs/apis/sys_job.go index 424d468..2c0789b 100644 --- a/app/admin/apis/sys_job/sys_job.go +++ b/app/jobs/apis/sys_job.go @@ -1,42 +1,38 @@ -package sys_job +package apis import ( "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk" - "go-admin/app/admin/service" - "go-admin/common/apis" + "github.com/go-admin-team/go-admin-core/sdk/api" + + "go-admin/app/jobs/service" "go-admin/common/dto" ) type SysJob struct { - apis.Api + api.Api } // RemoveJobForService 调用service实现 func (e SysJob) RemoveJobForService(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - var v dto.GeneralDelDto - err = c.BindUri(&v) - if err != nil { - log.Warnf("参数验证错误, error: %s", err) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } + v := dto.GeneralDelDto{} s := service.SysJob{} - s.Log = log - s.Orm = db + err := e.MakeContext(c). + MakeOrm(). + Bind(&v). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + return + } + s.Cron = sdk.Runtime.GetCrontabKey(c.Request.Host) err = s.RemoveJob(&v) if err != nil { - log.Errorf("RemoveJob error, %s", err.Error()) + e.Logger.Errorf("RemoveJob error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "") return } @@ -45,7 +41,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) { // StartJobForService 启动job service实现 func (e SysJob) StartJobForService(c *gin.Context) { - e.Context = c + e.MakeContext(c) log := e.GetLogger() db, err := e.GetOrm() if err != nil { diff --git a/app/jobs/jobbase.go b/app/jobs/jobbase.go index 3a21227..3e09b88 100644 --- a/app/jobs/jobbase.go +++ b/app/jobs/jobbase.go @@ -4,6 +4,7 @@ import ( "fmt" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk" + models2 "go-admin/app/jobs/models" "gorm.io/gorm" "sync" "time" @@ -12,7 +13,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg/cronjob" - "go-admin/app/admin/models" ) var timeFormat = "2006-01-02 15:04:05" @@ -108,8 +108,8 @@ func Setup(dbs map[string]*gorm.DB) { func setup(key string, db *gorm.DB) { crontab := sdk.Runtime.GetCrontabKey(key) - sysJob := models.SysJob{} - jobList := make([]models.SysJob, 0) + sysJob := models2.SysJob{} + jobList := make([]models2.SysJob, 0) err := sysJob.GetList(db, &jobList) if err != nil { fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore init error", err) diff --git a/app/admin/models/sys_job.go b/app/jobs/models/sys_job.go similarity index 56% rename from app/admin/models/sys_job.go rename to app/jobs/models/sys_job.go index bc88025..5a62f9d 100644 --- a/app/admin/models/sys_job.go +++ b/app/jobs/models/sys_job.go @@ -44,32 +44,6 @@ func (e *SysJob) SetUpdateBy(updateBy int) { e.UpdateBy = updateBy } -// 创建SysJob -//func (e *SysJob) Create() (err error) { -// return orm.Eloquent.Table(e.TableName()).Create(e).Error -//} - -// 获取SysJob -//func (e *SysJob) Get(id interface{}) (err error) { -// return orm.Eloquent.Table(e.TableName()).First(e, id).Error -//} - -// 获取SysJob带分页 -//func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) { -// table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v)) -// -// // 数据权限控制(如果不需要数据权限请将此处去掉) -// //dataPermission := new(DataPermission) -// userid, _ := tools.StringToInt(e.DataScope) -// -// var count int64 -// -// if err := table.Scopes(system.DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil { -// return 0, err -// } -// return int(count), nil -//} - func (e *SysJob) GetList(tx *gorm.DB, list interface{}) (err error) { return tx.Table(e.TableName()).Where("status = ?", 2).Find(list).Error } @@ -85,25 +59,3 @@ func (e *SysJob) RemoveAllEntryID(tx *gorm.DB) (update SysJob, err error) { } return } - -//func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) { -// if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil { -// return -// } -// return -//} - -// 删除SysJob -//func (e *SysJob) Delete(id int) (success bool, err error) { -// if err = orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error; err != nil { -// success = false -// return -// } -// success = true -// return -//} - -//批量删除 -//func (e *SysJob) BatchDelete(id []int) error { -// return orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error -//} diff --git a/app/jobs/router/int_router.go b/app/jobs/router/int_router.go new file mode 100644 index 0000000..ab65faa --- /dev/null +++ b/app/jobs/router/int_router.go @@ -0,0 +1,36 @@ +package router + +import ( + //"github.com/go-admin-team/go-admin-core/sdk/pkg" + "os" + + "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/sdk" + common "go-admin/common/middleware" +) + +// InitRouter 路由初始化,不要怀疑,这里用到了 +func InitRouter() { + var r *gin.Engine + h := sdk.Runtime.GetEngine() + if h == nil { + log.Fatal("not found engine...") + os.Exit(-1) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } + + authMiddleware, err := common.AuthInit() + if err != nil { + log.Fatalf("JWT Init Error, %s", err.Error()) + } + + // 注册业务路由 + initRouter(r, authMiddleware) +} diff --git a/app/jobs/router/router.go b/app/jobs/router/router.go new file mode 100644 index 0000000..8c893a2 --- /dev/null +++ b/app/jobs/router/router.go @@ -0,0 +1,42 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" +) + +var ( + routerNoCheckRole = make([]func(*gin.RouterGroup), 0) + routerCheckRole = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0) +) + +// initRouter 路由示例 +func initRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine { + + // 无需认证的路由 + noCheckRoleRouter(r) + // 需要认证的路由 + checkRoleRouter(r, authMiddleware) + + return r +} + +// noCheckRoleRouter 无需认证的路由示例 +func noCheckRoleRouter(r *gin.Engine) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerNoCheckRole { + f(v1) + } +} + +// checkRoleRouter 需要认证的路由示例 +func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerCheckRole { + f(v1, authMiddleware) + } +} diff --git a/app/admin/router/sys_job.go b/app/jobs/router/sys_job.go similarity index 62% rename from app/admin/router/sys_job.go rename to app/jobs/router/sys_job.go index a6985b8..89723d4 100644 --- a/app/admin/router/sys_job.go +++ b/app/jobs/router/sys_job.go @@ -3,11 +3,11 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/apis/sys_job" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" + "go-admin/app/jobs/apis" + models2 "go-admin/app/jobs/models" + dto2 "go-admin/app/jobs/service/dto" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -17,21 +17,21 @@ func init() { // 需认证的路由代码 func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - sysJob := &models.SysJob{} - r.GET("", actions.PermissionAction(), actions.IndexAction(sysJob, new(dto.SysJobSearch), func() interface{} { - list := make([]models.SysJob, 0) + sysJob := &models2.SysJob{} + r.GET("", actions.PermissionAction(), actions.IndexAction(sysJob, new(dto2.SysJobSearch), func() interface{} { + list := make([]models2.SysJob, 0) return &list })) - r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysJobById), func() interface{} { - return &dto.SysJobItem{} + r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto2.SysJobById), func() interface{} { + return &dto2.SysJobItem{} })) - r.POST("", actions.CreateAction(new(dto.SysJobControl))) - r.PUT("", actions.PermissionAction(), actions.UpdateAction(new(dto.SysJobControl))) - r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysJobById))) + r.POST("", actions.CreateAction(new(dto2.SysJobControl))) + r.PUT("", actions.PermissionAction(), actions.UpdateAction(new(dto2.SysJobControl))) + r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto2.SysJobById))) } - sysJob := sys_job.SysJob{} + sysJob := apis.SysJob{} v1.GET("/job/remove/:id", sysJob.RemoveJobForService) v1.GET("/job/start/:id", sysJob.StartJobForService) diff --git a/app/admin/service/dto/sys_job.go b/app/jobs/service/dto/sys_job.go similarity index 99% rename from app/admin/service/dto/sys_job.go rename to app/jobs/service/dto/sys_job.go index 6953cab..c66bcbd 100644 --- a/app/admin/service/dto/sys_job.go +++ b/app/jobs/service/dto/sys_job.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/jobs/models" - "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) diff --git a/app/admin/service/sys_job.go b/app/jobs/service/sys_job.go similarity index 95% rename from app/admin/service/sys_job.go rename to app/jobs/service/sys_job.go index b49679b..4e566d0 100644 --- a/app/admin/service/sys_job.go +++ b/app/jobs/service/sys_job.go @@ -1,13 +1,14 @@ package service import ( - "github.com/robfig/cron/v3" "time" - "go-admin/app/admin/models" + "github.com/go-admin-team/go-admin-core/sdk/service" + "github.com/robfig/cron/v3" + "go-admin/app/jobs" + "go-admin/app/jobs/models" "go-admin/common/dto" - "go-admin/common/service" ) type SysJob struct { diff --git a/app/admin/apis/public/file.go b/app/other/apis/file.go similarity index 87% rename from app/admin/apis/public/file.go rename to app/other/apis/file.go index 42a4aca..9f47d30 100644 --- a/app/admin/apis/public/file.go +++ b/app/other/apis/file.go @@ -1,4 +1,4 @@ -package public +package apis import ( "encoding/base64" @@ -8,11 +8,11 @@ import ( "strings" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg/utils" "github.com/google/uuid" - "go-admin/common/apis" "go-admin/common/file_store" ) @@ -27,9 +27,10 @@ type FileResponse struct { const path = "static/uploadfile/" type File struct { - apis.Api + api.Api } +// UploadFile 上传图片 // @Summary 上传图片 // @Description 获取JSON // @Tags 公共接口 @@ -40,34 +41,37 @@ type File struct { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/public/uploadFile [post] func (e File) UploadFile(c *gin.Context) { - e.Context = c - + e.MakeContext(c) tag, _ := c.GetPostForm("type") - urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host) + urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host) var fileResponse FileResponse - if tag == "" { - e.Error(500, nil, "缺少标识") - //app.Error(c, 200, errors.New(""), "缺少标识") - return - } else { - switch tag { - case "1": // 单图 - var done bool - fileResponse, done = e.singleFile(c, fileResponse, urlPerfix) - if done { - return - } - e.OK(fileResponse, "上传成功") + + switch tag { + case "1": // 单图 + var done bool + fileResponse, done = e.singleFile(c, fileResponse, urlPrefix) + if done { return - case "2": // 多图 - multipartFile := e.multipleFile(c, urlPerfix) - e.OK(multipartFile, "上传成功") - return - case "3": // base64 - fileResponse = e.baseImg(c, fileResponse, urlPerfix) - e.OK(fileResponse, "上传成功") } + e.OK(fileResponse, "上传成功") + return + case "2": // 多图 + multipartFile := e.multipleFile(c, urlPrefix) + e.OK(multipartFile, "上传成功") + return + case "3": // base64 + fileResponse = e.baseImg(c, fileResponse, urlPrefix) + e.OK(fileResponse, "上传成功") + default: + var done bool + fileResponse, done = e.singleFile(c, fileResponse, urlPrefix) + if done { + return + } + e.OK(fileResponse, "上传成功") + return } + } func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse { diff --git a/app/admin/apis/sys_china_area_data/sys_china_area_data.go b/app/other/apis/sys_china_area_data.go similarity index 62% rename from app/admin/apis/sys_china_area_data/sys_china_area_data.go rename to app/other/apis/sys_china_area_data.go index bdf8298..a357717 100644 --- a/app/admin/apis/sys_china_area_data/sys_china_area_data.go +++ b/app/other/apis/sys_china_area_data.go @@ -1,36 +1,34 @@ -package sys_china_area_data +package apis import ( + "github.com/gin-gonic/gin/binding" + "go-admin/app/other/models" + "go-admin/app/other/service" + "go-admin/app/other/service/dto" "net/http" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models" - "go-admin/app/admin/service" - "go-admin/app/admin/service/dto" "go-admin/common/actions" - "go-admin/common/apis" ) type SysChinaAreaData struct { - apis.Api + api.Api } -func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { - e.SetContext(c) - log := e.GetLogger() - d := new(dto.SysChinaAreaDataSearch) - db, err := e.GetOrm() +func (e SysChinaAreaData) GetPage(c *gin.Context) { + s := service.SysChinaAreaData{} + req := dto.SysChinaAreaDataSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -39,53 +37,41 @@ func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { list := make([]models.SysChinaAreaData, 0) var count int64 - serviceStudent := service.SysChinaAreaData{} - serviceStudent.Log = log - serviceStudent.Orm = db - err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count) + err = s.GetPage(&req, p, &list, &count) if err != nil { e.Error(http.StatusInternalServerError, err, "查询失败") return } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") } -func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { - e.SetContext(c) - log := e.GetLogger() - control := new(dto.SysChinaAreaDataById) - db, err := e.GetOrm() +func (e SysChinaAreaData) Get(c *gin.Context) { + s := service.SysChinaAreaData{} + req := dto.SysChinaAreaDataById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysChinaAreaData - - //数据权限检查 p := actions.GetPermissionFromContext(c) - - serviceSysChinaAreaData := service.SysChinaAreaData{} - serviceSysChinaAreaData.Log = log - serviceSysChinaAreaData.Orm = db - err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object) + err = s.Get(&req, p, &object) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return } - e.OK(object, "查看成功") + e.OK(object, "查询成功") } -func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { - e.SetContext(c) +func (e SysChinaAreaData) Insert(c *gin.Context) { + e.MakeContext(c) log := e.GetLogger() control := new(dto.SysChinaAreaDataControl) db, err := e.GetOrm() @@ -111,7 +97,7 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { serviceSysChinaAreaData := service.SysChinaAreaData{} serviceSysChinaAreaData.Orm = db serviceSysChinaAreaData.Log = log - err = serviceSysChinaAreaData.InsertSysChinaAreaData(object) + err = serviceSysChinaAreaData.Insert(object) if err != nil { log.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") @@ -121,8 +107,8 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { e.OK(object.GetId(), "创建成功") } -func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { - e.SetContext(c) +func (e SysChinaAreaData) Update(c *gin.Context) { + e.MakeContext(c) log := e.GetLogger() control := new(dto.SysChinaAreaDataControl) db, err := e.GetOrm() @@ -150,7 +136,7 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { serviceSysChinaAreaData := service.SysChinaAreaData{} serviceSysChinaAreaData.Orm = db serviceSysChinaAreaData.Log = log - err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p) + err = serviceSysChinaAreaData.Update(object, p) if err != nil { log.Error(err) return @@ -158,8 +144,8 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { e.OK(object.GetId(), "更新成功") } -func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { - e.SetContext(c) +func (e SysChinaAreaData) Delete(c *gin.Context) { + e.MakeContext(c) log := e.GetLogger() control := new(dto.SysChinaAreaDataById) db, err := e.GetOrm() @@ -185,11 +171,11 @@ func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { serviceSysChinaAreaData := service.SysChinaAreaData{} serviceSysChinaAreaData.Orm = db serviceSysChinaAreaData.Log = log - err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p) + err = serviceSysChinaAreaData.Remove(control, p) if err != nil { log.Errorf("RemoveSysChinaAreaData error, %s", err) e.Error(http.StatusInternalServerError, err, "删除失败") return } e.OK(control.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_file/sys_file_dir.go b/app/other/apis/sys_file_dir.go similarity index 88% rename from app/admin/apis/sys_file/sys_file_dir.go rename to app/other/apis/sys_file_dir.go index d275638..7fa86f4 100644 --- a/app/admin/apis/sys_file/sys_file_dir.go +++ b/app/other/apis/sys_file_dir.go @@ -1,24 +1,24 @@ -package sys_file +package apis import ( "net/http" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models" - "go-admin/app/admin/service" - "go-admin/app/admin/service/dto" + "go-admin/app/other/models" + "go-admin/app/other/service" + "go-admin/app/other/service/dto" "go-admin/common/actions" - "go-admin/common/apis" ) type SysFileDir struct { - apis.Api + api.Api } -func (e SysFileDir) GetSysFileDirList(c *gin.Context) { +func (e SysFileDir) GetPage(c *gin.Context) { e.Context = c log := e.GetLogger() search := new(dto.SysFileDirSearch) @@ -33,7 +33,7 @@ func (e SysFileDir) GetSysFileDirList(c *gin.Context) { log.Debugf("ShouldBind error: %s", err.Error()) } - var list *[]models.SysFileDirL + var list *[]models.SysFileDir serviceStudent := service.SysFileDir{} serviceStudent.Log = log serviceStudent.Orm = db @@ -47,7 +47,7 @@ func (e SysFileDir) GetSysFileDirList(c *gin.Context) { e.OK(list, "查询成功") } -func (e SysFileDir) GetSysFileDir(c *gin.Context) { +func (e SysFileDir) Get(c *gin.Context) { control := new(dto.SysFileDirById) e.Context = c log := e.GetLogger() @@ -76,10 +76,10 @@ func (e SysFileDir) GetSysFileDir(c *gin.Context) { return } - e.OK(object, "查看成功") + e.OK(object, "查询成功") } -func (e SysFileDir) InsertSysFileDir(c *gin.Context) { +func (e SysFileDir) Insert(c *gin.Context) { control := new(dto.SysFileDirControl) e.Context = c log := e.GetLogger() @@ -115,10 +115,10 @@ func (e SysFileDir) InsertSysFileDir(c *gin.Context) { return } - e.OK(control.ID, "创建成功") + e.OK(control.Id, "创建成功") } -func (e SysFileDir) UpdateSysFileDir(c *gin.Context) { +func (e SysFileDir) Update(c *gin.Context) { control := new(dto.SysFileDirControl) e.Context = c log := e.GetLogger() @@ -153,10 +153,10 @@ func (e SysFileDir) UpdateSysFileDir(c *gin.Context) { e.Error(http.StatusInternalServerError, err, "更新失败") return } - e.OK(control.ID, "更新成功") + e.OK(control.Id, "更新成功") } -func (e SysFileDir) DeleteSysFileDir(c *gin.Context) { +func (e SysFileDir) Delete(c *gin.Context) { control := new(dto.SysFileDirById) e.Context = c log := e.GetLogger() diff --git a/app/admin/apis/sys_file/sys_file_info.go b/app/other/apis/sys_file_info.go similarity index 79% rename from app/admin/apis/sys_file/sys_file_info.go rename to app/other/apis/sys_file_info.go index 637743b..68d9a71 100644 --- a/app/admin/apis/sys_file/sys_file_info.go +++ b/app/other/apis/sys_file_info.go @@ -1,26 +1,26 @@ -package sys_file +package apis import ( + models2 "go-admin/app/other/models" + service2 "go-admin/app/other/service" + dto2 "go-admin/app/other/service/dto" "net/http" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models" - "go-admin/app/admin/service" - "go-admin/app/admin/service/dto" "go-admin/common/actions" - "go-admin/common/apis" ) type SysFileInfo struct { - apis.Api + api.Api } -func (e SysFileInfo) GetSysFileInfoList(c *gin.Context) { +func (e SysFileInfo) GetPage(c *gin.Context) { e.Context = c log := e.GetLogger() - search := new(dto.SysFileInfoSearch) + search := new(dto2.SysFileInfoSearch) db, err := e.GetOrm() if err != nil { log.Error(err) @@ -36,9 +36,9 @@ func (e SysFileInfo) GetSysFileInfoList(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - list := make([]models.SysFileInfo, 0) + list := make([]models2.SysFileInfo, 0) var count int64 - serviceStudent := service.SysFileInfo{} + serviceStudent := service2.SysFileInfo{} serviceStudent.Log = log serviceStudent.Orm = db err = serviceStudent.GetSysFileInfoPage(search, p, &list, &count) @@ -51,8 +51,8 @@ func (e SysFileInfo) GetSysFileInfoList(c *gin.Context) { e.PageOK(list, int(count), search.PageIndex, search.PageSize, "查询成功") } -func (e SysFileInfo) GetSysFileInfo(c *gin.Context) { - control := new(dto.SysFileInfoById) +func (e SysFileInfo) Get(c *gin.Context) { + control := new(dto2.SysFileInfoById) e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -69,12 +69,12 @@ func (e SysFileInfo) GetSysFileInfo(c *gin.Context) { return } - var object models.SysFileInfo + var object models2.SysFileInfo //数据权限检查 p := actions.GetPermissionFromContext(c) - serviceSysFileInfo := service.SysFileInfo{} + serviceSysFileInfo := service2.SysFileInfo{} serviceSysFileInfo.Log = log serviceSysFileInfo.Orm = db err = serviceSysFileInfo.GetSysFileInfo(control, p, &object) @@ -84,11 +84,11 @@ func (e SysFileInfo) GetSysFileInfo(c *gin.Context) { return } - e.OK(object, "查看成功") + e.OK(object, "查询成功") } -func (e SysFileInfo) InsertSysFileInfo(c *gin.Context) { - control := new(dto.SysFileInfoControl) +func (e SysFileInfo) Insert(c *gin.Context) { + control := new(dto2.SysFileInfoControl) e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -113,7 +113,7 @@ func (e SysFileInfo) InsertSysFileInfo(c *gin.Context) { // 设置创建人 control.CreateBy = user.GetUserId(c) - serviceSysFileInfo := service.SysFileInfo{} + serviceSysFileInfo := service2.SysFileInfo{} serviceSysFileInfo.Orm = db serviceSysFileInfo.Log = log err = serviceSysFileInfo.InsertSysFileInfo(control) @@ -123,11 +123,11 @@ func (e SysFileInfo) InsertSysFileInfo(c *gin.Context) { return } - e.OK(control.ID, "创建成功") + e.OK(control.Id, "创建成功") } -func (e SysFileInfo) UpdateSysFileInfo(c *gin.Context) { - control := new(dto.SysFileInfoControl) +func (e SysFileInfo) Update(c *gin.Context) { + control := new(dto2.SysFileInfoControl) e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -154,7 +154,7 @@ func (e SysFileInfo) UpdateSysFileInfo(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - serviceSysFileInfo := service.SysFileInfo{} + serviceSysFileInfo := service2.SysFileInfo{} serviceSysFileInfo.Orm = db serviceSysFileInfo.Log = log err = serviceSysFileInfo.UpdateSysFileInfo(control, p) @@ -163,11 +163,11 @@ func (e SysFileInfo) UpdateSysFileInfo(c *gin.Context) { e.Error(http.StatusInternalServerError, err, "创建失败") return } - e.OK(control.ID, "更新成功") + e.OK(control.Id, "更新成功") } -func (e SysFileInfo) DeleteSysFileInfo(c *gin.Context) { - control := new(dto.SysFileInfoById) +func (e SysFileInfo) Delete(c *gin.Context) { + control := new(dto2.SysFileInfoById) e.Context = c log := e.GetLogger() db, err := e.GetOrm() @@ -196,7 +196,7 @@ func (e SysFileInfo) DeleteSysFileInfo(c *gin.Context) { // 数据权限检查 p := actions.GetPermissionFromContext(c) - serviceSysFileInfo := service.SysFileInfo{} + serviceSysFileInfo := service2.SysFileInfo{} serviceSysFileInfo.Orm = db serviceSysFileInfo.Log = log err = serviceSysFileInfo.RemoveSysFileInfo(control, p) diff --git a/app/admin/apis/monitor/server.go b/app/other/apis/sys_server_monitor.go similarity index 88% rename from app/admin/apis/monitor/server.go rename to app/other/apis/sys_server_monitor.go index 9e5b232..c821ffe 100644 --- a/app/admin/apis/monitor/server.go +++ b/app/other/apis/sys_server_monitor.go @@ -1,16 +1,15 @@ -package monitor +package apis import ( "runtime" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/mem" - - "go-admin/common/apis" ) const ( @@ -20,16 +19,17 @@ const ( GB = 1024 * MB ) -type Monitor struct { - apis.Api +type ServerMonitor struct { + api.Api } +// ServerInfo 获取系统信息 // @Summary 系统信息 // @Description 获取JSON // @Tags 系统信息 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/settings/serverInfo [get] -func (e Monitor) ServerInfo(c *gin.Context) { +// @Router /api/v1/server-monitor [get] +func (e ServerMonitor) ServerInfo(c *gin.Context) { e.Context = c osDic := make(map[string]interface{}, 0) diff --git a/app/admin/models/sys_china_area_data.go b/app/other/models/sys_china_area_data.go similarity index 70% rename from app/admin/models/sys_china_area_data.go rename to app/other/models/sys_china_area_data.go index 019b041..7e32942 100644 --- a/app/admin/models/sys_china_area_data.go +++ b/app/other/models/sys_china_area_data.go @@ -6,9 +6,8 @@ import ( type SysChinaAreaData struct { models.Model - - PId string `json:"pId" gorm:"type:int(11);comment:上级编码"` - Name string `json:"name" gorm:"type:varchar(128);comment:名称"` + PId string `json:"p_id" gorm:"size:11;comment:上级编码"` + Name string `json:"name" gorm:"size:128;comment:名称"` models.ControlBy models.ModelTime } @@ -24,4 +23,4 @@ func (e *SysChinaAreaData) Generate() models.ActiveRecord { func (e *SysChinaAreaData) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/app/admin/models/sys_file_dir.go b/app/other/models/sys_file_dir.go similarity index 53% rename from app/admin/models/sys_file_dir.go rename to app/other/models/sys_file_dir.go index 246b14c..b8ea46e 100644 --- a/app/admin/models/sys_file_dir.go +++ b/app/other/models/sys_file_dir.go @@ -7,7 +7,7 @@ import ( type SysFileDir struct { models.Model Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 - PId int `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 + PId int `json:"p_id" gorm:"type:int(11);comment:上级目录"` // 上级目录 Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 Children []SysFileDir `json:"children,omitempty" gorm:"-"` // 下级信息 @@ -15,16 +15,16 @@ type SysFileDir struct { models.ModelTime } -type SysFileDirL struct { - models.Model - Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 - PId int `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 - Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 - Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 - models.ControlBy - models.ModelTime - Children []SysFileDirL `json:"children,omitempty" gorm:"-"` // 下级信息 -} +//type SysFileDirL struct { +// models.Model +// Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 +// PId int `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 +// Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 +// Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 +// models.ControlBy +// models.ModelTime +// Children []SysFileDirL `json:"children,omitempty" gorm:"-"` // 下级信息 +//} func (SysFileDir) TableName() string { /**/ return "sys_file_dir" diff --git a/app/other/models/sys_file_info.go b/app/other/models/sys_file_info.go new file mode 100644 index 0000000..c3ccecc --- /dev/null +++ b/app/other/models/sys_file_info.go @@ -0,0 +1,31 @@ +package models + +import ( + "go-admin/common/models" +) + +type SysFileInfo struct { + models.Model + Type string `json:"type" gorm:"size:255;comment:类型"` // + Name string `json:"name" gorm:"size:255;comment:名称"` // + Size string `json:"size" gorm:"size:11;comment:大小"` // + PId int `json:"p_id" gorm:"size:11;comment:目录"` // + Source string `json:"source" gorm:"size:255;comment:来源"` // + Url string `json:"url" gorm:"size:255;comment:地址"` // + FullUrl string `json:"full_url" gorm:"size:255;comment:全地址"` // + models.ControlBy + models.ModelTime +} + +func (SysFileInfo) TableName() string { + return "sys_file_info" +} + +func (e *SysFileInfo) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysFileInfo) GetId() interface{} { + return e.Id +} diff --git a/app/other/router/file.go b/app/other/router/file.go new file mode 100644 index 0000000..395d95f --- /dev/null +++ b/app/other/router/file.go @@ -0,0 +1,16 @@ +package router + +import ( + "github.com/gin-gonic/gin" + "go-admin/app/other/apis" +) + +func init() { + routerNoCheckRole = append(routerNoCheckRole, registerFileRouter) +} + +// 需认证的路由代码 +func registerFileRouter(v1 *gin.RouterGroup) { + var api = apis.File{} + v1.POST("/public/uploadFile", api.UploadFile) +} diff --git a/app/other/router/init_router.go b/app/other/router/init_router.go new file mode 100644 index 0000000..708f93e --- /dev/null +++ b/app/other/router/init_router.go @@ -0,0 +1,36 @@ +package router + +import ( + "os" + + "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/sdk" + common "go-admin/common/middleware" +) + +// InitRouter 路由初始化,不要怀疑,这里用到了 +func InitRouter() { + var r *gin.Engine + h := sdk.Runtime.GetEngine() + if h == nil { + log.Fatal("not found engine...") + os.Exit(-1) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } + // the jwt middleware + authMiddleware, err := common.AuthInit() + if err != nil { + log.Fatalf("JWT Init Error, %s", err.Error()) + } + + // 注册业务路由 + // TODO: 这里可存放业务路由,里边并无实际路由只有演示代码 + initRouter(r, authMiddleware) +} diff --git a/app/other/router/monitor.go b/app/other/router/monitor.go new file mode 100644 index 0000000..29a2059 --- /dev/null +++ b/app/other/router/monitor.go @@ -0,0 +1,25 @@ +package router + +import ( + "github.com/go-admin-team/go-admin-core/sdk/config" + "net/http" + + "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/tools/transfer" + "github.com/prometheus/client_golang/prometheus/promhttp" +) + +func init() { + routerNoCheckRole = append(routerNoCheckRole, registerMonitorRouter) +} + +// 需认证的路由代码 +func registerMonitorRouter(v1 *gin.RouterGroup) { + if config.ApplicationConfig.Mode == "dev" { + v1.GET("/metrics", transfer.Handler(promhttp.Handler())) + //健康检查 + v1.GET("/health", func(c *gin.Context) { + c.Status(http.StatusOK) + }) + } +} diff --git a/app/other/router/router.go b/app/other/router/router.go new file mode 100644 index 0000000..8c893a2 --- /dev/null +++ b/app/other/router/router.go @@ -0,0 +1,42 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" +) + +var ( + routerNoCheckRole = make([]func(*gin.RouterGroup), 0) + routerCheckRole = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0) +) + +// initRouter 路由示例 +func initRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine { + + // 无需认证的路由 + noCheckRoleRouter(r) + // 需要认证的路由 + checkRoleRouter(r, authMiddleware) + + return r +} + +// noCheckRoleRouter 无需认证的路由示例 +func noCheckRoleRouter(r *gin.Engine) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerNoCheckRole { + f(v1) + } +} + +// checkRoleRouter 需要认证的路由示例 +func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) { + // 可根据业务需求来设置接口版本 + v1 := r.Group("/api/v1") + + for _, f := range routerCheckRole { + f(v1, authMiddleware) + } +} diff --git a/app/other/router/sys_china_area_data.go b/app/other/router/sys_china_area_data.go new file mode 100644 index 0000000..a2ba09a --- /dev/null +++ b/app/other/router/sys_china_area_data.go @@ -0,0 +1,25 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/other/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter) +} + +// 需认证的路由代码 +func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.SysChinaAreaData{} + r := v1.Group("/sys-area-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("", api.Delete) + } +} diff --git a/app/other/router/sys_file_dir.go b/app/other/router/sys_file_dir.go new file mode 100644 index 0000000..a1cc4c8 --- /dev/null +++ b/app/other/router/sys_file_dir.go @@ -0,0 +1,25 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/other/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysFileDirRouter) +} + +// 需认证的路由代码 +func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.SysFileDir{} + r := v1.Group("/file-dir").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("/:id", api.Delete) + } +} diff --git a/app/other/router/sys_file_info.go b/app/other/router/sys_file_info.go new file mode 100644 index 0000000..f59e2e6 --- /dev/null +++ b/app/other/router/sys_file_info.go @@ -0,0 +1,25 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/other/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysFileInfoRouter) +} + +// 需认证的路由代码 +func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.SysFileInfo{} + r := v1.Group("/file-info").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", api.GetPage) + r.GET("/:id", api.Get) + r.POST("", api.Insert) + r.PUT("/:id", api.Update) + r.DELETE("/:id", api.Delete) + } +} diff --git a/app/other/router/sys_server_monitor.go b/app/other/router/sys_server_monitor.go new file mode 100644 index 0000000..ffa91a1 --- /dev/null +++ b/app/other/router/sys_server_monitor.go @@ -0,0 +1,21 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/other/apis" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysServerMonitorRouter) +} + +// 需认证的路由代码 +func registerSysServerMonitorRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.ServerMonitor{} + r := v1.Group("/server-monitor").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", api.ServerInfo) + } +} diff --git a/app/admin/service/dto/syschinaareadata.go b/app/other/service/dto/sys_china_area_data.go similarity index 90% rename from app/admin/service/dto/syschinaareadata.go rename to app/other/service/dto/sys_china_area_data.go index 773571e..192c62e 100644 --- a/app/admin/service/dto/syschinaareadata.go +++ b/app/other/service/dto/sys_china_area_data.go @@ -1,12 +1,12 @@ package dto import ( + models2 "go-admin/app/other/models" "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -53,12 +53,11 @@ func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error { return err } -func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) { - return &models.SysChinaAreaData{ - - Model: common.Model{Id: s.Id}, - PId: s.PId, - Name: s.Name, +func (s *SysChinaAreaDataControl) Generate() (*models2.SysChinaAreaData, error) { + return &models2.SysChinaAreaData{ + Model: common.Model{Id: s.Id}, + PId: s.PId, + Name: s.Name, }, nil } @@ -95,4 +94,4 @@ func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataById) SetUpdateBy(id int) { -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_file_dir.go b/app/other/service/dto/sys_file_dir.go similarity index 94% rename from app/admin/service/dto/sys_file_dir.go rename to app/other/service/dto/sys_file_dir.go index 834258c..dab253b 100644 --- a/app/admin/service/dto/sys_file_dir.go +++ b/app/other/service/dto/sys_file_dir.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/other/models" - "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -38,7 +38,7 @@ func (m *SysFileDirSearch) Generate() dto.Index { } type SysFileDirControl struct { - ID int `uri:"Id" comment:"标识"` // 标识 + Id int `uri:"Id" comment:"标识"` // 标识 Label string `json:"label" comment:"目录名称"` PId int `json:"pId" comment:"上级目录"` Sort string `json:"sort" comment:"排序"` @@ -68,7 +68,7 @@ func (s *SysFileDirControl) Generate() dto.Control { func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) { return &models.SysFileDir{ - Model: common.Model{Id: s.ID}, + Model: common.Model{Id: s.Id}, Label: s.Label, PId: s.PId, //Sort: s.Sort, @@ -81,7 +81,7 @@ func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) { } func (s *SysFileDirControl) GetId() interface{} { - return s.ID + return s.Id } type SysFileDirById struct { diff --git a/app/admin/service/dto/sys_file_info.go b/app/other/service/dto/sys_file_info.go similarity index 92% rename from app/admin/service/dto/sys_file_info.go rename to app/other/service/dto/sys_file_info.go index ba6e4bd..955555a 100644 --- a/app/admin/service/dto/sys_file_info.go +++ b/app/other/service/dto/sys_file_info.go @@ -1,7 +1,7 @@ package dto import ( - "go-admin/app/admin/models" + "go-admin/app/other/models" "go-admin/common/dto" common "go-admin/common/models" ) @@ -20,7 +20,7 @@ func (m *SysFileInfoSearch) GetNeedSearch() interface{} { } type SysFileInfoControl struct { - ID int `uri:"id" comment:"标识"` // 标识 + Id int `uri:"id" comment:"标识"` // 标识 Type string `json:"type" comment:"类型"` Name string `json:"name" comment:"名称"` Size string `json:"size" comment:"大小"` @@ -34,7 +34,7 @@ type SysFileInfoControl struct { func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) { return &models.SysFileInfo{ - Model: common.Model{Id: s.ID}, + Model: common.Model{Id: s.Id}, Type: s.Type, Name: s.Name, Size: s.Size, diff --git a/app/admin/service/sys_china_area_data.go b/app/other/service/sys_china_area_data.go similarity index 66% rename from app/admin/service/sys_china_area_data.go rename to app/other/service/sys_china_area_data.go index 94753d2..a4c5c16 100644 --- a/app/admin/service/sys_china_area_data.go +++ b/app/other/service/sys_china_area_data.go @@ -4,21 +4,19 @@ import ( "errors" common "go-admin/common/models" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/service" ) type SysChinaAreaData struct { service.Service } -// GetSysChinaAreaDataPage 获取SysChinaAreaData列表 -func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error { +// GetPage 获取SysChinaAreaData列表 +func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error { var data models.SysChinaAreaData err := e.Orm.Model(&data). @@ -36,8 +34,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch return nil } -// GetSysChinaAreaData 获取SysChinaAreaData对象 -func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error { +// Get 获取SysChinaAreaData对象 +func (e *SysChinaAreaData) Get(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error { var data models.SysChinaAreaData err := e.Orm.Model(&data). @@ -57,8 +55,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a return nil } -// InsertSysChinaAreaData 创建SysChinaAreaData对象 -func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error { +// Insert 创建SysChinaAreaData对象 +func (e *SysChinaAreaData) Insert(model *models.SysChinaAreaData) error { var data models.SysChinaAreaData err := e.Orm.Model(&data). @@ -70,8 +68,8 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData return nil } -// UpdateSysChinaAreaData 修改SysChinaAreaData对象 -func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error { +// Update 修改SysChinaAreaData对象 +func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPermission) error { db := e.Orm.Model(&models.SysChinaAreaData{ Model: common.Model{ Id: c.GetId().(int), @@ -89,8 +87,8 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p return nil } -// RemoveSysChinaAreaData 删除SysChinaAreaData -func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error { +// Remove 删除SysChinaAreaData +func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error { var data models.SysChinaAreaData diff --git a/app/admin/service/sys_file_dir.go b/app/other/service/sys_file_dir.go similarity index 86% rename from app/admin/service/sys_file_dir.go rename to app/other/service/sys_file_dir.go index 84ff87a..bc3bca0 100644 --- a/app/admin/service/sys_file_dir.go +++ b/app/other/service/sys_file_dir.go @@ -5,13 +5,13 @@ import ( "fmt" "go-admin/app/admin/models/system" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" + "go-admin/app/other/models" + "go-admin/app/other/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/service" ) type SysFileDir struct { @@ -19,7 +19,7 @@ type SysFileDir struct { } // GetSysFileDirPage 获取SysFileDir列表 -func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.SysFileDirL) error { +func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.SysFileDir) error { var err error var data models.SysFileDir @@ -66,7 +66,7 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error { e.Log.Errorf("db error: %s", err) return err } - path := fmt.Sprintf("/%d", model.ID) + path := fmt.Sprintf("/%d", model.Id) //db = e.Orm.Model(&data). // First(&data, model.GetId()) //err = db.Error @@ -80,7 +80,7 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error { } //var mp = map[string]string{} //mp["path"] = path - if err = e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.ID).Update("path", path).Error; err != nil { + if err = e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.Id).Update("path", path).Error; err != nil { return err } @@ -127,10 +127,10 @@ func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPerm return nil } -func (e *SysFileDir) SetSysFileDir(c *dto.SysFileDirSearch) (*[]models.SysFileDirL, error) { - var list []models.SysFileDirL +func (e *SysFileDir) SetSysFileDir(c *dto.SysFileDirSearch) (*[]models.SysFileDir, error) { + var list []models.SysFileDir err := e.GetSysFileDirPage(c, &list) - m := make([]models.SysFileDirL, 0) + m := make([]models.SysFileDir, 0) for i := 0; i < len(list); i++ { if list[i].PId != 0 { continue @@ -141,21 +141,21 @@ func (e *SysFileDir) SetSysFileDir(c *dto.SysFileDirSearch) (*[]models.SysFileDi return &m, err } -func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.SysFileDirL { +func SysFileDirCall(list *[]models.SysFileDir, m models.SysFileDir) models.SysFileDir { listGroup := *list - min := make([]models.SysFileDirL, 0) + min := make([]models.SysFileDir, 0) for j := 0; j < len(listGroup); j++ { if m.Id != listGroup[j].PId { continue } - mi := models.SysFileDirL{} + mi := models.SysFileDir{} mi.Id = listGroup[j].Id mi.PId = listGroup[j].PId mi.Label = listGroup[j].Label //mi.Sort = listGroup[j].Sort mi.CreatedAt = listGroup[j].CreatedAt mi.UpdatedAt = listGroup[j].UpdatedAt - mi.Children = []models.SysFileDirL{} + mi.Children = []models.SysFileDir{} ms := SysFileDirCall(list, mi) min = append(min, ms) } diff --git a/app/admin/service/sys_file_info.go b/app/other/service/sys_file_info.go similarity index 96% rename from app/admin/service/sys_file_info.go rename to app/other/service/sys_file_info.go index cb7c196..886c369 100644 --- a/app/admin/service/sys_file_info.go +++ b/app/other/service/sys_file_info.go @@ -4,13 +4,14 @@ import ( "errors" common "go-admin/common/models" - "gorm.io/gorm" + "go-admin/app/other/models" + "go-admin/app/other/service/dto" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/service" + + "github.com/go-admin-team/go-admin-core/sdk/service" + "gorm.io/gorm" ) type SysFileInfo struct { diff --git a/cmd/api/cms.go b/cmd/api/cms.go new file mode 100644 index 0000000..417de8a --- /dev/null +++ b/cmd/api/cms.go @@ -0,0 +1,8 @@ +package api + +import "go-admin/app/cms/router" + +func init() { + //注册路由 fixme 其他应用的路由,在本目录新建文件放在init方法 + AppRouters = append(AppRouters, router.InitRouter) +} diff --git a/cmd/api/jobs.go b/cmd/api/jobs.go new file mode 100644 index 0000000..e95caf8 --- /dev/null +++ b/cmd/api/jobs.go @@ -0,0 +1,8 @@ +package api + +import "go-admin/app/jobs/router" + +func init() { + //注册路由 fixme 其他应用的路由,在本目录新建文件放在init方法 + AppRouters = append(AppRouters, router.InitRouter) +} diff --git a/cmd/api/other.go b/cmd/api/other.go new file mode 100644 index 0000000..4c291be --- /dev/null +++ b/cmd/api/other.go @@ -0,0 +1,8 @@ +package api + +import "go-admin/app/other/router" + +func init() { + //注册路由 fixme 其他应用的路由,在本目录新建文件放在init方法 + AppRouters = append(AppRouters, router.InitRouter) +} diff --git a/cmd/api/server.go b/cmd/api/server.go index af3f211..b5769d6 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -12,22 +12,26 @@ import ( "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/config/source/file" "github.com/go-admin-team/go-admin-core/sdk" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/config" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/captcha" - "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" + "github.com/go-admin-team/go-admin-core/sdk/runtime" "github.com/spf13/cobra" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/router" "go-admin/app/jobs" "go-admin/common/database" "go-admin/common/global" + common "go-admin/common/middleware" + "go-admin/common/middleware/handler" + "go-admin/common/storage" ext "go-admin/config" ) var ( configYml string + apiCheck bool StartCmd = &cobra.Command{ Use: "server", Short: "Start API server", @@ -46,6 +50,7 @@ var AppRouters = make([]func(), 0) func init() { StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file") + StartCmd.PersistentFlags().BoolVarP(&apiCheck, "api", "a", false, "Start server with check api data") //注册路由 fixme 其他应用的路由,在本目录新建文件放在init方法 AppRouters = append(AppRouters, router.InitRouter) @@ -55,71 +60,27 @@ func setup() { // 注入配置扩展项 config.ExtendConfig = &ext.ExtConfig //1. 读取配置 - config.Setup(file.NewSource, file.WithPath(configYml)) - go config.Watch() - //2. 设置日志 - sdk.Runtime.SetLogger( - logger.SetupLogger( - config.LoggerConfig.Type, - config.LoggerConfig.Path, - config.LoggerConfig.Level, - config.LoggerConfig.Stdout)) - //3. 初始化数据库链接 - database.Setup() - //4. 设置缓存 - cacheAdapter, err := config.CacheConfig.Setup() - if err != nil { - log.Fatalf("cache setup error, %s\n", err.Error()) - } - sdk.Runtime.SetCacheAdapter(cacheAdapter) - //5. 设置验证码store - captcha.SetStore(captcha.NewCacheStore(cacheAdapter, 600)) - - //6. 设置队列 - if !config.QueueConfig.Empty() { - queueAdapter, err := config.QueueConfig.Setup() - if err != nil { - log.Fatalf("queue setup error, %s\n", err.Error()) - } - sdk.Runtime.SetQueueAdapter(queueAdapter) - defer func() { - go queueAdapter.Run() - }() - } - - //7. 设置分布式锁 - if !config.LockerConfig.Empty() { - lockerAdapter, err := config.LockerConfig.Setup() - if err != nil { - log.Fatalf("locker setup error, %s\n", err.Error()) - } - sdk.Runtime.SetLockerAdapter(lockerAdapter) - } + config.Setup( + file.NewSource(file.WithPath(configYml)), + database.Setup, + storage.Setup, + ) + //注册监听函数 + queue := sdk.Runtime.GetMemoryQueue("") + queue.Register(global.LoginLog, models.SaveLoginLog) + queue.Register(global.OperateLog, models.SaveOperaLog) + queue.Register(global.ApiCheck, models.SaveSysApi) + go queue.Run() usageStr := `starting api server...` log.Println(usageStr) - //注册监听函数 - queue := sdk.Runtime.GetMemoryQueue("") - queue.Register(global.LoginLog, system.SaveLoginLog) - queue.Register(global.OperateLog, system.SaveOperaLog) - go queue.Run() } func run() error { - defer config.Stop() - if config.ApplicationConfig.Mode == pkg.ModeProd.String() { gin.SetMode(gin.ReleaseMode) } - engine := sdk.Runtime.GetEngine() - if engine == nil { - engine = gin.New() - } - - if config.ApplicationConfig.Mode == "dev" { - //监控 - AppRouters = append(AppRouters, router.Monitor) - } + initRouter() for _, f := range AppRouters { f() @@ -129,12 +90,29 @@ func run() error { Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port), Handler: sdk.Runtime.GetEngine(), } + go func() { jobs.InitJob() jobs.Setup(sdk.Runtime.GetDb()) }() + if apiCheck { + var routers = sdk.Runtime.GetRouter() + q := sdk.Runtime.GetMemoryQueue("") + mp := make(map[string]interface{}, 0) + mp["List"] = routers + message, err := sdk.Runtime.GetStreamMessage("", global.ApiCheck, mp) + if err != nil { + log.Printf("GetStreamMessage error, %s \n", err.Error()) + //日志报错错误,不中断请求 + } else { + err = q.Append(message) + if err != nil { + log.Printf("Append message error, %s \n", err.Error()) + } + } + } ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() @@ -173,7 +151,35 @@ func run() error { return nil } +var Router runtime.Router + func tip() { usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令` fmt.Printf("%s \n\n", usageStr) } + +func initRouter() { + var r *gin.Engine + h := sdk.Runtime.GetEngine() + if h == nil { + h = gin.New() + sdk.Runtime.SetEngine(h) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } + if config.SslConfig.Enable { + r.Use(handler.TlsHandler()) + } + //r.Use(middleware.Metrics()) + r.Use(common.Sentinel()). + Use(common.RequestId(pkg.TrafficKey)). + Use(api.SetRequestLogger) + + common.InitMiddleware(r) + +} diff --git a/cmd/cobra.go b/cmd/cobra.go index b4b04ce..dedb073 100644 --- a/cmd/cobra.go +++ b/cmd/cobra.go @@ -35,7 +35,7 @@ var rootCmd = &cobra.Command{ func tip() { usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令` - usageStr1 := `也可以参考 http://doc.zhangwj.com/go-admin-site/guide/ksks.html 里边的【启动】章节` + usageStr1 := `也可以参考 https://doc.go-admin.dev/guide/ksks.html 里边的【启动】章节` fmt.Printf("%s\n", usageStr) fmt.Printf("%s\n", usageStr1) } diff --git a/cmd/config/server.go b/cmd/config/server.go index 388b4ed..52ce85b 100644 --- a/cmd/config/server.go +++ b/cmd/config/server.go @@ -27,7 +27,7 @@ func init() { } func run() { - config.Setup(file.NewSource, file.WithPath(configYml)) + config.Setup(file.NewSource(file.WithPath(configYml))) application, errs := json.MarshalIndent(config.ApplicationConfig, "", " ") //转换成JSON返回的是byte[] if errs != nil { diff --git a/app/admin/models/system/casbin_rule.go b/cmd/migrate/migration/models/casbin_rule.go similarity index 96% rename from app/admin/models/system/casbin_rule.go rename to cmd/migrate/migration/models/casbin_rule.go index 7563420..014e2fd 100644 --- a/app/admin/models/system/casbin_rule.go +++ b/cmd/migrate/migration/models/casbin_rule.go @@ -1,4 +1,4 @@ -package system +package models //sys_casbin_rule type CasbinRule struct { diff --git a/cmd/migrate/migration/models/role.go b/cmd/migrate/migration/models/role.go deleted file mode 100644 index 015aefe..0000000 --- a/cmd/migrate/migration/models/role.go +++ /dev/null @@ -1,19 +0,0 @@ -package 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;"` - ModelTime - ControlBy -} - -func (SysRole) TableName() string { - return "sys_role" -} diff --git a/cmd/migrate/migration/models/rolemenu.go b/cmd/migrate/migration/models/rolemenu.go deleted file mode 100644 index f2ca38d..0000000 --- a/cmd/migrate/migration/models/rolemenu.go +++ /dev/null @@ -1,12 +0,0 @@ -package models - -type RoleMenu struct { - RoleId int `gorm:""` - MenuId int `gorm:""` - RoleName string `gorm:"size:128)"` - ControlBy -} - -func (RoleMenu) TableName() string { - return "sys_role_menu" -} diff --git a/cmd/migrate/migration/models/sys_api.go b/cmd/migrate/migration/models/sys_api.go new file mode 100644 index 0000000..1c749e1 --- /dev/null +++ b/cmd/migrate/migration/models/sys_api.go @@ -0,0 +1,16 @@ +package models + +type SysApi struct { + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"size:128;comment:handle"` + Title string `json:"title" gorm:"size:128;comment:标题"` + Path string `json:"path" gorm:"size:128;comment:地址"` + Action string `json:"action" gorm:"size:16;comment:请求类型"` + Type string `json:"type" gorm:"size:16;comment:接口类型"` + ModelTime + ControlBy +} + +func (SysApi) TableName() string { + return "sys_api" +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_china_area_data.go b/cmd/migrate/migration/models/sys_china_area_data.go new file mode 100644 index 0000000..b395ef1 --- /dev/null +++ b/cmd/migrate/migration/models/sys_china_area_data.go @@ -0,0 +1,13 @@ +package models + +type SysChinaAreaData struct { + Model + PId string `json:"p_id" gorm:"size:11;comment:上级编码"` + Name string `json:"name" gorm:"size:128;comment:名称"` + ControlBy + ModelTime +} + +func (SysChinaAreaData) TableName() string { + return "sys_china_area_data" +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/dictdata.go b/cmd/migrate/migration/models/sys_dict_data.go similarity index 100% rename from cmd/migrate/migration/models/dictdata.go rename to cmd/migrate/migration/models/sys_dict_data.go diff --git a/cmd/migrate/migration/models/dicttype.go b/cmd/migrate/migration/models/sys_dict_type.go similarity index 100% rename from cmd/migrate/migration/models/dicttype.go rename to cmd/migrate/migration/models/sys_dict_type.go diff --git a/cmd/migrate/migration/models/sysjob.go b/cmd/migrate/migration/models/sys_job.go similarity index 100% rename from cmd/migrate/migration/models/sysjob.go rename to cmd/migrate/migration/models/sys_job.go diff --git a/cmd/migrate/migration/models/sys_menu.go b/cmd/migrate/migration/models/sys_menu.go index c0f8848..c69252f 100644 --- a/cmd/migrate/migration/models/sys_menu.go +++ b/cmd/migrate/migration/models/sys_menu.go @@ -1,28 +1,27 @@ 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 `json:"sysApi" gorm:"many2many:sys_menu_api_rule"` ControlBy ModelTime } func (SysMenu) TableName() string { return "sys_menu" -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/post.go b/cmd/migrate/migration/models/sys_post.go similarity index 68% rename from cmd/migrate/migration/models/post.go rename to cmd/migrate/migration/models/sys_post.go index 3329b4a..195208a 100644 --- a/cmd/migrate/migration/models/post.go +++ b/cmd/migrate/migration/models/sys_post.go @@ -1,16 +1,16 @@ package models -type Post struct { +type SysPost struct { PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 PostName string `gorm:"size:128;" json:"postName"` //岗位名称 PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 - Sort int `gorm:"" json:"sort"` //岗位排序 - Status string `gorm:"size:4;" json:"status"` //状态 + Sort int `gorm:"size:4;" json:"sort"` //岗位排序 + Status int `gorm:"size:4;" json:"status"` //状态 Remark string `gorm:"size:255;" json:"remark"` //描述 - ModelTime ControlBy + ModelTime } -func (Post) TableName() string { +func (SysPost) TableName() string { return "sys_post" -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_role.go b/cmd/migrate/migration/models/sys_role.go new file mode 100644 index 0000000..0bd5ee3 --- /dev/null +++ b/cmd/migrate/migration/models/sys_role.go @@ -0,0 +1,20 @@ +package 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;"` + SysMenu []SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"` + ControlBy + ModelTime +} + +func (SysRole) TableName() string { + return "sys_role" +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_user.go b/cmd/migrate/migration/models/sys_user.go index 017d92e..b817687 100644 --- a/cmd/migrate/migration/models/sys_user.go +++ b/cmd/migrate/migration/models/sys_user.go @@ -6,8 +6,6 @@ import ( ) type SysUser struct { - ControlBy - ModelTime UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` Password string `json:"-" gorm:"type:varchar(128);comment:密码"` @@ -22,6 +20,8 @@ type SysUser struct { PostId int `json:"postId" gorm:"type:bigint(20);comment:岗位"` Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + ControlBy + ModelTime } func (SysUser) TableName() string { @@ -45,4 +45,4 @@ func (e *SysUser) Encrypt() (err error) { func (e *SysUser) BeforeCreate(_ *gorm.DB) error { return e.Encrypt() -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/systables.go b/cmd/migrate/migration/models/systables.go index d79993b..0e53032 100644 --- a/cmd/migrate/migration/models/systables.go +++ b/cmd/migrate/migration/models/systables.go @@ -1,16 +1,17 @@ package models type SysTables struct { - TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 - TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 - TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 - ClassName string `gorm:"size:255;" json:"className"` //类名 - TplCategory string `gorm:"size:255;" json:"tplCategory"` // - PackageName string `gorm:"size:255;" json:"packageName"` //包名 - ModuleName string `gorm:"size:255;" json:"moduleName"` //模块名 - BusinessName string `gorm:"size:255;" json:"businessName"` // - FunctionName string `gorm:"size:255;" json:"functionName"` //功能名称 - FunctionAuthor string `gorm:"size:255;" json:"functionAuthor"` //功能作者 + TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 + TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 + TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 + ClassName string `gorm:"size:255;" json:"className"` //类名 + TplCategory string `gorm:"size:255;" json:"tplCategory"` // + PackageName string `gorm:"size:255;" json:"packageName"` //包名 + ModuleName string `gorm:"size:255;" json:"moduleName"` //go文件名 + ModuleFrontName string `gorm:"size:255;comment:前端文件名;" json:"moduleFrontName"` //前端文件名 + BusinessName string `gorm:"size:255;" json:"businessName"` // + FunctionName string `gorm:"size:255;" json:"functionName"` //功能名称 + FunctionAuthor string `gorm:"size:255;" json:"functionAuthor"` //功能作者 PkColumn string `gorm:"size:255;" json:"pkColumn"` PkGoField string `gorm:"size:255;" json:"pkGoField"` PkJsonField string `gorm:"size:255;" json:"pkJsonField"` @@ -18,8 +19,8 @@ type SysTables struct { TreeCode string `gorm:"size:255;" json:"treeCode"` TreeParentCode string `gorm:"size:255;" json:"treeParentCode"` TreeName string `gorm:"size:255;" json:"treeName"` - Tree bool `gorm:"size:1;" json:"tree"` - Crud bool `gorm:"size:1;" json:"crud"` + Tree bool `gorm:"size:1;default:0;" json:"tree"` + Crud bool `gorm:"size:1;default:1;" json:"crud"` Remark string `gorm:"size:255;" json:"remark"` IsDataScope int `gorm:"size:1;" json:"isDataScope"` IsActions int `gorm:"size:1;" json:"isActions"` diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index ba23366..f30fe52 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -25,13 +25,13 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysMenu), new(models.SysLoginLog), new(models.SysOperaLog), - new(models.RoleMenu), new(models.SysRoleDept), new(models.SysUser), new(models.SysRole), - new(models.Post), + new(models.SysPost), new(models.DictData), new(models.DictType), + new(models.SysChinaAreaData), new(models.SysJob), new(models.SysConfig), new(models.SysSetting), @@ -39,6 +39,8 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysFileInfo), new(models.SysCategory), new(models.SysContent), + new(models.SysApi), + new(models.SysChinaAreaData), ) if err != nil { return err diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go deleted file mode 100644 index a420bbe..0000000 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ /dev/null @@ -1,235 +0,0 @@ -package version - -import ( - "runtime" - "time" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1599190683670Test) -} - -func _1599190683670Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - list3 := []models.SysDept{ - {DeptId: 1, ParentId: 0, DeptPath: "/0/1", DeptName: "爱拓科技", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 7, ParentId: 1, DeptPath: "/0/1/7", DeptName: "研发部", Sort: 1, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 8, ParentId: 1, DeptPath: "/0/1/8", DeptName: "运维部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 9, ParentId: 1, DeptPath: "/0/1/9", DeptName: "客服部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 10, ParentId: 1, DeptPath: "/0/1/10", DeptName: "人力资源", Sort: 3, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - } - - list4 := []models.SysConfig{ - {Model: models.Model{Id: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-默认皮肤样式名称", ConfigKey: "sys_index_skinName", ConfigValue: "skin-blue", ConfigType: "Y", Remark: "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow"}, - {Model: models.Model{Id: 2}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "用户管理-账号初始密码", ConfigKey: "sys.user.initPassword", ConfigValue: "123456", ConfigType: "Y", Remark: "初始化密码 123456"}, - {Model: models.Model{Id: 3}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-侧边栏主题", ConfigKey: "sys_index_sideTheme", ConfigValue: "theme-dark", ConfigType: "Y", Remark: "深色主题theme-dark,浅色主题theme-light"}, - } - - list5 := []models.Post{ - {PostId: 1, PostName: "首席执行官", PostCode: "CEO", Sort: 0, Status: "2", Remark: "首席执行官", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {PostId: 2, PostName: "首席技术执行官", PostCode: "CTO", Sort: 2, Status: "2", Remark: "首席技术执行官", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {PostId: 3, PostName: "首席运营官", PostCode: "COO", Sort: 3, Status: "2", Remark: "测试工程师", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - } - - list6 := []models.SysRole{ - { - RoleId: 1, - RoleName: "系统管理员", - Status: "2", - RoleKey: "admin", - RoleSort: 1, - Flag: "", - Remark: "", - Admin: true, - DataScope: "", - ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, - ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, - }, - } - - list7 := []models.DictType{ - {DictId: 1, DictName: "系统开关", DictType: "sys_normal_disable", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统开关列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 2, DictName: "用户性别", DictType: "sys_user_sex", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "用户性别列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 3, DictName: "菜单状态", DictType: "sys_show_hide", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "菜单状态列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 4, DictName: "系统是否", DictType: "sys_yes_no", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统是否列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 5, DictName: "任务状态", DictType: "sys_job_status", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "任务状态列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 6, DictName: "任务分组", DictType: "sys_job_group", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "任务分组列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 7, DictName: "通知类型", DictType: "sys_notice_type", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "通知类型列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 8, DictName: "系统状态", DictType: "sys_common_status", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "登录状态列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 9, DictName: "操作类型", DictType: "sys_oper_type", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "操作类型列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictId: 10, DictName: "通知状态", DictType: "sys_notice_status", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "通知状态列表", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - } - - list8 := []models.SysUser{ - { - ControlBy: models.ControlBy{ - CreateBy: 1, - UpdateBy: 1, - }, - ModelTime: models.ModelTime{ - CreatedAt: time.Now(), - UpdatedAt: time.Now(), - }, - UserId: 1, - Username: "admin", - Password: "123456", - NickName: "zhangwj", - Phone: "13818888888", - RoleId: 1, - Salt: "", - Avatar: "", - Sex: "1", - Email: "1@qq.com", - DeptId: 1, - PostId: 1, - Remark: "", - Status: "2", - }, - //{models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "2", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, - } - - list9 := []models.DictData{ - {DictCode: 1, DictSort: 0, DictLabel: "正常", DictValue: "2", DictType: "sys_normal_disable", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统正常", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 2, DictSort: 0, DictLabel: "停用", DictValue: "1", DictType: "sys_normal_disable", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统停用", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 3, DictSort: 0, DictLabel: "男", DictValue: "0", DictType: "sys_user_sex", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "性别男", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 4, DictSort: 0, DictLabel: "女", DictValue: "1", DictType: "sys_user_sex", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "性别女", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 5, DictSort: 0, DictLabel: "未知", DictValue: "2", DictType: "sys_user_sex", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "性别未知", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 6, DictSort: 0, DictLabel: "显示", DictValue: "0", DictType: "sys_show_hide", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "显示菜单", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 7, DictSort: 0, DictLabel: "隐藏", DictValue: "1", DictType: "sys_show_hide", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "隐藏菜单", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 8, DictSort: 0, DictLabel: "是", DictValue: "Y", DictType: "sys_yes_no", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统默认是", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 9, DictSort: 0, DictLabel: "否", DictValue: "N", DictType: "sys_yes_no", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统默认否", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 10, DictSort: 0, DictLabel: "正常", DictValue: "2", DictType: "sys_job_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "正常状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 11, DictSort: 0, DictLabel: "停用", DictValue: "1", DictType: "sys_job_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "停用状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 12, DictSort: 0, DictLabel: "默认", DictValue: "DEFAULT", DictType: "sys_job_group", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "默认分组", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 13, DictSort: 0, DictLabel: "系统", DictValue: "SYSTEM", DictType: "sys_job_group", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "系统分组", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 14, DictSort: 0, DictLabel: "通知", DictValue: "1", DictType: "sys_notice_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "通知", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 15, DictSort: 0, DictLabel: "公告", DictValue: "2", DictType: "sys_notice_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "公告", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 16, DictSort: 0, DictLabel: "正常", DictValue: "0", DictType: "sys_common_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "正常状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 17, DictSort: 0, DictLabel: "关闭", DictValue: "1", DictType: "sys_common_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "关闭状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 18, DictSort: 0, DictLabel: "新增", DictValue: "1", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "新增操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 19, DictSort: 0, DictLabel: "修改", DictValue: "2", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "修改操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 20, DictSort: 0, DictLabel: "删除", DictValue: "3", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "删除操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 21, DictSort: 0, DictLabel: "授权", DictValue: "4", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "授权操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 22, DictSort: 0, DictLabel: "导出", DictValue: "5", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "导出操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 23, DictSort: 0, DictLabel: "导入", DictValue: "6", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "导入操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 24, DictSort: 0, DictLabel: "强退", DictValue: "7", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "强退操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 25, DictSort: 0, DictLabel: "生成代码", DictValue: "8", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "生成操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 26, DictSort: 0, DictLabel: "清空数据", DictValue: "9", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "清空操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 27, DictSort: 0, DictLabel: "成功", DictValue: "0", DictType: "sys_notice_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "成功状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 28, DictSort: 0, DictLabel: "失败", DictValue: "1", DictType: "sys_notice_status", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "失败状态", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 29, DictSort: 0, DictLabel: "登录", DictValue: "10", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "登录操作", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 30, DictSort: 0, DictLabel: "退出", DictValue: "11", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DictCode: 31, DictSort: 0, DictLabel: "获取验证码", DictValue: "12", DictType: "sys_oper_type", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, Remark: "获取验证码", ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - } - - list10 := []models.SysSetting{ - {1, "go-admin管理系统", "https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png", models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - } - - list11 := []models.SysJob{ - { - JobId: 1, - JobName: "接口测试", - JobGroup: "DEFAULT", - JobType: 1, - CronExpression: "0/5 * * * * ", - InvokeTarget: "http://localhost:8000", - Args: "", - MisfirePolicy: 1, - Concurrent: 1, - Status: 1, - EntryId: 0, - ControlBy: models.ControlBy{ - CreateBy: 1, - UpdateBy: 1, - }, - ModelTime: models.ModelTime{ - CreatedAt: time.Now(), - UpdatedAt: time.Now(), - }, - }, - models.SysJob{ - JobId: 2, - JobName: "函数测试", - JobGroup: "DEFAULT", - JobType: 2, - CronExpression: "0/5 * * * * ", - InvokeTarget: "ExamplesOne", - Args: "参数", - MisfirePolicy: 1, - Concurrent: 1, - Status: 1, - EntryId: 0, - ControlBy: models.ControlBy{ - CreateBy: 1, - UpdateBy: 1, - }, - ModelTime: models.ModelTime{ - CreatedAt: time.Now(), - UpdatedAt: time.Now(), - }, - }, - } - - err := tx.Create(list3).Error - if err != nil { - return err - } - - err = tx.Create(list4).Error - if err != nil { - return err - } - - err = tx.Create(list5).Error - if err != nil { - return err - } - - err = tx.Create(list6).Error - if err != nil { - return err - } - - err = tx.Create(list7).Error - if err != nil { - return err - } - - err = tx.Create(list8).Error - if err != nil { - return err - } - - err = tx.Create(list9).Error - if err != nil { - return err - } - - err = tx.Create(list10).Error - if err != nil { - return err - } - - err = tx.Create(list11).Error - if err != nil { - return err - } - - if err := models.InitDb(tx); err != nil { - - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1599190683680_migrate.go b/cmd/migrate/migration/version/1599190683680_migrate.go deleted file mode 100644 index d603244..0000000 --- a/cmd/migrate/migration/version/1599190683680_migrate.go +++ /dev/null @@ -1,59 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1599190683680Test) -} - -func _1599190683680Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - var err error - - list := []models.SysMenu{ - {MenuId: 496, MenuName: "Sources", Title: "资源管理", Icon: "network", Path: "/sources", Paths: "/0/496", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 3, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, - {MenuId: 497, MenuName: "File", Title: "文件管理", Icon: "documentation", Path: "file-manage", Paths: "/0/496/497", MenuType: "C", Action: "", Permission: "", ParentId: 496, NoCache: true, Breadcrumb: "", Component: "/fileManage/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, - {MenuId: 498, MenuName: "", Title: "内容管理", Icon: "pass", Path: "/content", Paths: "/0/498", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 4, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, - {MenuId: 499, MenuName: "SysCategory", Title: "分类", Icon: "pass", Path: "syscategory", Paths: "/0/498/499", MenuType: "C", Action: "无", Permission: "syscategory:syscategory:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscategory/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 500, MenuName: "", Title: "分页获取分类", Icon: "pass", Path: "", Paths: "/0/498/499/500", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:query", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 501, MenuName: "", Title: "创建分类", Icon: "pass", Path: "", Paths: "/0/498/499/501", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:add", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 502, MenuName: "", Title: "修改分类", Icon: "pass", Path: "", Paths: "/0/498/499/502", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:edit", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 503, MenuName: "", Title: "删除分类", Icon: "pass", Path: "", Paths: "/0/498/499/503", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:remove", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 504, MenuName: "Category", Title: "分类", Icon: "bug", Path: "category", Paths: "/0/63/504", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 505, MenuName: "", Title: "分页获取分类", Icon: "bug", Path: "/api/v1/syscategoryList", Paths: "/0/63/504/505", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 506, MenuName: "", Title: "根据id获取分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/506", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 507, MenuName: "", Title: "创建分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/507", MenuType: "A", Action: "POST", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 508, MenuName: "", Title: "修改分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/508", MenuType: "A", Action: "PUT", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 509, MenuName: "", Title: "删除分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/509", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 511, MenuName: "SysContent", Title: "内容管理", Icon: "pass", Path: "syscontent", Paths: "/0/498/511", MenuType: "C", Action: "无", Permission: "syscontent:syscontent:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscontent/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 512, MenuName: "", Title: "分页获取内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/512", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:query", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 513, MenuName: "", Title: "创建内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/513", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:add", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 514, MenuName: "", Title: "修改内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/514", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:edit", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 515, MenuName: "", Title: "删除内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/515", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:remove", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 516, MenuName: "Content", Title: "内容管理", Icon: "bug", Path: "content", Paths: "/0/63/516", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 517, MenuName: "", Title: "分页获取内容管理", Icon: "bug", Path: "/api/v1/syscontentList", Paths: "/0/63/516/517", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 518, MenuName: "", Title: "根据id获取内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/518", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 519, MenuName: "", Title: "创建内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/519", MenuType: "A", Action: "POST", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 520, MenuName: "", Title: "修改内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/520", MenuType: "A", Action: "PUT", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - {MenuId: 521, MenuName: "", Title: "删除内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/521", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, - } - - err = tx.Create(list).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1600089797118_migrate.go b/cmd/migrate/migration/version/1600089797118_migrate.go deleted file mode 100644 index af9e8a4..0000000 --- a/cmd/migrate/migration/version/1600089797118_migrate.go +++ /dev/null @@ -1,38 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1600089797118Migrate) -} - -func _1600089797118Migrate(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - f := &models.SysFileDir{ - Label: "根目录", - PId: 0, - Sort: "0", - Path: "", - ControlBy: models.ControlBy{ - CreateBy: 1, - UpdateBy: 1, - }, - } - err := tx.Create(f).Error - if err != nil { - return err - } - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go deleted file mode 100644 index b398467..0000000 --- a/cmd/migrate/migration/version/1602644950000_migrate.go +++ /dev/null @@ -1,44 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1602644950000Test) -} - -func _1602644950000Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - if tx.Migrator().HasColumn(&models.SysConfig{}, "config_id") { - err := tx.Migrator().RenameColumn(&models.SysConfig{}, "config_id", "id") - if err != nil { - return err - } - } - list2 := []models.CasbinRule{ - {PType: "p", V0: "admin", V1: "/api/v1/config", V2: "GET"}, - } - err := tx.Create(list2).Error - if err != nil { - return err - } - - menu := models.SysMenu{MenuId: 86, Path: "/api/v1/config"} - err = tx.Model(&menu).Where("menu_id = ?", 86).Update("Path", "/api/v1/config").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1603465014697_migrate.go b/cmd/migrate/migration/version/1603465014697_migrate.go deleted file mode 100644 index e10311a..0000000 --- a/cmd/migrate/migration/version/1603465014697_migrate.go +++ /dev/null @@ -1,28 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1603465014697Test) -} - -func _1603465014697Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - err := tx.Debug().Model(&models.SysMenu{}).Where("path = ?", "/api/v1/syscategoryList").Update("path", "/api/v1/syscategory").Error - if err != nil { - return err - } - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1603516925109_migrate.go b/cmd/migrate/migration/version/1603516925109_migrate.go deleted file mode 100644 index d41e24b..0000000 --- a/cmd/migrate/migration/version/1603516925109_migrate.go +++ /dev/null @@ -1,41 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1603516925109Test) -} - -func _1603516925109Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - _ = tx.Migrator().RenameTable("sys_operlog", "sys_opera_log") - _ = tx.Migrator().RenameTable("sys_loginlog", "sys_login_log") - - if tx.Migrator().HasColumn(&models.SysLoginLog{}, "info_id") { - err := tx.Migrator().RenameColumn(&models.SysLoginLog{}, "info_id", "id") - if err != nil { - return err - } - } - - if tx.Migrator().HasColumn(&models.SysOperaLog{}, "oper_id") { - err := tx.Migrator().RenameColumn(&models.SysOperaLog{}, "oper_id", "id") - if err != nil { - return err - } - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go deleted file mode 100644 index e0b725e..0000000 --- a/cmd/migrate/migration/version/1606579402398_migrate.go +++ /dev/null @@ -1,43 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1606579402398Test) -} - -func _1606579402398Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - dicData := models.DictData{} - err := tx.Model(&dicData).Where("dict_code = ?", 1).Update("dict_value", 2).Error - if err != nil { - return err - } - - dicType := models.DictType{} - err = tx.Model(&dicType).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - - user := models.SysUser{} - err = tx.Model(&user).Where("user_id = ?", 1).Update("status", 2).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1606582844753_migrate.go b/cmd/migrate/migration/version/1606582844753_migrate.go deleted file mode 100644 index 5864b0e..0000000 --- a/cmd/migrate/migration/version/1606582844753_migrate.go +++ /dev/null @@ -1,49 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1606582844753Test) -} - -func _1606582844753Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - dept := models.SysDept{} - err := tx.Model(&dept).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - - dictData := models.DictData{} - err = tx.Model(&dictData).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - sql1 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `created_at`, `updated_at`, `deleted_at`) VALUES (522, 'SysContentCreate', '新增', 'form', 'syscontent/create', '/0/498/522', 'C', '', 'syscontent:syscontent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', '1', '1', '2020-11-08 17:00:35.259', '2020-11-12 22:55:50.739', NULL);" - sql2 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `created_at`, `updated_at`, `deleted_at`) VALUES (523, 'SysContentEdit', '编辑', 'edit', 'syscontent/edit:id', '/0/498/523', 'C', '', 'syscontent:syscontent:edit', 498, 0, '', '/syscontent/edit.vue', 0, '1', '1', '1', '1', '2020-11-12 22:53:42.643', '2020-11-12 22:54:56.852', NULL);" - - err = tx.Exec(sql1).Error - if err != nil { - return err - } - - err = tx.Exec(sql2).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go deleted file mode 100644 index eb89844..0000000 --- a/cmd/migrate/migration/version/1610427732413_migrate.go +++ /dev/null @@ -1,32 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1610427732413Test) -} - -func _1610427732413Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - user := models.SysUser{} - err := tx.Model(&user).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1610804233204_migrate.go b/cmd/migrate/migration/version/1610804233204_migrate.go deleted file mode 100644 index 52d82ac..0000000 --- a/cmd/migrate/migration/version/1610804233204_migrate.go +++ /dev/null @@ -1,38 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1610804233204Test) -} - -func _1610804233204Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - post := models.Post{} - err := tx.Model(&post).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - - role := models.SysRole{} - err = tx.Model(&role).Where("status = ?", 0).Update("status", 2).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613638159444_migrate.go b/cmd/migrate/migration/version/1613638159444_migrate.go deleted file mode 100644 index dcb5580..0000000 --- a/cmd/migrate/migration/version/1613638159444_migrate.go +++ /dev/null @@ -1,46 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613638159444Test) -} - -func _1613638159444Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - - // TODO: 例如 修改表字段 使用过程中请删除此段代码 - err := tx.Migrator().AlterColumn(&models.SysRole{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysRole{}, "update_by") - if err != nil { - return err - } - - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613697961697_migrate.go b/cmd/migrate/migration/version/1613697961697_migrate.go deleted file mode 100644 index 12da56d..0000000 --- a/cmd/migrate/migration/version/1613697961697_migrate.go +++ /dev/null @@ -1,44 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613697961697Test) -} - -func _1613697961697Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - //修改字段类型 - err := tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") - if err != nil { - return err - } - - err = tx.Migrator().AlterColumn(&models.SysRole{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysRole{}, "update_by") - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613720892819_migrate.go b/cmd/migrate/migration/version/1613720892819_migrate.go deleted file mode 100644 index 0d739a9..0000000 --- a/cmd/migrate/migration/version/1613720892819_migrate.go +++ /dev/null @@ -1,73 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613720892819Test) -} - -func _1613720892819Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - t := &models.DictType{ - DictName: "内容状态", - DictType: "sys_content_status", - Status: "2", - ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, - } - err := tx.Create(t).Error - if err != nil { - return err - } - - data := make([]models.DictData, 2) - data[0] = models.DictData{ - DictSort: 0, - DictLabel: "正常", - DictValue: "1", - DictType: "sys_content_status", - Status: "1", - ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, - } - data[1] = models.DictData{ - DictSort: 1, - DictLabel: "禁用", - DictValue: "2", - DictType: "sys_content_status", - Status: "1", - ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, - } - err = tx.Create(data).Error - if err != nil { - return err - } - - // TODO: 例如 修改表字段 使用过程中请删除此段代码 - //err := tx.Migrator().RenameColumn(&models.SysConfig{}, "config_id", "id") - //if err != nil { - // return err - //} - - // TODO: 例如 新增表结构 使用过程中请删除此段代码 - //err = tx.Debug().Migrator().AutoMigrate( - // new(models.CasbinRule), - // ) - //if err != nil { - // return err - //} - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613783303115_migrate.go b/cmd/migrate/migration/version/1613783303115_migrate.go deleted file mode 100644 index af6bd33..0000000 --- a/cmd/migrate/migration/version/1613783303115_migrate.go +++ /dev/null @@ -1,60 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613783303115Test) -} - -func _1613783303115Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - //修改字段类型 - err := tx.Model(&models.DictType{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error - if err != nil { - return err - } - err = tx.Model(&models.DictType{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error - if err != nil { - return err - } - err = tx.Model(&models.DictType{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error - if err != nil { - return err - } - err = tx.Model(&models.DictType{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.DictType{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.DictType{}, "update_by") - if err != nil { - return err - } - - err = tx.Migrator().AlterColumn(&models.DictType{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.DictType{}, "update_by") - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613978564961_migrate.go b/cmd/migrate/migration/version/1613978564961_migrate.go deleted file mode 100644 index 9a02e4c..0000000 --- a/cmd/migrate/migration/version/1613978564961_migrate.go +++ /dev/null @@ -1,32 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613978564961Test) -} - -func _1613978564961Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - menu := models.SysMenu{MenuId: 110, Path: "/api/v1/config"} - err := tx.Model(&menu).Where("menu_id = ?", 110).Update("Path", "/api/v1/dict/data-all").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1613998164781_migrate.go b/cmd/migrate/migration/version/1613998164781_migrate.go deleted file mode 100644 index 880a082..0000000 --- a/cmd/migrate/migration/version/1613998164781_migrate.go +++ /dev/null @@ -1,104 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613998164781Test) -} - -func _1613998164781Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/deptList").Update("path", "/api/v1/dept").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/roleList").Update("path", "/api/v1/role").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/menuList").Update("path", "/api/v1/menu").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/postList").Update("path", "/api/v1/post").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/typelist").Update("path", "/api/v1/dict/type").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/datalist").Update("path", "/api/v1/dict/data").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/data"). - Where("action = ?", "PUT").Update("path", "/api/v1/dict/data/:id").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/data/:id"). - Where("action = ?", "DELETE").Update("path", "/api/v1/dict/data").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/type"). - Where("action = ?", "PUT").Update("path", "/api/v1/dict/type/:id").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/type/:id"). - Where("action = ?", "DELETE").Update("path", "/api/v1/dict/type").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/operloglist").Update("path", "/api/v1/sys-opera-log").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/loginloglist").Update("path", "/api/v1/sys-login-log").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/loginlog/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/operloglist%").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/role/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/role").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1614073723691_migrate.go b/cmd/migrate/migration/version/1614073723691_migrate.go deleted file mode 100644 index 04a151e..0000000 --- a/cmd/migrate/migration/version/1614073723691_migrate.go +++ /dev/null @@ -1,32 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1614073723691Test) -} - -func _1614073723691Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - - err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/syscontentList").Update("path", "/api/v1/syscontent").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1614159531111_migrate.go b/cmd/migrate/migration/version/1614159531111_migrate.go deleted file mode 100644 index ad44723..0000000 --- a/cmd/migrate/migration/version/1614159531111_migrate.go +++ /dev/null @@ -1,36 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1614159531111Test) -} - -func _1614159531111Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - sql1 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `is_frame`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (525, '', '公共资源目录获取', 'bug', '/api/v1/sysfiledir', '', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', 1, 1, '2021-02-24 17:36:02.900', '2021-02-24 17:36:16.600', NULL);" - sql2 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `is_frame`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (526, '', '公共资源获取', 'bug', '/api/v1/sysfileinfo', '', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', 1, 0, '2021-02-24 17:36:49.575', '2021-02-24 17:36:49.575', NULL);" - err := tx.Exec(sql1).Error - if err != nil { - return err - } - - err = tx.Exec(sql2).Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1614604763713_migrate.go b/cmd/migrate/migration/version/1614604763713_migrate.go deleted file mode 100644 index 6123b67..0000000 --- a/cmd/migrate/migration/version/1614604763713_migrate.go +++ /dev/null @@ -1,71 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - "go-admin/cmd/migrate/migration/models" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1614604763713Test) -} - -func _1614604763713Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/typeoptionselect").Update("path", "/api/v1/dict/type-option-select").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("action = ?", "GET"). - Where("path = ?", "/api/v1/sysUserList").Update("path", "/api/v1/sysUser").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("action = ?", "DELETE"). - Where("path = ?", "/api/v1/sysUser/:id").Update("path", "/api/v1/sysUser").Error - if err != nil { - return err - } - - err = tx.Migrator().AlterColumn(&models.SysUser{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysUser{}, "update_by") - if err != nil { - return err - } - - err = tx.Migrator().AlterColumn(&models.SysContent{}, "create_by") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysContent{}, "update_by") - if err != nil { - return err - } - err = tx.Model(&models.SysMenu{}).Where("action = ?", "PUT"). - Where("path = ?", "/api/v1/syscontent").Update("path", "/api/v1/syscontent/:id").Error - if err != nil { - return err - } - - err = tx.Model(&models.SysMenu{}).Where("action = ?", "DELETE"). - Where("path = ?", "/api/v1/syscontent/:id").Update("path", "/api/v1/syscontent").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1615447091566_migrate.go b/cmd/migrate/migration/version/1615447091566_migrate.go deleted file mode 100644 index b80b3f4..0000000 --- a/cmd/migrate/migration/version/1615447091566_migrate.go +++ /dev/null @@ -1,36 +0,0 @@ -package version - -import ( - "fmt" - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615447091566Test) -} - -func _1615447091566Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - - // TODO: 例如 修改表字段 使用过程中请删除此段代码 - sql1 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `created_at`, `updated_at`, `deleted_at`) VALUES (522, 'SysContentCreate', '新增', 'form', 'syscontent/create', '/0/498/522', 'C', '', 'syscontent:syscontent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', '1', '1', '2020-11-08 17:00:35.259', '2020-11-12 22:55:50.739', NULL);" - - err := tx.Exec(sql1).Error - if err != nil { - fmt.Println(err) - return nil - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1615948084336_migrate.go b/cmd/migrate/migration/version/1615948084336_migrate.go deleted file mode 100644 index f8544aa..0000000 --- a/cmd/migrate/migration/version/1615948084336_migrate.go +++ /dev/null @@ -1,30 +0,0 @@ -package version - -import ( - "runtime" - "strings" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615948084336Test) -} - -func _1615948084336Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - err := tx.Exec("alter table sys_config add is_frontend int default 1 null comment '是否前台参数' after config_type").Error - if err != nil && !strings.Contains(err.Error(), "Duplicate column name 'is_frontend'") { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1615950701614_migrate.go b/cmd/migrate/migration/version/1615950701614_migrate.go deleted file mode 100644 index ebeab9c..0000000 --- a/cmd/migrate/migration/version/1615950701614_migrate.go +++ /dev/null @@ -1,34 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615950701614Test) -} - -func _1615950701614Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - err := tx.Exec("UPDATE sys_dict_data t SET t.dict_value = '2' WHERE t.dict_code = 16").Error - if err != nil { - return err - } - - err = tx.Exec("UPDATE sys_opera_log t SET t.status = '2' WHERE t.status = '0'").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1615961953379_migrate.go b/cmd/migrate/migration/version/1615961953379_migrate.go deleted file mode 100644 index c290a0b..0000000 --- a/cmd/migrate/migration/version/1615961953379_migrate.go +++ /dev/null @@ -1,34 +0,0 @@ -package version - -import ( - "runtime" - - "gorm.io/gorm" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615961953379Test) -} - -func _1615961953379Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - err := tx.Exec("INSERT INTO `sys_config` (`id`, `config_name`, `config_key`, `config_value`, `config_type`, `is_frontend`, `remark`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (4, '系统名称', 'sys_app_name', 'go-admin管理系统', 'Y', 1, '', 1, 0, '2021-03-17 08:52:06.067', '2021-03-17 08:52:06.067', NULL);").Error - if err != nil { - return err - } - - err = tx.Exec("INSERT INTO `sys_config` (`id`, `config_name`, `config_key`, `config_value`, `config_type`, `is_frontend`, `remark`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (5, '系统logo', 'sys_app_logo', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', 'Y', 1, '', 1, 0, '2021-03-17 08:53:19.462', '2021-03-17 08:53:19.462', NULL);").Error - if err != nil { - return err - } - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/migration/version/1619418811873_migrate.go b/cmd/migrate/migration/version/1619418811873_migrate.go deleted file mode 100644 index ba91352..0000000 --- a/cmd/migrate/migration/version/1619418811873_migrate.go +++ /dev/null @@ -1,64 +0,0 @@ -package version - -import ( - "go-admin/cmd/migrate/migration/models" - "gorm.io/gorm" - "runtime" - - "go-admin/cmd/migrate/migration" - common "go-admin/common/models" -) - -func init() { - _, fileName, _, _ := runtime.Caller(0) - migration.Migrate.SetVersion(migration.GetFilename(fileName), _1619418811873Test) -} - -func _1619418811873Test(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - - // TODO: 这里开始写入要变更的内容 - err := tx.Migrator().AlterColumn(&models.SysRole{}, "CreateBy") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysRole{}, "UpdateBy") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysJob{}, "CreateBy") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.SysJob{}, "UpdateBy") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.RoleMenu{}, "CreateBy") - if err != nil { - return err - } - err = tx.Migrator().AlterColumn(&models.RoleMenu{}, "UpdateBy") - if err != nil { - return err - } - - // TODO: 例如 修改表字段 使用过程中请删除此段代码 - //err := tx.Migrator().RenameColumn(&models.SysConfig{}, "config_id", "id") - //if err != nil { - // return err - //} - - // TODO: 例如 新增表结构 使用过程中请删除此段代码 - //err = tx.Debug().Migrator().AutoMigrate( - // new(models.CasbinRule), - // ) - //if err != nil { - // return err - //} - - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) -} diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index f9ba127..fa25741 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -13,7 +13,6 @@ import ( "github.com/spf13/cobra" "github.com/go-admin-team/go-admin-core/sdk/config" - "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "go-admin/cmd/migrate/migration" _ "go-admin/cmd/migrate/migration/version" _ "go-admin/cmd/migrate/migration/version-local" @@ -49,15 +48,10 @@ func run() { if !generate { fmt.Println(`start init`) //1. 读取配置 - config.Setup(file.NewSource, file.WithPath(configYml)) - //2. 设置日志 - sdk.Runtime.SetLogger( - logger.SetupLogger( - config.LoggerConfig.Type, - config.LoggerConfig.Path, - config.LoggerConfig.Level, - config.LoggerConfig.Stdout)) - _ = initDB() + config.Setup( + file.NewSource(file.WithPath(configYml)), + initDB, + ) } else { fmt.Println(`generate migration file`) _ = genFile() @@ -81,14 +75,13 @@ func migrateModel() error { migration.Migrate.Migrate() return err } -func initDB() error { +func initDB() { //3. 初始化数据库链接 database.Setup() //4. 数据库迁移 fmt.Println("数据库迁移开始") _ = migrateModel() fmt.Println(`数据库基础数据初始化成功`) - return nil } func genFile() error { diff --git a/common/actions/create.go b/common/actions/create.go index 4de722d..82d08b8 100644 --- a/common/actions/create.go +++ b/common/actions/create.go @@ -46,4 +46,4 @@ func CreateAction(control dto.Control) gin.HandlerFunc { response.OK(c, object.GetId(), "创建成功") c.Next() } -} \ No newline at end of file +} diff --git a/common/actions/permission.go b/common/actions/permission.go index 357f0a5..c7a12a7 100644 --- a/common/actions/permission.go +++ b/common/actions/permission.go @@ -91,7 +91,7 @@ func getPermissionFromContext(c *gin.Context) *DataPermission { return p } -// PermissionForNoAction 提供非action写法数据范围约束 +// GetPermissionFromContext 提供非action写法数据范围约束 func GetPermissionFromContext(c *gin.Context) *DataPermission { return getPermissionFromContext(c) } diff --git a/common/actions/view.go b/common/actions/view.go index 97e0661..9ee3b12 100644 --- a/common/actions/view.go +++ b/common/actions/view.go @@ -61,7 +61,7 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc { response.Error(c, http.StatusInternalServerError, err, "查看失败") return } - response.OK(c, rsp, "查看成功") + response.OK(c, rsp, "查询成功") c.Next() } } diff --git a/common/apis/api.go b/common/apis/api.go index a81824a..9f09ec2 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -1,45 +1,84 @@ package apis import ( - "github.com/gin-gonic/gin/binding" + "errors" + "fmt" "net/http" "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "gorm.io/gorm" + + "go-admin/common/service" ) type Api struct { Context *gin.Context - Logger *logger.Logger + Logger *logger.Helper + Orm *gorm.DB + Errors error } -func (e *Api) SetContext(c *gin.Context) { +func (e *Api) AddError(err error) { + if e.Errors == nil { + e.Errors = err + } else if err != nil { + e.Logger.Error(err) + e.Errors = fmt.Errorf("%v; %w", e.Error, err) + } +} + +// MakeContext 设置http上下文 +func (e *Api) MakeContext(c *gin.Context) *Api { e.Context = c + e.Logger = api.GetRequestLogger(c) + return e } // GetLogger 获取上下文提供的日志 -func (e Api) GetLogger() *logger.Logger { +func (e Api) GetLogger() *logger.Helper { return api.GetRequestLogger(e.Context) } -func (e Api) Bind(d interface{}, bindings ...binding.Binding) error { +func (e *Api) Bind(d interface{}, bindings ...binding.Binding) *Api { var err error + if len(bindings) == 0 { + bindings = append(bindings, binding.JSON, nil) + } for i := range bindings { switch bindings[i] { case binding.JSON: err = e.Context.ShouldBindWith(d, binding.JSON) + case binding.XML: + err = e.Context.ShouldBindWith(d, binding.XML) + case binding.Form: + err = e.Context.ShouldBindWith(d, binding.Form) + case binding.Query: + err = e.Context.ShouldBindWith(d, binding.Query) + case binding.FormPost: + err = e.Context.ShouldBindWith(d, binding.FormPost) + case binding.FormMultipart: + err = e.Context.ShouldBindWith(d, binding.FormMultipart) + case binding.ProtoBuf: + err = e.Context.ShouldBindWith(d, binding.ProtoBuf) + case binding.MsgPack: + err = e.Context.ShouldBindWith(d, binding.MsgPack) + case binding.YAML: + err = e.Context.ShouldBindWith(d, binding.YAML) + case binding.Header: + err = e.Context.ShouldBindWith(d, binding.Header) default: err = e.Context.ShouldBindUri(d) } if err != nil { - return err + e.AddError(err) } } - return nil + return e } // GetOrm 获取Orm DB @@ -52,6 +91,30 @@ func (e Api) GetOrm() (*gorm.DB, error) { return db, nil } +// MakeOrm 设置Orm DB +func (e *Api) MakeOrm() *Api { + var err error + if e.Logger == nil { + err = errors.New("at MakeOrm logger is nil") + //e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil") + e.AddError(err) + return e + } + db, err := pkg.GetOrm(e.Context) + if err != nil { + e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败") + e.AddError(err) + } + e.Orm = db + return e +} + +func (e *Api) MakeService(c *service.Service) *Api { + c.Log = e.Logger + c.Orm = e.Orm + return e +} + // Error 通常错误数据处理 func (e Api) Error(code int, err error, msg string) { response.Error(e.Context, code, err, msg) diff --git a/common/apis/request_logger.go b/common/apis/request_logger.go deleted file mode 100644 index d3df51c..0000000 --- a/common/apis/request_logger.go +++ /dev/null @@ -1,10 +0,0 @@ -package apis - -// GetRequestLogger 获取上下文提供的日志 -//func GetRequestLogger(c *gin.Context) *logger.Logger { -// requestId := pkg.GenerateMsgIDFromContext(c) -// log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{ -// strings.ToLower(pkg.TrafficKey): requestId, -// }) -// return &logger.Logger{Logger: log} -//} \ No newline at end of file diff --git a/common/database/initialize.go b/common/database/initialize.go index b780435..501f523 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -60,10 +60,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { e := mycasbin.Setup(db, "sys_") - //if host == "*" { - // global.Eloquent = db - //} - sdk.Runtime.SetDb(host, db) sdk.Runtime.SetCasbin(host, e) } diff --git a/common/dto/auto_form.go b/common/dto/auto_form.go new file mode 100644 index 0000000..c99976a --- /dev/null +++ b/common/dto/auto_form.go @@ -0,0 +1,74 @@ +package dto + +type AutoForm struct { + Fields []Field `json:"fields"` + FormRef string `json:"formRef"` + FormModel string `json:"formModel"` + Size string `json:"size"` + LabelPosition string `json:"labelPosition"` + LabelWidth int `json:"labelWidth"` + FormRules string `json:"formRules"` + Gutter int `json:"gutter"` + Disabled bool `json:"disabled"` + Span int `json:"span"` + FormBtns bool `json:"formBtns"` +} + +type Config struct { + Label string `json:"label"` + LabelWidth interface{} `json:"labelWidth"` + ShowLabel bool `json:"showLabel"` + ChangeTag bool `json:"changeTag"` + Tag string `json:"tag"` + TagIcon string `json:"tagIcon"` + Required bool `json:"required"` + Layout string `json:"layout"` + Span int `json:"span"` + Document string `json:"document"` + RegList []interface{} `json:"regList"` + FormId int `json:"formId"` + RenderKey int64 `json:"renderKey"` + DefaultValue interface{} `json:"defaultValue"` + ShowTip bool `json:"showTip,omitempty"` + ButtonText string `json:"buttonText,omitempty"` + FileSize int `json:"fileSize,omitempty"` + SizeUnit string `json:"sizeUnit,omitempty"` +} + +type Option struct { + Label string `json:"label"` + Value string `json:"value"` +} + +type Slot struct { + Prepend string `json:"prepend,omitempty"` + Append string `json:"append,omitempty"` + ListType bool `json:"list-type,omitempty"` + Options []Option `json:"options,omitempty"` +} + +type Field struct { + Config Config `json:"__config__"` + Slot Slot `json:"__slot__"` + Placeholder string `json:"placeholder,omitempty"` + Style Style `json:"style,omitempty"` + Clearable bool `json:"clearable,omitempty"` + PrefixIcon string `json:"prefix-icon,omitempty"` + SuffixIcon string `json:"suffix-icon,omitempty"` + Maxlength interface{} `json:"maxlength"` + ShowWordLimit bool `json:"show-word-limit,omitempty"` + Readonly bool `json:"readonly,omitempty"` + Disabled bool `json:"disabled"` + VModel string `json:"__vModel__"` + Action string `json:"action,omitempty"` + Accept string `json:"accept,omitempty"` + Name string `json:"name,omitempty"` + AutoUpload bool `json:"auto-upload,omitempty"` + ListType string `json:"list-type,omitempty"` + Multiple bool `json:"multiple,omitempty"` + Filterable bool `json:"filterable,omitempty"` +} + +type Style struct { + Width string `json:"width"` +} diff --git a/common/file_store/oss.go b/common/file_store/oss.go index b9ae662..fb7a2a4 100644 --- a/common/file_store/oss.go +++ b/common/file_store/oss.go @@ -14,10 +14,11 @@ type ALiYunOSS struct { } func (e *ALiYunOSS) Setup() error { - e.AccessKeyId = "LTAI4G3S4hDLxg6Zmu4UTBwG" - e.AccessKeySecret = "C8sj70orL03bwk6wNXX0jbNjAbLCb8" - e.Endpoint = "oss-cn-shanghai.aliyuncs.com" - e.BucketName = "youshikeji" + // TODO: 如果需要使用阿里云OSS请在此处填写对应信息 + e.AccessKeyId = "" + e.AccessKeySecret = "" + e.Endpoint = "" + e.BucketName = "" client, err := oss.New(e.Endpoint, e.AccessKeyId, e.AccessKeySecret) if err != nil { diff --git a/common/global/adm.go b/common/global/adm.go index af5c5a1..6081753 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -1,8 +1,8 @@ package global const ( - // Version go-admin Version Info - Version = "1.3.9" + // Version go-admin version info + Version = "2.0.0-beta.3" ) var ( diff --git a/common/global/topic.go b/common/global/topic.go index ae88ce4..60e1d34 100644 --- a/common/global/topic.go +++ b/common/global/topic.go @@ -3,4 +3,5 @@ package global const ( LoginLog = "login_log_queue" OperateLog = "operate_log_queue" + ApiCheck = "api_check_queue" ) diff --git a/common/ip.go b/common/ip.go new file mode 100644 index 0000000..bc8b97f --- /dev/null +++ b/common/ip.go @@ -0,0 +1,17 @@ +package common + +import ( + "github.com/gin-gonic/gin" + "strings" +) + +func GetClientIP(ctx *gin.Context) string { + ip := ctx.Request.Header.Get("X-Forwarded-For") + if strings.Contains(ip, "127.0.0.1") || ip == "" { + ip = ctx.Request.Header.Get("X-real-ip") + } + if ip == "" { + return "127.0.0.1" + } + return ip +} diff --git a/common/middleware/customerror.go b/common/middleware/customerror.go index 4c56bae..a16dccb 100644 --- a/common/middleware/customerror.go +++ b/common/middleware/customerror.go @@ -2,6 +2,7 @@ package middleware import ( "fmt" + "go-admin/common" "net/http" "strconv" "strings" @@ -33,7 +34,7 @@ func CustomError(c *gin.Context) { c.Request.URL, statusCode, c.Request.RequestURI, - c.ClientIP(), + common.GetClientIP(c), p[2], ) c.JSON(http.StatusOK, gin.H{ diff --git a/common/middleware/demo.go b/common/middleware/demo.go new file mode 100644 index 0000000..f2cc953 --- /dev/null +++ b/common/middleware/demo.go @@ -0,0 +1,26 @@ +package middleware + +import ( + "github.com/gin-gonic/gin" + "net/http" +) + +func DemoEvn() gin.HandlerFunc { + return func(c *gin.Context) { + method := c.Request.Method + if method == "GET" || + method == "OPTIONS" || + c.Request.RequestURI == "/api/v1/login" || + c.Request.RequestURI == "/api/v1/logout" { + c.Next() + } else { + c.JSON(http.StatusOK, gin.H{ + "code": 500, + "msg": "谢谢您的参与,但为了大家更好的体验,所以本次提交就算了吧!\U0001F600\U0001F600\U0001F600", + }) + c.Abort() + return + } + + } +} \ No newline at end of file diff --git a/common/middleware/handler/auth.go b/common/middleware/handler/auth.go index 36d940e..fcb79c7 100644 --- a/common/middleware/handler/auth.go +++ b/common/middleware/handler/auth.go @@ -1,6 +1,9 @@ package handler import ( + "fmt" + "go-admin/app/admin/models" + "go-admin/common" "net/http" "github.com/gin-gonic/gin" @@ -13,8 +16,8 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/mssola/user_agent" + gaConfig "go-admin/config" - "go-admin/app/admin/models/system" "go-admin/common/global" ) @@ -46,6 +49,7 @@ func IdentityHandler(c *gin.Context) interface{} { } } +// Authenticator 获取token // @Summary 登陆 // @Description 获取token // @Description LoginHandler can be used by clients to get a jwt token. @@ -57,7 +61,7 @@ func IdentityHandler(c *gin.Context) interface{} { // @Product application/json // @Param account body Login true "account" // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }" -// @Router /login [post] +// @Router /api/v1/login [post] func Authenticator(c *gin.Context) (interface{}, error) { log := api.GetRequestLogger(c) db, err := pkg.GetOrm(c) @@ -113,8 +117,9 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) { l := make(map[string]interface{}) ua := user_agent.New(c.Request.UserAgent()) - l["ipaddr"] = c.ClientIP() - l["loginLocation"] = pkg.GetLocation(c.ClientIP()) + l["ipaddr"] = common.GetClientIP(c) + fmt.Println("gaConfig.ExtConfig.AMap.Key", gaConfig.ExtConfig.AMap.Key) + l["loginLocation"] = pkg.GetLocation(common.GetClientIP(c),gaConfig.ExtConfig.AMap.Key) l["loginTime"] = pkg.GetCurrentTime() l["status"] = status l["remark"] = c.Request.UserAgent() @@ -138,6 +143,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) { } } +// LogOut // @Summary 退出登录 // @Description 获取token // LoginHandler can be used by clients to get a jwt token. @@ -159,14 +165,13 @@ 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) c.Set("userName", u.Username) c.Set("dataScope", r.DataScope) - return true } return false diff --git a/common/middleware/handler/user.go b/common/middleware/handler/user.go index 346d59d..6447737 100644 --- a/common/middleware/handler/user.go +++ b/common/middleware/handler/user.go @@ -6,26 +6,26 @@ import ( ) type SysUser struct { - models.ControlBy - models.ModelTime UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` - Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` - Password string `json:"-" gorm:"type:varchar(128);comment:密码"` - NickName string `json:"nickName" gorm:"type:varchar(128);comment:昵称"` - Phone string `json:"phone" gorm:"type:varchar(11);comment:手机号"` - RoleId int `json:"roleId" gorm:"type:bigint(20);comment:角色ID"` - Salt string `json:"-" gorm:"type:varchar(255);comment:加盐"` - Avatar string `json:"avatar" gorm:"type:varchar(255);comment:头像"` - Sex string `json:"sex" gorm:"type:varchar(255);comment:性别"` - Email string `json:"email" gorm:"type:varchar(128);comment:邮箱"` - DeptId int `json:"deptId" gorm:"type:bigint(20);comment:部门"` - PostId int `json:"postId" gorm:"type:bigint(20);comment:岗位"` - Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` - Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + Username string `json:"username" gorm:"size:64;comment:用户名"` + Password string `json:"-" gorm:"size:128;comment:密码"` + NickName string `json:"nickName" gorm:"size:128;comment:昵称"` + Phone string `json:"phone" gorm:"size:11;comment:手机号"` + RoleId int `json:"roleId" gorm:"size:20;comment:角色ID"` + Salt string `json:"-" gorm:"size:255;comment:加盐"` + Avatar string `json:"avatar" gorm:"size:255;comment:头像"` + Sex string `json:"sex" gorm:"size:255;comment:性别"` + Email string `json:"email" gorm:"size:128;comment:邮箱"` + DeptId int `json:"deptId" gorm:"size:20;comment:部门"` + PostId int `json:"postId" gorm:"size:20;comment:岗位"` + Remark string `json:"remark" gorm:"size:255;comment:备注"` + Status string `json:"status" gorm:"size:4;comment:状态"` DeptIds []int `json:"deptIds" gorm:"-"` PostIds []int `json:"postIds" gorm:"-"` RoleIds []int `json:"roleIds" gorm:"-"` //Dept *SysDept `json:"dept"` + models.ControlBy + models.ModelTime } func (SysUser) TableName() string { diff --git a/common/middleware/init.go b/common/middleware/init.go index d81a4f7..c82521a 100644 --- a/common/middleware/init.go +++ b/common/middleware/init.go @@ -2,6 +2,15 @@ package middleware import ( "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/common/actions" +) + +const ( + JwtTokenCheck string = "JwtToken" + RoleCheck string = "AuthCheckRole" + PermissionCheck string = "PermissionAction" ) func InitMiddleware(r *gin.Engine) { @@ -17,6 +26,10 @@ func InitMiddleware(r *gin.Engine) { r.Use(Options) // Secure is a middleware function that appends security r.Use(Secure) + //r.Use(DemoEvn()) // 链路追踪 //r.Use(middleware.Trace()) -} + sdk.Runtime.SetMiddleware(JwtTokenCheck, (*jwt.GinJWTMiddleware).MiddlewareFunc) + sdk.Runtime.SetMiddleware(RoleCheck, AuthCheckRole()) + sdk.Runtime.SetMiddleware(PermissionCheck, actions.PermissionAction()) +} \ No newline at end of file diff --git a/common/middleware/logger.go b/common/middleware/logger.go index 21acf89..627afd4 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -1,7 +1,14 @@ package middleware import ( + "bufio" + "bytes" "encoding/json" + "fmt" + "go-admin/common" + gaConfig "go-admin/config" + "io" + "io/ioutil" "net/http" "strings" "time" @@ -19,13 +26,29 @@ import ( // LoggerToFile 日志记录到文件 func LoggerToFile() gin.HandlerFunc { return func(c *gin.Context) { + log := api.GetRequestLogger(c) // 开始时间 startTime := time.Now() // 处理请求 + var body string + switch c.Request.Method { + case http.MethodPost, http.MethodPut, http.MethodDelete: + bf := bytes.NewBuffer(nil) + wt := bufio.NewWriter(bf) + _, err := io.Copy(wt, c.Request.Body) + if err != nil { + log.Warnf("copy body error, %s", err.Error()) + err = nil + } + rb, _ := ioutil.ReadAll(bf) + c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(rb)) + body = string(rb) + } c.Next() - if strings.Index(c.Request.RequestURI, "/api/v1/logout") > -1 || - strings.Index(c.Request.RequestURI, "/login") > -1 { + url := c.Request.RequestURI + if strings.Index(url, "logout") > -1 || + strings.Index(url, "login") > -1 { return } // 结束时间 @@ -33,13 +56,6 @@ func LoggerToFile() gin.HandlerFunc { if c.Request.Method == http.MethodOptions { return } - log := api.GetRequestLogger(c) - - bd, bl := c.Get("body") - var body = "" - if bl { - body = bd.(string) - } rt, bl := c.Get("result") var result = "" @@ -65,7 +81,7 @@ func LoggerToFile() gin.HandlerFunc { // 状态码 statusCode := c.Writer.Status() // 请求IP - clientIP := c.ClientIP() + clientIP := common.GetClientIP(c) // 执行时间 latencyTime := endTime.Sub(startTime) // 日志格式 @@ -76,10 +92,9 @@ func LoggerToFile() gin.HandlerFunc { "method": reqMethod, "uri": reqUri, } - log.Info(logData) - //l := logger.Logger{Logger: log.Fields(logData)} - //l.Info(logData) - if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { + log.WithFields(logData).Info() + + if c.Request.Method != "OPTIONS" && c.Request.Method != "GET" && config.LoggerConfig.EnabledDB { SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) } } @@ -91,32 +106,16 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string l := make(map[string]interface{}) l["_fullPath"] = c.FullPath() l["operUrl"] = reqUri - l["method"] = reqMethod l["operIp"] = clientIP - l["operLocation"] = pkg.GetLocation(clientIP) + fmt.Println("gaConfig.ExtConfig.AMap.Key", gaConfig.ExtConfig.AMap.Key) + l["operLocation"] = pkg.GetLocation(clientIP, gaConfig.ExtConfig.AMap.Key) l["operName"] = user.GetUserName(c) l["requestMethod"] = c.Request.Method l["operParam"] = body l["operTime"] = time.Now() - if reqUri == "/login" { - l["businessType"] = "10" - l["title"] = "用户登录" - l["operName"] = "-" - } else if strings.Contains(reqUri, "/api/v1/logout") { - l["businessType"] = "11" - l["title"] = "退出登录" - } else if strings.Contains(reqUri, "/api/v1/getCaptcha") { - l["businessType"] = "12" - l["title"] = "验证码" - } else { - if reqMethod == "POST" { - l["businessType"] = "1" - } else if reqMethod == "PUT" { - l["businessType"] = "2" - } else if reqMethod == "DELETE" { - l["businessType"] = "3" - } - } + l["jsonResult"] = result + l["latencyTime"] = latencyTime.String() + l["statusCode"] = statusCode if status == http.StatusOK { l["status"] = "2" } else { diff --git a/common/middleware/permission.go b/common/middleware/permission.go index 109f97b..00d1b1f 100644 --- a/common/middleware/permission.go +++ b/common/middleware/permission.go @@ -1,6 +1,7 @@ package middleware import ( + "github.com/casbin/casbin/v2/util" "net/http" "github.com/gin-gonic/gin" @@ -10,27 +11,38 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/response" ) -//权限检查中间件 +// AuthCheckRole 权限检查中间件 func AuthCheckRole() gin.HandlerFunc { return func(c *gin.Context) { log := api.GetRequestLogger(c) data, _ := c.Get(jwtauth.JwtPayloadKey) v := data.(jwtauth.MapClaims) e := sdk.Runtime.GetCasbinKey(c.Request.Host) - var res bool + var res, casbinExclude bool var err error //检查权限 if v["rolekey"] == "admin" { res = true - log.Infof("info:%s method:%s path:%s", v["rolekey"], c.Request.Method, c.Request.URL.Path) - } else { - res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) - if err != nil { - log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path) - response.Error(c, 500, err, "") - return + c.Next() + return + } + for _, i := range CasbinExclude { + if util.KeyMatch2(c.Request.URL.Path, i.Url) && c.Request.Method == i.Method { + casbinExclude = true + break } } + if casbinExclude { + log.Infof("Casbin exclusion, no validation method:%s path:%s", c.Request.Method, c.Request.URL.Path) + c.Next() + return + } + res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) + if err != nil { + log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path) + response.Error(c, 500, err, "") + return + } if res { log.Infof("isTrue: %v role: %s method: %s path: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path) @@ -44,5 +56,6 @@ func AuthCheckRole() gin.HandlerFunc { c.Abort() return } + } } diff --git a/common/middleware/request_id.go b/common/middleware/request_id.go index 47161c3..8dedd83 100644 --- a/common/middleware/request_id.go +++ b/common/middleware/request_id.go @@ -1,6 +1,8 @@ package middleware import ( + "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/sdk/pkg" "net/http" "strings" @@ -24,6 +26,11 @@ func RequestId(trafficKey string) gin.HandlerFunc { } c.Request.Header.Set(trafficKey, requestId) c.Set(trafficKey, requestId) + c.Set(pkg.LoggerKey, + logger.NewHelper(logger.DefaultLogger). + WithFields(map[string]interface{}{ + trafficKey: requestId, + })) c.Next() } } diff --git a/common/middleware/settings.go b/common/middleware/settings.go new file mode 100644 index 0000000..b333f48 --- /dev/null +++ b/common/middleware/settings.go @@ -0,0 +1,41 @@ +package middleware + +type UrlInfo struct { + Url string + Method string +} + +// CasbinExclude casbin 排除的路由列表 +var CasbinExclude = []UrlInfo{ + {Url: "/api/v1/dict/type-option-select", Method: "GET"}, + {Url: "/api/v1/dict-data/option-select", Method: "GET"}, + {Url: "/api/v1/deptTree", Method: "GET"}, + {Url: "/api/v1/db/tables/page", Method: "GET"}, + {Url: "/api/v1/db/columns/page", Method: "GET"}, + {Url: "/api/v1/gen/toproject/:tableId", Method: "GET"}, + {Url: "/api/v1/gen/todb/:tableId", Method: "GET"}, + {Url: "/api/v1/gen/tabletree", Method: "GET"}, + {Url: "/api/v1/gen/preview/:tableId", Method: "GET"}, + {Url: "/api/v1/gen/apitofile/:tableId", Method: "GET"}, + {Url: "/api/v1/getCaptcha", Method: "GET"}, + {Url: "/api/v1/getinfo", Method: "GET"}, + {Url: "/api/v1/menuTreeselect", Method: "GET"}, + {Url: "/api/v1/menurole", Method: "GET"}, + {Url: "/api/v1/menuids", Method: "GET"}, + {Url: "/api/v1/roleMenuTreeselect/:roleId", Method: "GET"}, + {Url: "/api/v1/roleDeptTreeselect/:roleId", Method: "GET"}, + {Url: "/api/v1/refresh_token", Method: "GET"}, + {Url: "/api/v1/configKey/:configKey", Method: "GET"}, + {Url: "/api/v1/app-config", Method: "GET"}, + {Url: "/api/v1/user/profile", Method: "GET"}, + {Url: "/info", Method: "GET"}, + {Url: "/api/v1/login", Method: "POST"}, + {Url: "/api/v1/logout", Method: "POST"}, + {Url: "/api/v1/user/avatar", Method: "POST"}, + {Url: "/api/v1/user/pwd", Method: "PUT"}, + {Url: "/api/v1/metrics", Method: "GET"}, + {Url: "/api/v1/health", Method: "GET"}, + {Url: "/", Method: "GET"}, + {Url: "/api/v1/server-monitor", Method: "GET"}, + {Url: "/api/v1/public/uploadFile", Method: "POST"}, +} diff --git a/common/models/by.go b/common/models/by.go index 15d3b42..181c7ed 100644 --- a/common/models/by.go +++ b/common/models/by.go @@ -11,10 +11,12 @@ type ControlBy struct { UpdateBy int `json:"updateBy" gorm:"index;comment:更新者"` } +// SetCreateBy 设置创建人id func (e *ControlBy) SetCreateBy(createBy int) { e.CreateBy = createBy } +// SetUpdateBy 设置修改人id func (e *ControlBy) SetUpdateBy(updateBy int) { e.UpdateBy = updateBy } @@ -27,4 +29,4 @@ type ModelTime struct { CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` DeletedAt gorm.DeletedAt `json:"-" gorm:"index;comment:删除时间"` -} +} \ No newline at end of file diff --git a/common/models/menu.go b/common/models/menu.go new file mode 100644 index 0000000..e3b0c92 --- /dev/null +++ b/common/models/menu.go @@ -0,0 +1,11 @@ +package models + +// Menu 菜单中的类型枚举值 +const ( + // Directory 目录 + Directory string = "M" + // Menu 菜单 + Menu string = "C" + // Button 按钮 + Button string = "F" +) diff --git a/common/service/service.go b/common/service/service.go index 87e0cd6..0deb4a9 100644 --- a/common/service/service.go +++ b/common/service/service.go @@ -1,7 +1,9 @@ package service import ( - "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" + "fmt" + + "github.com/go-admin-team/go-admin-core/logger" "gorm.io/gorm" ) @@ -9,5 +11,15 @@ type Service struct { Orm *gorm.DB Msg string MsgID string - Log *logger.Logger + Log *logger.Helper + Error error +} + +func (db *Service) AddError(err error) error { + if db.Error == nil { + db.Error = err + } else if err != nil { + db.Error = fmt.Errorf("%v; %w", db.Error, err) + } + return db.Error } diff --git a/common/storage/initialize.go b/common/storage/initialize.go new file mode 100644 index 0000000..6fa323d --- /dev/null +++ b/common/storage/initialize.go @@ -0,0 +1,52 @@ +/* + * @Author: lwnmengjing + * @Date: 2021/6/10 3:39 下午 + * @Last Modified by: lwnmengjing + * @Last Modified time: 2021/6/10 3:39 下午 + */ + +package storage + +import ( + "log" + + "github.com/go-admin-team/go-admin-core/sdk" + "github.com/go-admin-team/go-admin-core/sdk/config" + "github.com/go-admin-team/go-admin-core/sdk/pkg/captcha" +) + +// Setup 配置storage组件 +func Setup() { + //4. 设置缓存 + cacheAdapter, err := config.CacheConfig.Setup() + if err != nil { + log.Fatalf("cache setup error, %s\n", err.Error()) + } + sdk.Runtime.SetCacheAdapter(cacheAdapter) + //5. 设置验证码store + captcha.SetStore(captcha.NewCacheStore(cacheAdapter, 600)) + + //6. 设置队列 + if !config.QueueConfig.Empty() { + if q := sdk.Runtime.GetQueueAdapter(); q != nil { + q.Shutdown() + } + queueAdapter, err := config.QueueConfig.Setup() + if err != nil { + log.Fatalf("queue setup error, %s\n", err.Error()) + } + sdk.Runtime.SetQueueAdapter(queueAdapter) + defer func() { + go queueAdapter.Run() + }() + } + + //7. 设置分布式锁 + if !config.LockerConfig.Empty() { + lockerAdapter, err := config.LockerConfig.Setup() + if err != nil { + log.Fatalf("locker setup error, %s\n", err.Error()) + } + sdk.Runtime.SetLockerAdapter(lockerAdapter) + } +} diff --git a/config/db.sql b/config/db.sql index d572e50..611a41d 100644 --- a/config/db.sql +++ b/config/db.sql @@ -1,160 +1,376 @@ -- 开始初始化数据 ; +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + BEGIN; -INSERT INTO sys_menu VALUES (2, 'Upms', '系统管理', 'example', '/upms', '/0/2', 'M', '无', '', 0, 1, '', 'Layout', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (3, 'Sysuser', '用户管理', 'user', 'sysuser', '/0/2/3', 'C', '无', 'system:sysuser:list', 2, NULL, NULL, '/sysuser/index', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:10:42', NULL); -INSERT INTO sys_menu VALUES (43, '', '新增用户', '', '/api/v1/sysuser', '/0/2/3/43', 'F', 'POST', 'system:sysuser:add', 3, NULL, NULL, NULL, 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (44, '', '查询用户', '', '/api/v1/sysuser', '/0/2/3/44', 'F', 'GET', 'system:sysuser:query', 3, NULL, NULL, NULL, 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (45, '', '修改用户', '', '/api/v1/sysuser/', '/0/2/3/45', 'F', 'PUT', 'system:sysuser:edit', 3, NULL, NULL, NULL, 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (46, '', '删除用户', '', '/api/v1/sysuser/', '/0/2/3/46', 'F', 'DELETE', 'system:sysuser:remove', 3, NULL, NULL, NULL, 0, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 15:32:45', NULL); -INSERT INTO sys_menu VALUES (51, 'Menu', '菜单管理', 'tree-table', 'menu', '/0/2/51', 'C', '无', 'system:sysmenu:list', 2, 1, '', '/menu/index', 3, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:16:30', NULL); -INSERT INTO sys_menu VALUES (52, 'Role', '角色管理', 'peoples', 'role', '/0/2/52', 'C', '无', 'system:sysrole:list', 2, 1, '', '/role/index', 2, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:16:19', NULL); -INSERT INTO sys_menu VALUES (56, 'Dept', '部门管理', 'tree', 'dept', '/0/2/56', 'C', '无', 'system:sysdept:list', 2, 0, '', '/dept/index', 4, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:16:47', NULL); -INSERT INTO sys_menu VALUES (57, 'post', '岗位管理', 'pass', 'post', '/0/2/57', 'C', '无', 'system:syspost:list', 2, 0, '', '/post/index', 5, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:16:53', NULL); -INSERT INTO sys_menu VALUES (58, 'Dict', '字典管理', 'education', 'dict', '/0/2/58', 'C', '无', 'system:sysdicttype:list', 2, 0, '', '/dict/index', 6, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:17:04', NULL); -INSERT INTO sys_menu VALUES (59, 'DictData', '字典数据', 'education', 'dict/data/:dictId', '/0/2/59', 'C', '无', 'system:sysdictdata:list', 2, 0, '', '/dict/data', 100, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:17:25', NULL); -INSERT INTO sys_menu VALUES (60, 'Tools', '系统工具', 'component', '/tools', '/0/60', 'M', '无', '', 0, 0, '', 'Layout', 3, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (61, 'Swagger', '系统接口', 'guide', 'swagger', '/0/60/61', 'C', '无', '', 60, 0, '', '/tools/swagger/index', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (62, 'Config', '参数设置', 'list', '/config', '/0/2/62', 'C', '无', 'system:sysconfig:list', 2, 0, '', '/config/index', 7, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:17:16', NULL); -INSERT INTO sys_menu VALUES (63, '', '接口权限', 'bug', '', '/0/63', 'M', '', '', 0, 0, '', '', 99, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 16:39:32', NULL); -INSERT INTO sys_menu VALUES (64, '', '用户管理', 'user', '', '/0/63/64', 'M', '', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (66, '', '菜单管理', 'tree-table', '', '/0/63/66', 'C', '', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (67, '', '菜单列表', 'tree-table', '/api/v1/menulist', '/0/63/66/67', 'A', 'GET', '', 66, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (68, '', '新建菜单', 'tree', '/api/v1/menu', '/0/63/66/68', 'A', 'POST', '', 66, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (69, '', '字典', 'dict', '', '/0/63/69', 'M', '', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (70, '', '类型', 'dict', '', '/0/63/69/70', 'C', '', '', 69, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (71, '', '字典类型获取', 'tree', '/api/v1/dict/databytype/', '/0/63/256/71', 'A', 'GET', '', 256, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (72, '', '修改菜单', 'bug', '/api/v1/menu', '/0/63/66/72', 'A', 'PUT', '', 66, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (73, '', '删除菜单', 'bug', '/api/v1/menu/:id', '/0/63/66/73', 'A', 'DELETE', '', 66, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (74, '', '管理员列表', 'bug', '/api/v1/sysUserList', '/0/63/64/74', 'A', 'GET', NULL, 64, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (75, '', '根据id获取管理员', 'bug', '/api/v1/sysUser/:id', '/0/63/64/75', 'A', 'GET', NULL, 64, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (76, '', '获取管理员', 'bug', '/api/v1/sysUser/', '/0/63/256/76', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-07-18 14:30:28', NULL); -INSERT INTO sys_menu VALUES (77, '', '创建管理员', 'bug', '/api/v1/sysUser', '/0/63/64/77', 'A', 'POST', NULL, 64, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (78, '', '修改管理员', 'bug', '/api/v1/sysUser', '/0/63/64/78', 'A', 'PUT', NULL, 64, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (79, '', '删除管理员', 'bug', '/api/v1/sysUser/:id', '/0/63/64/79', 'A', 'DELETE', NULL, 64, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (80, '', '当前用户个人信息', 'bug', '/api/v1/user/profile', '/0/63/256/267/80', 'A', 'GET', NULL, 267, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:50:40', NULL); -INSERT INTO sys_menu VALUES (81, '', '角色列表', 'bug', '/api/v1/rolelist', '/0/63/201/81', 'A', 'GET', NULL, 201, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (82, '', '获取角色信息', 'bug', '/api/v1/role/:id', '/0/63/201/82', 'A', 'GET', NULL, 201, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (83, '', '创建角色', 'bug', '/api/v1/role', '/0/63/201/83', 'A', 'POST', NULL, 201, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (84, '', '修改角色', 'bug', '/api/v1/role', '/0/63/201/84', 'A', 'PUT', NULL, 201, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (85, '', '删除角色', 'bug', '/api/v1/role/:id', '/0/63/201/85', 'A', 'DELETE', NULL, 201, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (86, '', '参数列表', 'bug', '/api/v1/configList', '/0/63/202/86', 'A', 'GET', NULL, 202, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (87, '', '根据id获取参数', 'bug', '/api/v1/config/:id', '/0/63/202/87', 'A', 'GET', NULL, 202, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (89, '', '创建参数', 'bug', '/api/v1/config', '/0/63/202/89', 'A', 'POST', NULL, 202, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (90, '', '修改参数', 'bug', '/api/v1/config', '/0/63/202/90', 'A', 'PUT', NULL, 202, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (91, '', '删除参数', 'bug', '/api/v1/config/:id', '/0/63/202/91', 'A', 'DELETE', NULL, 202, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (92, '', '获取角色菜单', 'bug', '/api/v1/menurole', '/0/63/256/92', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-07-10 20:47:39', NULL); -INSERT INTO sys_menu VALUES (93, '', '根据角色id获取角色', 'bug', '/api/v1/roleMenuTreeselect/:id', '/0/63/256/93', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-07-10 20:47:52', NULL); -INSERT INTO sys_menu VALUES (94, '', '获取菜单树', 'bug', '/api/v1/menuTreeselect', '/0/63/256/94', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:52:11', NULL); -INSERT INTO sys_menu VALUES (95, '', '获取角色菜单', 'bug', '/api/v1/rolemenu', '/0/63/205/95', 'A', 'GET', NULL, 205, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (96, '', '创建角色菜单', 'bug', '/api/v1/rolemenu', '/0/63/205/96', 'A', 'POST', NULL, 205, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (97, '', '删除用户菜单数据', 'bug', '/api/v1/rolemenu/:id', '/0/63/205/97', 'A', 'DELETE', NULL, 205, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (103, '', '部门菜单列表', 'bug', '/api/v1/deptList', '/0/63/203/103', 'A', 'GET', NULL, 203, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (104, '', '根据id获取部门信息', 'bug', '/api/v1/dept/:id', '/0/63/203/104', 'A', 'GET', NULL, 203, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (105, '', '创建部门', 'bug', '/api/v1/dept', '/0/63/203/105', 'A', 'POST', NULL, 203, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (106, '', '修改部门', 'bug', '/api/v1/dept', '/0/63/203/106', 'A', 'PUT', NULL, 203, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (107, '', '删除部门', 'bug', '/api/v1/dept/:id', '/0/63/203/107', 'A', 'DELETE', NULL, 203, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (108, '', '字典数据列表', 'bug', '/api/v1/dict/datalist', '/0/63/69/206/108', 'A', 'GET', NULL, 206, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (109, '', '通过编码获取字典数据', 'bug', '/api/v1/dict/data/:id', '/0/63/69/206/109', 'A', 'GET', NULL, 206, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (110, '', '通过字典类型获取字典数据', 'bug', '/api/v1/dict/databytype/:id', '/0/63/256/110', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (111, '', '创建字典数据', 'bug', '/api/v1/dict/data', '/0/63/69/206/111', 'A', 'POST', NULL, 206, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (112, '', '修改字典数据', 'bug', '/api/v1/dict/data/', '/0/63/69/206/112', 'A', 'PUT', NULL, 206, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (113, '', '删除字典数据', 'bug', '/api/v1/dict/data/:id', '/0/63/69/206/113', 'A', 'DELETE', NULL, 206, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (114, '', '字典类型列表', 'bug', '/api/v1/dict/typelist', '/0/63/69/70/114', 'A', 'GET', NULL, 70, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (115, '', '通过id获取字典类型', 'bug', '/api/v1/dict/type/:id', '/0/63/69/70/115', 'A', 'GET', NULL, 70, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (116, '', '创建字典类型', 'bug', '/api/v1/dict/type', '/0/63/69/70/116', 'A', 'POST', NULL, 70, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (117, '', '修改字典类型', 'bug', '/api/v1/dict/type', '/0/63/69/70/117', 'A', 'PUT', NULL, 70, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (118, '', '删除字典类型', 'bug', '/api/v1/dict/type/:id', '/0/63/69/70/118', 'A', 'DELETE', NULL, 70, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (119, '', '获取岗位列表', 'bug', '/api/v1/postlist', '/0/63/204/119', 'A', 'GET', NULL, 204, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (120, '', '通过id获取岗位信息', 'bug', '/api/v1/post/:id', '/0/63/204/120', 'A', 'GET', NULL, 204, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (121, '', '创建岗位', 'bug', '/api/v1/post', '/0/63/204/121', 'A', 'POST', NULL, 204, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (122, '', '修改岗位', 'bug', '/api/v1/post', '/0/63/204/122', 'A', 'PUT', NULL, 204, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (123, '', '删除岗位', 'bug', '/api/v1/post/:id', '/0/63/204/123', 'A', 'DELETE', NULL, 204, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (138, '', '获取根据id菜单信息', 'bug', '/api/v1/menu/:id', '/0/63/66/138', 'A', 'GET', NULL, 66, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (142, '', '获取角色对应的菜单id数组', 'bug', '/api/v1/menuids', '/0/63/256/142', 'A', 'GET', NULL, 256, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (201, '', '角色管理', 'peoples', '', '/0/63/201', 'C', 'GET', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (202, '', '参数设置', 'list', '', '/0/63/202', 'C', 'DELETE', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (203, '', '部门管理', 'tree', '', '/0/63/203', 'C', 'POST', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (204, '', '岗位管理', 'pass', '', '/0/63/204', 'C', '', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (205, '', '角色菜单管理', 'nested', '', '/0/63/205', 'C', '', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (206, '', '数据', '', '', '/0/63/69/206', 'C', 'PUT', '', 69, 0, '', '', 2, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (211, 'Log', '日志管理', 'log', '/log', '/0/2/211', 'M', '', '', 2, 0, '', '/log/index', 8, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:15:32', NULL); -INSERT INTO sys_menu VALUES (212, 'LoginLog', '登录日志', 'logininfor', '/loginlog', '/0/2/211/212', 'C', '', 'system:sysloginlog:list', 211, 0, '', '/loginlog/index', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (213, '', '获取登录日志', 'bug', '/api/v1/loginloglist', '/0/63/214/213', 'A', 'GET', NULL, 214, NULL, NULL, NULL, 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (214, '', '日志管理', 'log', '', '/0/63/214', 'M', 'GET', '', 63, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (215, '', '删除日志', 'bug', '/api/v1/loginlog/:id', '/0/63/214/215', 'A', 'DELETE', '', 214, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (216, 'OperLog', '操作日志', 'skill', '/operlog', '/0/2/211/216', 'C', '', 'system:sysoperlog:list', 211, 0, '', '/operlog/index', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (217, '', '获取操作日志', 'bug', '/api/v1/operloglist', '/0/63/214/217', 'A', 'GET', '', 214, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (220, '', '新增菜单', '', '', '/0/2/51/220', 'F', '', 'system:sysmenu:add', 51, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (221, '', '修改菜单', 'edit', '', '/0/2/51/221', 'F', '', 'system:sysmenu:edit', 51, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (222, '', '查询菜单', 'search', '', '/0/2/51/222', 'F', '', 'system:sysmenu:query', 51, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (223, '', '删除菜单', '', '', '/0/2/51/223', 'F', '', 'system:sysmenu:remove', 51, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (224, '', '新增角色', '', '', '/0/2/52/224', 'F', '', 'system:sysrole:add', 52, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (225, '', '查询角色', '', '', '/0/2/52/225', 'F', '', 'system:sysrole:query', 52, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (226, '', '修改角色', '', '', '/0/2/52/226', 'F', '', 'system:sysrole:edit', 52, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (227, '', '删除角色', '', '', '/0/2/52/227', 'F', '', 'system:sysrole:remove', 52, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (228, '', '查询部门', '', '', '/0/2/56/228', 'F', '', 'system:sysdept:query', 56, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (229, '', '新增部门', '', '', '/0/2/56/229', 'F', '', 'system:sysdept:add', 56, 0, '', '', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (230, '', '修改部门', '', '', '/0/2/56/230', 'F', '', 'system:sysdept:edit', 56, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (231, '', '删除部门', '', '', '/0/2/56/231', 'F', '', 'system:sysdept:remove', 56, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (232, '', '查询岗位', '', '', '/0/2/57/232', 'F', '', 'system:syspost:query', 57, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (233, '', '新增岗位', '', '', '/0/2/57/233', 'F', '', 'system:syspost:add', 57, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (234, '', '修改岗位', '', '', '/0/2/57/234', 'F', '', 'system:syspost:edit', 57, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (235, '', '删除岗位', '', '', '/0/2/57/235', 'F', '', 'system:syspost:remove', 57, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (236, '', '字典查询', '', '', '/0/2/58/236', 'F', '', 'system:sysdicttype:query', 58, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (237, '', '新增类型', '', '', '/0/2/58/237', 'F', '', 'system:sysdicttype:add', 58, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (238, '', '修改类型', '', '', '/0/2/58/238', 'F', '', 'system:sysdicttype:edit', 58, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (239, '', '删除类型', '', '', '/0/2/58/239', 'F', '', 'system:sysdicttype:remove', 58, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (240, '', '查询数据', '', '', '/0/2/59/240', 'F', '', 'system:sysdictdata:query', 59, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (241, '', '新增数据', '', '', '/0/2/59/241', 'F', '', 'system:sysdictdata:add', 59, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (242, '', '修改数据', '', '', '/0/2/59/242', 'F', '', 'system:sysdictdata:edit', 59, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (243, '', '删除数据', '', '', '/0/2/59/243', 'F', '', 'system:sysdictdata:remove', 59, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (244, '', '查询参数', '', '', '/0/2/62/244', 'F', '', 'system:sysconfig:query', 62, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (245, '', '新增参数', '', '', '/0/2/62/245', 'F', '', 'system:sysconfig:add', 62, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (246, '', '修改参数', '', '', '/0/2/62/246', 'F', '', 'system:sysconfig:edit', 62, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (247, '', '删除参数', '', '', '/0/2/62/247', 'F', '', 'system:sysconfig:remove', 62, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (248, '', '查询登录日志', '', '', '/0/2/211/212/248', 'F', '', 'system:sysloginlog:query', 212, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (249, '', '删除登录日志', '', '', '/0/2/211/212/249', 'F', '', 'system:sysloginlog:remove', 212, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (250, '', '查询操作日志', '', '', '/0/2/211/216/250', 'F', '', 'system:sysoperlog:query', 216, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (251, '', '删除操作日志', '', '', '/0/2/211/216/251', 'F', '', 'system:sysoperlog:remove', 216, 0, '', '', 0, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (252, '', '获取登录用户信息', '', '/api/v1/getinfo', '/0/63/256/252', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (253, '', '角色数据权限', '', '/api/v1/roledatascope', '/0/63/256/253', 'A', 'PUT', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-07-10 20:47:58', NULL); -INSERT INTO sys_menu VALUES (254, '', '部门树接口【数据权限】', '', '/api/v1/roleDeptTreeselect/:id', '/0/63/256/254', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (255, '', '部门树【用户列表】', '', '/api/v1/deptTree', '/0/63/256/255', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (256, '', '必开接口', '', '', '/0/63/256', 'M', 'GET', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (257, '', '通过key获取参数', 'bug', '/api/v1/configKey/:id', '/0/63/256/257', 'A', 'GET', '', 256, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (258, '', '退出登录', '', '/api/v1/logout', '/0/63/256/258', 'A', 'POST', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (259, '', '头像上传', '', '/api/v1/user/avatar', '/0/63/256/267/259', 'A', 'POST', '', 267, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:50:05', NULL); -INSERT INTO sys_menu VALUES (260, '', '修改密码', '', '/api/v1/user/pwd', '/0/63/256/260', 'A', 'PUT', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (261, 'Gen', '代码生成', 'code', 'gen', '/0/60/261', 'C', '', '', 60, 0, '', '/tools/gen/index', 2, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:18:12', NULL); -INSERT INTO sys_menu VALUES (262, 'EditTable', '代码生成修改', 'build', 'editTable', '/0/60/262', 'C', '', '', 60, 0, '', '/tools/gen/editTable', 100, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:38:36', NULL); -INSERT INTO sys_menu VALUES (263, '', '字典类型下拉框【生成功能】', '', '/api/v1/dict/typeoptionselect', '/0/63/256/263', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL); -INSERT INTO sys_menu VALUES (264, 'Build', '表单构建', 'build', 'build', '/0/60/264', 'C', '', '', 60, 0, '', '/tools/build/index', 1, '0', '1', '1', '1', '2020-04-11 15:52:48', '2020-07-18 13:51:47', NULL); -INSERT INTO sys_menu VALUES (267, '', '个人中心', '', '', '/0/63/256/267', 'M', '', '', 256, 0, '', '', 0, '1', '1', '1', '1', '2020-05-03 20:49:39', '2020-05-03 20:49:39', NULL); -INSERT INTO sys_menu VALUES (269, 'Server', '服务监控', 'druid', 'system/monitor', '/0/60/269', 'C', '', 'monitor:server:list', 60, 0, '', '/system/monitor', 0, '0', '1', '1', '1', '2020-04-14 00:28:19', '2020-08-09 02:07:53', NULL); -INSERT INTO sys_menu VALUES (459, 'sys_job管理', '定时任务', 'time-range', '/sys_job', '/0/459', 'M', '无', '', 0, 0, '', 'Layout', 2, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-09 01:27:11', NULL); -INSERT INTO sys_menu VALUES (460, 'sys_job管理', '定时任务', 'tool', 'sys_job', '/0/459/460', 'C', '无', 'sysjob:sysjob:list', 459, 0, '', '/sysjob/index', 0, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-04 15:18:32', NULL); -INSERT INTO sys_menu VALUES (461, 'sys_job', '分页获取定时任务', 'pass', 'sys_job', '/0/459/460/461', 'F', '无', 'sysjob:sysjob:query', 460, 0, '', '', 0, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (462, 'sys_job', '创建定时任务', 'pass', 'sys_job', '/0/459/460/462', 'F', '无', 'sysjob:sysjob:add', 460, 0, '', '', 0, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (463, 'sys_job', '修改定时任务', 'pass', 'sys_job', '/0/459/460/463', 'F', '无', 'sysjob:sysjob:edit', 460, 0, '', '', 0, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (464, 'sys_job', '删除定时任务', 'pass', 'sys_job', '/0/459/460/464', 'F', '无', 'sysjob:sysjob:remove', 460, 0, '', '', 0, '0', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (465, 'sys_job', '定时任务', 'bug', 'sys_job', '/0/63/465', 'M', '无', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (466, 'sys_job', '分页获取定时任务', 'bug', '/api/v1/sysjob', '/0/63/465/466', 'A', 'GET', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (467, 'sys_job', '根据id获取定时任务', 'bug', '/api/v1/sysjob/:id', '/0/63/465/467', 'A', 'GET', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (468, 'sys_job', '创建定时任务', 'bug', '/api/v1/sysjob', '/0/63/465/468', 'A', 'POST', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (469, 'sys_job', '修改定时任务', 'bug', '/api/v1/sysjob', '/0/63/465/469', 'A', 'PUT', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (470, 'sys_job', '删除定时任务', 'bug', '/api/v1/sysjob/:id', '/0/63/465/470', 'A', 'DELETE', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL); -INSERT INTO sys_menu VALUES (471, 'job_log', '日志', 'bug', 'job_log', '/0/459/471', 'C', '', '', 459, 0, '', '/sysjob/log', 0, '1', '1', '1', '1', '2020-08-05 21:24:46', '2020-08-06 00:02:20', NULL); --- INSERT INTO sys_menu VALUES (473, 'sysSetting', '系统配置', 'form', 'syssettings', '/0/60/473', 'C', '无', 'syssetting:syssetting:list', 60, 0, '', '/system/settings', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 02:17:10', NULL); --- INSERT INTO sys_menu VALUES (474, 'sys_setting', '分页获取SysSetting', 'pass', 'sys_setting', '/0/60/473/474', 'F', '无', 'syssetting:syssetting:query', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (475, 'sys_setting', '创建SysSetting', 'pass', 'sys_setting', '/0/60/473/475', 'F', '无', 'syssetting:syssetting:add', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (476, 'sys_setting', '修改SysSetting', 'pass', 'sys_setting', '/0/60/473/476', 'F', '无', 'syssetting:syssetting:edit', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (477, 'sys_setting', '删除SysSetting', 'pass', 'sys_setting', '/0/60/473/477', 'F', '无', 'syssetting:syssetting:remove', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (478, 'sys_setting', 'SysSetting', 'bug', 'sys_setting', '/0/63/478', 'M', '无', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (479, 'sys_setting', '分页获取SysSetting', 'bug', '/api/v1/syssettingList', '/0/63/478/479', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (480, 'sys_setting', '根据id获取SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/480', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (481, 'sys_setting', '创建SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/481', 'A', 'POST', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (482, 'sys_setting', '修改SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/482', 'A', 'PUT', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); --- INSERT INTO sys_menu VALUES (483, 'sys_setting', '删除SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/483', 'A', 'DELETE', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL); +insert into sys_api (id, handle, title, path, type, action, created_at, updated_at, deleted_at, create_by, update_by) +values (5, 'go-admin/app/admin/apis.SysLoginLog.Get-fm', '登陆日志通过id获取', '/api/v1/sys-login-log/:id', 'BUS', 'GET', '2021-05-13 19:59:00.728', '2021-06-13 20:53:47.671', null, 0, 0), + (6, 'go-admin/app/admin/apis.SysOperaLog.GetPage-fm', '操作日志列表', '/api/v1/sys-opera-log', 'BUS', 'GET', '2021-05-13 19:59:00.778', '2021-06-13 20:53:47.712', null, 0, 0), + (7, 'go-admin/app/admin/apis.SysOperaLog.Get-fm', '操作日志通过id获取', '/api/v1/sys-opera-log/:id', 'BUS', 'GET', '2021-05-13 19:59:00.821', '2021-06-13 20:53:47.754', null, 0, 0), + (8, 'go-admin/common/actions.IndexAction.func1', '分类列表', '/api/v1/syscategory', 'BUS', 'GET', '2021-05-13 19:59:00.870', '2021-06-13 20:53:47.883', null, 0, 0), + (9, 'go-admin/common/actions.ViewAction.func1', '分类通过id获取', '/api/v1/syscategory/:id', 'BUS', 'GET', '2021-05-13 19:59:00.945', '2021-06-13 20:53:47.926', null, 0, 0), + (10, 'go-admin/common/actions.IndexAction.func1', '内容列表', '/api/v1/syscontent', 'BUS', 'GET', '2021-05-13 19:59:01.005', '2021-06-13 20:53:47.966', null, 0, 0), + (11, 'go-admin/common/actions.ViewAction.func1', '内容通过id获取', '/api/v1/syscontent/:id', 'BUS', 'GET', '2021-05-13 19:59:01.056', '2021-06-13 20:53:48.005', null, 0, 0), + (15, 'go-admin/common/actions.IndexAction.func1', 'job列表', '/api/v1/sysjob', 'BUS', 'GET', '2021-05-13 19:59:01.248', '2021-06-13 20:53:48.169', null, 0, 0), + (16, 'go-admin/common/actions.ViewAction.func1', 'job通过id获取', '/api/v1/sysjob/:id', 'BUS', 'GET', '2021-05-13 19:59:01.298', '2021-06-13 20:53:48.214', null, 0, 0), + (17, 'go-admin/app/other/apis.SysChinaAreaData.GetPage-fm', '行政区列表', '/api/v1/sys-area-data', 'BUS', 'GET', '2021-05-13 19:59:01.342', '2021-06-13 20:53:47.453', null, 0, 0), + (18, 'go-admin/app/other/apis.SysChinaAreaData.Get-fm', '行政区通过id获取', '/api/v1/sys-area-data/:id', 'BUS', 'GET', '2021-05-13 19:59:01.390', '2021-06-13 20:53:47.497', null, 0, 0), + (21, 'go-admin/app/admin/apis.SysDictType.GetPage-fm', '字典类型列表', '/api/v1/dict/type', 'BUS', 'GET', '2021-05-13 19:59:01.525', '2021-06-13 20:53:48.340', null, 0, 0), + (22, 'go-admin/app/admin/apis.SysDictType.GetAll-fm', '字典类型查询【代码生成】', '/api/v1/dict/type-option-select', 'SYS', 'GET', '2021-05-13 19:59:01.582', '2021-06-13 20:53:48.388', null, 0, 0), + (23, 'go-admin/app/admin/apis.SysDictType.Get-fm', '字典类型通过id获取', '/api/v1/dict/type/:id', 'BUS', 'GET', '2021-05-13 19:59:01.632', '2021-06-13 20:53:48.431', null, 0, 0), + (24, 'go-admin/app/admin/apis.SysDictData.GetPage-fm', '字典数据列表', '/api/v1/dict/data', 'BUS', 'GET', '2021-05-13 19:59:01.684', '2021-06-13 20:53:48.473', null, 0, 0), + (25, 'go-admin/app/admin/apis.SysDictData.Get-fm', '字典数据通过code获取', '/api/v1/dict/data/:dictCode', 'BUS', 'GET', '2021-05-13 19:59:01.732', '2021-06-13 20:53:48.522', null, 0, 0), + (26, 'go-admin/app/admin/apis.SysDictData.GetSysDictDataAll-fm', '数据字典根据key获取', '/api/v1/dict-data/option-select', 'SYS', 'GET', '2021-05-13 19:59:01.832', '2021-06-13 20:53:48.563', null, 0, 0), + (27, 'go-admin/app/admin/apis.SysDept.GetPage-fm', '部门列表', '/api/v1/dept', 'BUS', 'GET', '2021-05-13 19:59:01.940', '2021-06-13 20:53:48.605', null, 0, 0), + (28, 'go-admin/app/admin/apis.SysDept.Get-fm', '部门通过id获取', '/api/v1/dept/:id', 'BUS', 'GET', '2021-05-13 19:59:02.009', '2021-06-13 20:53:48.647', null, 0, 0), + (29, 'go-admin/app/admin/apis.SysDept.Get2Tree-fm', '查询部门下拉树【角色权限-自定权限】', '/api/v1/deptTree', 'SYS', 'GET', '2021-05-13 19:59:02.050', '2021-06-13 20:53:48.689', null, 0, 0), + (30, 'go-admin/app/admin/apis/tools.(*Gen).GetDBTableList-fm', '数据库表列表', '/api/v1/db/tables/page', 'SYS', 'GET', '2021-05-13 19:59:02.098', '2021-06-13 20:53:48.730', null, 0, 0), + (31, 'go-admin/app/admin/apis/tools.(*Gen).GetDBColumnList-fm', '数据表列列表', '/api/v1/db/columns/page', 'SYS', 'GET', '2021-05-13 19:59:02.140', '2021-06-13 20:53:48.771', null, 0, 0), + (32, 'go-admin/app/admin/apis/tools.Gen.GenCode-fm', '数据库表生成到项目', '/api/v1/gen/toproject/:tableId', 'SYS', 'GET', '2021-05-13 19:59:02.183', '2021-06-13 20:53:48.812', null, 0, 0), + (33, 'go-admin/app/admin/apis/tools.Gen.GenMenuAndApi-fm', '数据库表生成到DB', '/api/v1/gen/todb/:tableId', 'SYS', 'GET', '2021-05-13 19:59:02.227', '2021-06-13 20:53:48.853', null, 0, 0), + (34, 'go-admin/app/admin/apis/tools.(*SysTable).GetSysTablesTree-fm', '关系表数据【代码生成】', '/api/v1/gen/tabletree', 'SYS', 'GET', '2021-05-13 19:59:02.271', '2021-06-13 20:53:48.893', null, 0, 0), + (35, 'go-admin/app/admin/apis/tools.Gen.Preview-fm', '生成预览通过id获取', '/api/v1/gen/preview/:tableId', 'SYS', 'GET', '2021-05-13 19:59:02.315', '2021-06-13 20:53:48.935', null, 0, 0), + (36, 'go-admin/app/admin/apis/tools.Gen.GenApiToFile-fm', '生成api带文件', '/api/v1/gen/apitofile/:tableId', 'SYS', 'GET', '2021-05-13 19:59:02.357', '2021-06-13 20:53:48.977', null, 0, 0), + (37, 'go-admin/app/admin/apis.System.GenerateCaptchaHandler-fm', '验证码获取', '/api/v1/getCaptcha', 'SYS', 'GET', '2021-05-13 19:59:02.405', '2021-06-13 20:53:49.020', null, 0, 0), + (38, 'go-admin/app/admin/apis.SysUser.GetInfo-fm', '用户信息获取', '/api/v1/getinfo', 'SYS', 'GET', '2021-05-13 19:59:02.447', '2021-06-13 20:53:49.065', null, 0, 0), + (39, 'go-admin/app/admin/apis.SysMenu.GetPage-fm', '菜单列表', '/api/v1/menu', 'BUS', 'GET', '2021-05-13 19:59:02.497', '2021-06-13 20:53:49.491', null, 0, 0), + (40, 'go-admin/app/admin/apis.SysMenu.GetMenuTreeSelect-fm', '查询菜单下拉树结构【废弃】', '/api/v1/menuTreeselect', 'SYS', 'GET', '2021-05-13 19:59:02.542', '2021-06-03 22:37:21.857', null, 0, 0), + (41, 'go-admin/app/admin/apis.SysMenu.Get-fm', '菜单通过id获取', '/api/v1/menu/:id', 'BUS', 'GET', '2021-05-13 19:59:02.584', '2021-06-13 20:53:49.530', null, 0, 0), + (42, 'go-admin/app/admin/apis.SysMenu.GetMenuRole-fm', '角色菜单【顶部左侧菜单】', '/api/v1/menurole', 'SYS', 'GET', '2021-05-13 19:59:02.630', '2021-06-13 20:53:49.574', null, 0, 0), + (43, 'go-admin/app/admin/apis.SysMenu.GetMenuIDS-fm', '获取角色对应的菜单id数组【废弃】', '/api/v1/menuids', 'SYS', 'GET', '2021-05-13 19:59:02.675', '2021-06-03 22:39:52.500', null, 0, 0), + (44, 'go-admin/app/admin/apis.SysRole.GetPage-fm', '角色列表', '/api/v1/role', 'BUS', 'GET', '2021-05-13 19:59:02.720', '2021-06-13 20:53:49.108', null, 0, 0), + (45, 'go-admin/app/admin/apis.SysMenu.GetMenuTreeSelect-fm', '菜单权限列表【角色配菜单使用】', '/api/v1/roleMenuTreeselect/:roleId', 'SYS', 'GET', '2021-05-13 19:59:02.762', '2021-06-13 20:53:49.154', null, 0, 0), + (46, 'go-admin/app/admin/apis.SysDept.GetDeptTreeRoleSelect-fm', '角色部门结构树【自定义数据权限】', '/api/v1/roleDeptTreeselect/:roleId', 'SYS', 'GET', '2021-05-13 19:59:02.809', '2021-06-13 20:53:49.196', null, 0, 0), + (47, 'go-admin/app/admin/apis.SysRole.Get-fm', '角色通过id获取', '/api/v1/role/:id', 'BUS', 'GET', '2021-05-13 19:59:02.850', '2021-06-13 20:53:49.236', null, 0, 0), + (48, 'github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth.(*GinJWTMiddleware).RefreshHandler-fm', '刷新token', '/api/v1/refresh_token', 'SYS', 'GET', '2021-05-13 19:59:02.892', '2021-06-13 20:53:49.278', null, 0, 0), + (49, 'go-admin/app/other/apis.SysFileDir.GetPage-fm', '文件夹列表', '/api/v1/file-dir', 'BUS', 'GET', '2021-05-13 19:59:02.937', '2021-06-13 20:53:49.321', null, 0, 0), + (50, 'go-admin/app/other/apis.SysFileDir.Get-fm', '文件夹通过id获取', '/api/v1/file-dir/:id', 'BUS', 'GET', '2021-05-13 19:59:02.981', '2021-06-13 20:53:49.364', null, 0, 0), + (51, 'go-admin/app/other/apis.SysFileInfo.GetPage-fm', '文件列表', '/api/v1/file-info', 'BUS', 'GET', '2021-05-13 19:59:03.028', '2021-06-13 20:53:49.405', null, 0, 0), + (52, 'go-admin/app/other/apis.SysFileInfo.Get-fm', '文件通过id获取', '/api/v1/file-info/:id', 'BUS', 'GET', '2021-05-13 19:59:03.069', '2021-06-13 20:53:49.448', null, 0, 0), + (53, 'go-admin/app/admin/apis.SysConfig.GetPage-fm', '参数列表', '/api/v1/config', 'BUS', 'GET', '2021-05-13 19:59:03.116', '2021-06-13 20:53:49.656', null, 0, 0), + (54, 'go-admin/app/admin/apis.SysConfig.Get-fm', '参数通过id获取', '/api/v1/config/:id', 'BUS', 'GET', '2021-05-13 19:59:03.157', '2021-06-13 20:53:49.699', null, 0, 0), + (55, 'go-admin/app/admin/apis.SysConfig.GetSysConfigByKEYForService-fm', '参数通过键名搜索【基础默认配置】', '/api/v1/configKey/:configKey', 'SYS', 'GET', '2021-05-13 19:59:03.198', '2021-06-13 20:53:49.745', null, 0, 0), + (57, 'go-admin/app/jobs/apis.SysJob.RemoveJobForService-fm', 'job移除', '/api/v1/job/remove/:id', 'BUS', 'GET', '2021-05-13 19:59:03.295', '2021-06-13 20:53:49.786', null, 0, 0), + (58, 'go-admin/app/jobs/apis.SysJob.StartJobForService-fm', 'job启动', '/api/v1/job/start/:id', 'BUS', 'GET', '2021-05-13 19:59:03.339', '2021-06-13 20:53:49.829', null, 0, 0), + (59, 'go-admin/app/admin/apis.SysPost.GetPage-fm', '岗位列表', '/api/v1/post', 'BUS', 'GET', '2021-05-13 19:59:03.381', '2021-06-13 20:53:49.868', null, 0, 0), + (60, 'go-admin/app/admin/apis.SysPost.Get-fm', '岗位通过id获取', '/api/v1/post/:id', 'BUS', 'GET', '2021-05-13 19:59:03.433', '2021-06-13 20:53:49.909', null, 0, 0), + (62, 'go-admin/app/admin/apis.SysConfig.GetSysConfigBySysApp-fm', '系统前端参数', '/api/v1/app-config', 'SYS', 'GET', '2021-05-13 19:59:03.526', '2021-06-13 20:53:49.994', null, 0, 0), + (63, 'go-admin/app/admin/apis.SysUser.GetProfile-fm', '*用户信息获取', '/api/v1/user/profile', 'SYS', 'GET', '2021-05-13 19:59:03.567', '2021-06-13 20:53:50.038', null, 0, 0), + (66, 'github.com/go-admin-team/go-admin-core/sdk/pkg/ws.(*Manager).WsClient-fm', '链接ws【定时任务log】', '/ws/:id/:channel', 'BUS', 'GET', '2021-05-13 19:59:03.705', '2021-06-13 20:53:50.167', null, 0, 0), + (67, 'github.com/go-admin-team/go-admin-core/sdk/pkg/ws.(*Manager).UnWsClient-fm', '退出ws【定时任务log】', '/wslogout/:id/:channel', 'BUS', 'GET', '2021-05-13 19:59:03.756', '2021-06-13 20:53:50.209', null, 0, 0), + (68, 'go-admin/common/middleware/handler.Ping', '*用户基本信息', '/info', 'SYS', 'GET', '2021-05-13 19:59:03.800', '2021-06-13 20:53:50.251', null, 0, 0), + (72, 'go-admin/common/actions.CreateAction.func1', '分类创建', '/api/v1/syscategory', 'BUS', 'POST', '2021-05-13 19:59:03.982', '2021-06-13 20:53:50.336', null, 0, 0), + (73, 'go-admin/common/actions.CreateAction.func1', '内容创建', '/api/v1/syscontent', 'BUS', 'POST', '2021-05-13 19:59:04.027', '2021-06-13 20:53:50.375', null, 0, 0), + (76, 'go-admin/common/actions.CreateAction.func1', 'job创建', '/api/v1/sysjob', 'BUS', 'POST', '2021-05-13 19:59:04.164', '2021-06-13 20:53:50.500', null, 0, 0), + (77, 'go-admin/app/other/apis.SysChinaAreaData.Insert-fm', '行政区创建', '/api/v1/sys-area-data', 'BUS', 'POST', '2021-05-13 19:59:04.210', '2021-06-13 20:53:50.416', null, 0, 0), + (80, 'go-admin/app/admin/apis.SysDictData.Insert-fm', '字典数据创建', '/api/v1/dict/data', 'BUS', 'POST', '2021-05-13 19:59:04.347', '2021-06-13 20:53:50.579', null, 0, 0), + (81, 'go-admin/app/admin/apis.SysDictType.Insert-fm', '字典类型创建', '/api/v1/dict/type', 'BUS', 'POST', '2021-05-13 19:59:04.391', '2021-06-13 20:53:50.621', null, 0, 0), + (82, 'go-admin/app/admin/apis.SysDept.Insert-fm', '部门创建', '/api/v1/dept', 'BUS', 'POST', '2021-05-13 19:59:04.435', '2021-06-13 20:53:50.662', null, 0, 0), + (83, 'go-admin/app/other/apis.SysFileDir.Insert-fm', '文件夹创建', '/api/v1/file-dir', 'BUS', 'POST', '2021-05-13 19:59:04.500', '2021-06-13 20:53:50.703', null, 0, 0), + (84, 'go-admin/app/other/apis.SysFileInfo.Insert-fm', '文件创建', '/api/v1/file-info', 'BUS', 'POST', '2021-05-13 19:59:04.551', '2021-06-13 20:53:50.743', null, 0, 0), + (85, 'github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth.(*GinJWTMiddleware).LoginHandler-fm', '*登录', '/api/v1/login', 'SYS', 'POST', '2021-05-13 19:59:04.597', '2021-06-13 20:53:50.784', null, 0, 0), + (86, 'go-admin/common/middleware/handler.LogOut', '*退出', '/api/v1/logout', 'SYS', 'POST', '2021-05-13 19:59:04.642', '2021-06-13 20:53:50.824', null, 0, 0), + (87, 'go-admin/app/admin/apis.SysConfig.Insert-fm', '参数创建', '/api/v1/config', 'BUS', 'POST', '2021-05-13 19:59:04.685', '2021-06-13 20:53:50.949', null, 0, 0), + (88, 'go-admin/app/admin/apis.SysMenu.Insert-fm', '菜单创建', '/api/v1/menu', 'BUS', 'POST', '2021-05-13 19:59:04.777', '2021-06-13 20:53:50.992', null, 0, 0), + (89, 'go-admin/app/admin/apis.SysPost.Insert-fm', '岗位创建', '/api/v1/post', 'BUS', 'POST', '2021-05-13 19:59:04.886', '2021-06-13 20:53:50.907', null, 0, 0), + (90, 'go-admin/app/admin/apis.SysRole.Insert-fm', '角色创建', '/api/v1/role', 'BUS', 'POST', '2021-05-13 19:59:04.975', '2021-06-13 20:53:51.035', null, 0, 0), + (91, 'go-admin/app/admin/apis.SysUser.InsetAvatar-fm', '*用户头像编辑', '/api/v1/user/avatar', 'SYS', 'POST', '2021-05-13 19:59:05.058', '2021-06-13 20:53:51.079', null, 0, 0), + (92, 'go-admin/app/admin/apis.SysApi.Update-fm', '接口编辑', '/api/v1/sys-api/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.122', '2021-06-13 20:53:51.162', null, 0, 0), + (95, 'go-admin/common/actions.UpdateAction.func1', '分类编辑', '/api/v1/syscategory/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.255', '2021-06-13 20:53:51.247', null, 0, 0), + (96, 'go-admin/common/actions.UpdateAction.func1', '内容编辑', '/api/v1/syscontent/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.299', '2021-06-13 20:53:51.289', null, 0, 0), + (97, 'go-admin/common/actions.UpdateAction.func1', 'job编辑', '/api/v1/sysjob', 'BUS', 'PUT', '2021-05-13 19:59:05.343', '2021-06-13 20:53:51.331', null, 0, 0), + (98, 'go-admin/app/other/apis.SysChinaAreaData.Update-fm', '行政区编辑', '/api/v1/sys-area-data/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.387', '2021-06-13 20:53:51.120', null, 0, 0), + (101, 'go-admin/app/admin/apis.SysDictData.Update-fm', '字典数据编辑', '/api/v1/dict/data/:dictCode', 'BUS', 'PUT', '2021-05-13 19:59:05.519', '2021-06-13 20:53:51.467', null, 0, 0), + (102, 'go-admin/app/admin/apis.SysDictType.Update-fm', '字典类型编辑', '/api/v1/dict/type/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.569', '2021-06-13 20:53:51.509', null, 0, 0), + (103, 'go-admin/app/admin/apis.SysDept.Update-fm', '部门编辑', '/api/v1/dept/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.613', '2021-06-13 20:53:51.551', null, 0, 0), + (104, 'go-admin/app/other/apis.SysFileDir.Update-fm', '文件夹编辑', '/api/v1/file-dir/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.662', '2021-06-13 20:53:51.847', null, 0, 0), + (105, 'go-admin/app/other/apis.SysFileInfo.Update-fm', '文件编辑', '/api/v1/file-info/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.709', '2021-06-13 20:53:51.892', null, 0, 0), + (106, 'go-admin/app/admin/apis.SysRole.Update-fm', '角色编辑', '/api/v1/role/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.752', '2021-06-13 20:53:51.592', null, 0, 0), + (107, 'go-admin/app/admin/apis.SysRole.Update2DataScope-fm', '角色数据权限修改', '/api/v1/roledatascope', 'BUS', 'PUT', '2021-05-13 19:59:05.803', '2021-06-13 20:53:51.682', null, 0, 0), + (108, 'go-admin/app/admin/apis.SysConfig.Update-fm', '参数编辑', '/api/v1/config/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.848', '2021-06-13 20:53:51.937', null, 0, 0), + (109, 'go-admin/app/admin/apis.SysMenu.Update-fm', '编辑菜单', '/api/v1/menu/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.891', '2021-06-13 20:53:51.979', null, 0, 0), + (110, 'go-admin/app/admin/apis.SysPost.Update-fm', '岗位编辑', '/api/v1/post/:id', 'BUS', 'PUT', '2021-05-13 19:59:05.934', '2021-06-13 20:53:52.021', null, 0, 0), + (111, 'go-admin/app/admin/apis.SysUser.UpdatePwd-fm', '*用户修改密码', '/api/v1/user/pwd', 'SYS', 'PUT', '2021-05-13 19:59:05.987', '2021-06-13 20:53:51.724', null, 0, 0), + (112, 'go-admin/common/actions.DeleteAction.func1', '分类删除', '/api/v1/syscategory', 'BUS', 'DELETE', '2021-05-13 19:59:06.030', '2021-06-13 20:53:52.237', null, 0, 0), + (113, 'go-admin/common/actions.DeleteAction.func1', '内容删除', '/api/v1/syscontent', 'BUS', 'DELETE', '2021-05-13 19:59:06.076', '2021-06-13 20:53:52.278', null, 0, 0), + (114, 'go-admin/app/admin/apis.SysLoginLog.Delete-fm', '登陆日志删除', '/api/v1/sys-login-log', 'BUS', 'DELETE', '2021-05-13 19:59:06.118', '2021-06-13 20:53:52.102', null, 0, 0), + (115, 'go-admin/app/admin/apis.SysOperaLog.Delete-fm', '操作日志删除', '/api/v1/sys-opera-log', 'BUS', 'DELETE', '2021-05-13 19:59:06.162', '2021-06-13 20:53:52.146', null, 0, 0), + (116, 'go-admin/common/actions.DeleteAction.func1', 'job删除', '/api/v1/sysjob', 'BUS', 'DELETE', '2021-05-13 19:59:06.206', '2021-06-13 20:53:52.323', null, 0, 0), + (117, 'go-admin/app/other/apis.SysChinaAreaData.Delete-fm', '行政区删除', '/api/v1/sys-area-data', 'BUS', 'DELETE', '2021-05-13 19:59:06.249', '2021-06-13 20:53:52.061', null, 0, 0), + (120, 'go-admin/app/admin/apis.SysDictData.Delete-fm', '字典数据删除', '/api/v1/dict/data', 'BUS', 'DELETE', '2021-05-13 19:59:06.387', '2021-06-13 20:53:52.412', null, 0, 0), + (121, 'go-admin/app/admin/apis.SysDictType.Delete-fm', '字典类型删除', '/api/v1/dict/type', 'BUS', 'DELETE', '2021-05-13 19:59:06.432', '2021-06-13 20:53:52.455', null, 0, 0), + (122, 'go-admin/app/admin/apis.SysDept.Delete-fm', '部门删除', '/api/v1/dept/:id', 'BUS', 'DELETE', '2021-05-13 19:59:06.475', '2021-06-13 20:53:52.497', null, 0, 0), + (123, 'go-admin/app/other/apis.SysFileDir.Delete-fm', '文件夹删除', '/api/v1/file-dir/:id', 'BUS', 'DELETE', '2021-05-13 19:59:06.520', '2021-06-13 20:53:52.539', null, 0, 0), + (124, 'go-admin/app/other/apis.SysFileInfo.Delete-fm', '文件删除', '/api/v1/file-info/:id', 'BUS', 'DELETE', '2021-05-13 19:59:06.566', '2021-06-13 20:53:52.580', null, 0, 0), + (125, 'go-admin/app/admin/apis.SysConfig.Delete-fm', '参数删除', '/api/v1/config', 'BUS', 'DELETE', '2021-05-13 19:59:06.612', '2021-06-13 20:53:52.627', null, 0, 0), + (126, 'go-admin/app/admin/apis.SysMenu.Delete-fm', '删除菜单', '/api/v1/menu', 'BUS', 'DELETE', '2021-05-13 19:59:06.654', '2021-06-13 20:53:52.668', null, 0, 0), + (127, 'go-admin/app/admin/apis.SysPost.Delete-fm', '岗位删除', '/api/v1/post/:id', 'BUS', 'DELETE', '2021-05-13 19:59:06.702', '2021-06-13 20:53:52.710', null, 0, 0), + (128, 'go-admin/app/admin/apis.SysRole.Delete-fm', '角色删除', '/api/v1/role', 'BUS', 'DELETE', '2021-05-13 19:59:06.746', '2021-06-13 20:53:52.751', null, 0, 0), + (131, 'github.com/go-admin-team/go-admin-core/tools/transfer.Handler.func1', '系统指标', '/api/v1/metrics', 'SYS', 'GET', '2021-05-17 22:13:55.933', '2021-06-13 20:53:49.614', null, 0, 0), + (132, 'go-admin/app/other/router.registerMonitorRouter.func1', '健康状态', '/api/v1/health', 'SYS', 'GET', '2021-05-17 22:13:56.285', '2021-06-13 20:53:49.951', null, 0, 0), + (133, 'go-admin/app/admin/apis.HelloWorld', '项目默认接口', '/', 'SYS', 'GET', '2021-05-24 10:30:44.553', '2021-06-13 20:53:47.406', null, 0, 0), + (134, 'go-admin/app/other/apis.ServerMonitor.ServerInfo-fm', '服务器基本状态', '/api/v1/server-monitor', 'SYS', 'GET', '2021-05-24 10:30:44.937', '2021-06-13 20:53:48.255', null, 0, 0), + (135, 'go-admin/app/admin/apis.SysApi.GetPage-fm', '接口列表', '/api/v1/sys-api', 'BUS', 'GET', '2021-05-24 11:37:53.303', '2021-06-13 20:53:47.541', null, 0, 0), + (136, 'go-admin/app/admin/apis.SysApi.Get-fm', '接口通过id获取', '/api/v1/sys-api/:id', 'BUS', 'GET', '2021-05-24 11:37:53.359', '2021-06-13 20:53:47.585', null, 0, 0), + (137, 'go-admin/app/admin/apis.SysLoginLog.GetPage-fm', '登录日志列表', '/api/v1/sys-login-log', 'BUS', 'GET', '2021-05-24 11:47:30.397', '2021-06-13 20:53:47.629', null, 0, 0), + (138, 'go-admin/app/other/apis.File.UploadFile-fm', '文件上传', '/api/v1/public/uploadFile', 'SYS', 'POST', '2021-05-25 19:16:18.493', '2021-06-13 20:53:50.866', null, 0, 0), + (139, 'go-admin/app/admin/apis.SysConfig.Update2Set-fm', '参数信息修改【参数配置】', '/api/v1/set-config', 'BUS', 'PUT', '2021-05-27 09:45:14.853', '2021-06-13 20:53:51.420', null, 0, 0), + (140, 'go-admin/app/admin/apis.SysConfig.Get2Set-fm', '参数获取全部【配置使用】', '/api/v1/set-config', 'BUS', 'GET', '2021-05-27 11:54:14.384', '2021-06-13 20:53:48.296', null, 0, 0), + (141, 'go-admin/app/admin/apis.SysUser.GetPage-fm', '管理员列表', '/api/v1/sys-user', 'BUS', 'GET', '2021-06-13 19:24:57.111', '2021-06-13 20:53:47.800', null, 0, 0), + (142, 'go-admin/app/admin/apis.SysUser.Get-fm', '管理员通过id获取', '/api/v1/sys-user/:id', 'BUS', 'GET', '2021-06-13 19:24:57.188', '2021-06-13 20:53:47.841', null, 0, 0), + (143, 'go-admin/app/admin/apis/tools.(*SysTable).GetSysTablesInfo-fm', '', '/api/v1/sys/tables/info', '', 'GET', '2021-06-13 19:24:57.437', '2021-06-13 20:53:48.047', null, 0, 0), + (144, 'go-admin/app/admin/apis/tools.(*SysTable).GetSysTables-fm', '', '/api/v1/sys/tables/info/:tableId', '', 'GET', '2021-06-13 19:24:57.510', '2021-06-13 20:53:48.088', null, 0, 0), + (145, 'go-admin/app/admin/apis/tools.(*SysTable).GetSysTableList-fm', '', '/api/v1/sys/tables/page', '', 'GET', '2021-06-13 19:24:57.582', '2021-06-13 20:53:48.128', null, 0, 0), + (146, 'github.com/gin-gonic/gin.(*RouterGroup).createStaticHandler.func1', '', '/static/*filepath', '', 'GET', '2021-06-13 19:24:59.641', '2021-06-13 20:53:50.081', null, 0, 0), + (147, 'github.com/swaggo/gin-swagger.CustomWrapHandler.func1', '', '/swagger/*any', '', 'GET', '2021-06-13 19:24:59.713', '2021-06-13 20:53:50.123', null, 0, 0), + (148, 'github.com/gin-gonic/gin.(*RouterGroup).createStaticHandler.func1', '', '/form-generator/*filepath', '', 'GET', '2021-06-13 19:24:59.914', '2021-06-13 20:53:50.295', null, 0, 0), + (149, 'go-admin/app/admin/apis/tools.(*SysTable).InsertSysTable-fm', '', '/api/v1/sys/tables/info', '', 'POST', '2021-06-13 19:25:00.163', '2021-06-13 20:53:50.539', null, 0, 0), + (150, 'go-admin/app/admin/apis.SysUser.Insert-fm', '管理员创建', '/api/v1/sys-user', 'BUS', 'POST', '2021-06-13 19:25:00.233', '2021-06-13 20:53:50.459', null, 0, 0), + (151, 'go-admin/app/admin/apis.SysUser.Update-fm', '管理员编辑', '/api/v1/sys-user', 'BUS', 'PUT', '2021-06-13 19:25:00.986', '2021-06-13 20:53:51.205', null, 0, 0), + (152, 'go-admin/app/admin/apis/tools.(*SysTable).UpdateSysTable-fm', '', '/api/v1/sys/tables/info', '', 'PUT', '2021-06-13 19:25:01.149', '2021-06-13 20:53:51.375', null, 0, 0), + (153, 'go-admin/app/admin/apis.SysRole.Update2Status-fm', '', '/api/v1/role-status', '', 'PUT', '2021-06-13 19:25:01.446', '2021-06-13 20:53:51.636', null, 0, 0), + (154, 'go-admin/app/admin/apis.SysUser.ResetPwd-fm', '', '/api/v1/user/pwd/reset', '', 'PUT', '2021-06-13 19:25:01.601', '2021-06-13 20:53:51.764', null, 0, 0), + (155, 'go-admin/app/admin/apis.SysUser.UpdateStatus-fm', '', '/api/v1/user/status', '', 'PUT', '2021-06-13 19:25:01.671', '2021-06-13 20:53:51.806', null, 0, 0), + (156, 'go-admin/app/admin/apis.SysUser.Delete-fm', '管理员删除', '/api/v1/sys-user', 'BUS', 'DELETE', '2021-06-13 19:25:02.043', '2021-06-13 20:53:52.192', null, 0, 0), + (157, 'go-admin/app/admin/apis/tools.(*SysTable).DeleteSysTables-fm', '', '/api/v1/sys/tables/info/:tableId', '', 'DELETE', '2021-06-13 19:25:02.283', '2021-06-13 20:53:52.367', null, 0, 0), + (158, 'github.com/gin-gonic/gin.(*RouterGroup).createStaticHandler.func1', '', '/static/*filepath', '', 'HEAD', '2021-06-13 19:25:02.734', '2021-06-13 20:53:52.791', null, 0, 0), + (159, 'github.com/gin-gonic/gin.(*RouterGroup).createStaticHandler.func1', '', '/form-generator/*filepath', '', 'HEAD', '2021-06-13 19:25:02.808', '2021-06-13 20:53:52.838', null, 0, 0); +insert into sys_config (id, config_name, config_key, config_value, config_type, is_frontend, remark, create_by, update_by, created_at, updated_at, deleted_at) +values (1, '皮肤样式', 'sys_index_skinName', 'skin-green', 'Y', '0', '主框架页-默认皮肤样式名称:蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 13:50:13.123', null), + (2, '初始密码', 'sys_user_initPassword', '123456', 'Y', '0', '用户管理-账号初始密码:123456', 1, 1, '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null), + (3, '侧栏主题', 'sys_index_sideTheme', 'theme-dark', 'Y', '0', '主框架页-侧边栏主题:深色主题theme-dark,浅色主题theme-light', 1, 1, '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null), + (4, '系统名称', 'sys_app_name', 'go-admin管理系统', 'Y', '1', '', 1, 0, '2021-03-17 08:52:06.067', '2021-05-28 10:08:25.248', null), + (5, '系统logo', 'sys_app_logo', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', 'Y', '1', '', 1, 0, '2021-03-17 08:53:19.462', '2021-03-17 08:53:19.462', null); +insert into sys_dept (dept_id, parent_id, dept_path, dept_name, sort, leader, phone, email, status, create_by, update_by, created_at, updated_at, deleted_at) +values (1, 0, '/0/1/', '爱拓科技', 0, 'aituo', '13782218188', 'atuo@aituo.com', '2', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 17:06:44.960', null), + (7, 1, '/0/1/7/', '研发部', 1, 'aituo', '13782218188', 'atuo@aituo.com', '2', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 17:06:59.193', null), + (8, 1, '/0/1/8/', '运维部', 0, 'aituo', '13782218188', 'atuo@aituo.com', '2', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 17:07:01.874', null), + (9, 1, '/0/1/9/', '客服部', 0, 'aituo', '13782218188', 'atuo@aituo.com', '2', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 17:07:05.993', null), + (10, 1, '/0/1/10/', '人力资源', 3, 'aituo', '13782218188', 'atuo@aituo.com', '1', 1, 1, '2021-05-13 19:56:37.913', '2021-06-05 17:07:08.503', null); +insert into sys_dict_type (dict_id, dict_name, dict_type, status, remark, create_by, update_by, created_at, updated_at, deleted_at) +values (1, '系统开关', 'sys_normal_disable', '2', '系统开关列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (2, '用户性别', 'sys_user_sex', '2', '用户性别列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (3, '菜单状态', 'sys_show_hide', '2', '菜单状态列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (4, '系统是否', 'sys_yes_no', '2', '系统是否列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (5, '任务状态', 'sys_job_status', '2', '任务状态列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (6, '任务分组', 'sys_job_group', '2', '任务分组列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (7, '通知类型', 'sys_notice_type', '2', '通知类型列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (8, '系统状态', 'sys_common_status', '2', '登录状态列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (9, '操作类型', 'sys_oper_type', '2', '操作类型列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (10, '通知状态', 'sys_notice_status', '2', '通知状态列表', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (11, '内容状态', 'sys_content_status', '2', '', 1, 1, '2021-05-13 19:56:40.813', '2021-05-13 19:56:40.813', null); +insert into sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, default, remark, create_by, update_by, created_at, updated_at, deleted_at) +values (1, 0, '正常', '2', 'sys_normal_disable', '', '', '', '2', '', '系统正常', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:40.168', null), + (2, 0, '停用', '1', 'sys_normal_disable', '', '', '', '2', '', '系统停用', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (3, 0, '男', '0', 'sys_user_sex', '', '', '', '2', '', '性别男', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (4, 0, '女', '1', 'sys_user_sex', '', '', '', '2', '', '性别女', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (5, 0, '未知', '2', 'sys_user_sex', '', '', '', '2', '', '性别未知', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (6, 0, '显示', '0', 'sys_show_hide', '', '', '', '2', '', '显示菜单', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (7, 0, '隐藏', '1', 'sys_show_hide', '', '', '', '2', '', '隐藏菜单', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (8, 0, '是', 'Y', 'sys_yes_no', '', '', '', '2', '', '系统默认是', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (9, 0, '否', 'N', 'sys_yes_no', '', '', '', '2', '', '系统默认否', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (10, 0, '正常', '2', 'sys_job_status', '', '', '', '2', '', '正常状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (11, 0, '停用', '1', 'sys_job_status', '', '', '', '2', '', '停用状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (12, 0, '默认', 'DEFAULT', 'sys_job_group', '', '', '', '2', '', '默认分组', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (13, 0, '系统', 'SYSTEM', 'sys_job_group', '', '', '', '2', '', '系统分组', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (14, 0, '通知', '1', 'sys_notice_type', '', '', '', '2', '', '通知', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (15, 0, '公告', '2', 'sys_notice_type', '', '', '', '2', '', '公告', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (16, 0, '正常', '2', 'sys_common_status', '', '', '', '2', '', '正常状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (17, 0, '关闭', '1', 'sys_common_status', '', '', '', '2', '', '关闭状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (18, 0, '新增', '1', 'sys_oper_type', '', '', '', '2', '', '新增操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (19, 0, '修改', '2', 'sys_oper_type', '', '', '', '2', '', '修改操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (20, 0, '删除', '3', 'sys_oper_type', '', '', '', '2', '', '删除操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (21, 0, '授权', '4', 'sys_oper_type', '', '', '', '2', '', '授权操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (22, 0, '导出', '5', 'sys_oper_type', '', '', '', '2', '', '导出操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (23, 0, '导入', '6', 'sys_oper_type', '', '', '', '2', '', '导入操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (24, 0, '强退', '7', 'sys_oper_type', '', '', '', '2', '', '强退操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (25, 0, '生成代码', '8', 'sys_oper_type', '', '', '', '2', '', '生成操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (26, 0, '清空数据', '9', 'sys_oper_type', '', '', '', '2', '', '清空操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (27, 0, '成功', '0', 'sys_notice_status', '', '', '', '2', '', '成功状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (28, 0, '失败', '1', 'sys_notice_status', '', '', '', '2', '', '失败状态', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (29, 0, '登录', '10', 'sys_oper_type', '', '', '', '2', '', '登录操作', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (30, 0, '退出', '11', 'sys_oper_type', '', '', '', '2', '', '', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (31, 0, '获取验证码', '12', 'sys_oper_type', '', '', '', '2', '', '获取验证码', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:37.914', null), + (32, 0, '正常', '1', 'sys_content_status', '', '', '', '1', '', '', 1, 1, '2021-05-13 19:56:40.845', '2021-05-13 19:56:40.845', null), + (33, 1, '禁用', '2', 'sys_content_status', '', '', '', '1', '', '', 1, 1, '2021-05-13 19:56:40.845', '2021-05-13 19:56:40.845', null); +insert into sys_file_dir (id, label, p_id, sort, path, create_by, update_by, created_at, updated_at, deleted_at) +values (1, '根目录', 0, 0, '', 1, 1, '2021-05-13 19:56:39.773', '2021-05-13 19:56:39.773', null); +insert into sys_job (job_id, job_name, job_group, job_type, cron_expression, invoke_target, args, misfire_policy, concurrent, status, entry_id, created_at, updated_at, deleted_at, create_by, update_by) +values (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ', 'http://localhost:8000', '', 1, 1, 1, 0, '2021-05-13 19:56:37.914', '2021-06-10 22:31:05.762', null, 1, 1), + (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ', 'ExamplesOne', '参数', 1, 1, 1, 0, '2021-05-13 19:56:37.914', '2021-05-31 23:55:37.221', null, 1, 1); +insert into sys_menu (menu_id, menu_name, title, icon, path, paths, menu_type, action, permission, parent_id, no_cache, breadcrumb, component, sort, visible, is_frame, create_by, update_by, created_at, updated_at, deleted_at) +values (2, 'Admin', '系统管理', 'api-server', '/admin', '/0/2', 'M', '无', '', 0, 1, '', 'Layout', 10, '0', '1', 0, 1, '2021-05-20 21:58:45.679', '2021-06-12 23:53:56.276', null), + (3, 'SysUserManage', '管理员管理', 'user', '/admin/sys-user', '/0/2/3', 'C', '无', 'admin:sysUser:list', 2, 0, '', '/admin/sys-user/index', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 19:44:27.795', null), + (43, '', '新增管理员', 'app-group-fill', '/api/v1/sysuser', '/0/2/3/43', 'F', 'POST', 'admin:sysUser:add', 3, 0, '', '', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 19:47:30.539', null), + (44, '', '查询管理员', 'app-group-fill', '/api/v1/sysuser', '/0/2/3/44', 'F', 'GET', 'admin:sysUser:query', 3, 0, '', '', 40, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 19:50:06.054', null), + (45, '', '修改管理员', 'app-group-fill', '/api/v1/sysuser/', '/0/2/3/45', 'F', 'PUT', 'admin:sysUser:edit', 3, 0, '', '', 30, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 19:49:57.786', null), + (46, '', '删除管理员', 'app-group-fill', '/api/v1/sysuser/', '/0/2/3/46', 'F', 'DELETE', 'admin:sysUser:remove', 3, 0, '', '', 20, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 19:49:46.370', null), + (51, 'SysMenuManage', '菜单管理', 'tree-table', '/admin/sys-menu', '/0/2/51', 'C', '无', 'admin:sysMenu:list', 2, 1, '', '/admin/sys-menu/index', 30, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:57:18.436', null), + (52, 'SysRoleManage', '角色管理', 'peoples', '/admin/sys-role', '/0/2/52', 'C', '无', 'admin:sysRole:list', 2, 1, '', '/admin/sys-role/index', 20, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:51:46.529', null), + (56, 'SysDeptManage', '部门管理', 'tree', '/admin/sys-dept', '/0/2/56', 'C', '无', 'admin:sysDept:list', 2, 0, '', '/admin/sys-dept/index', 40, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:58:21.215', null), + (57, 'SysPostManage', '岗位管理', 'pass', '/admin/sys-post', '/0/2/57', 'C', '无', 'admin:sysPost:list', 2, 0, '', '/admin/sys-post/index', 50, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:59:31.694', null), + (58, 'Dict', '字典管理', 'education', '/admin/dict', '/0/2/58', 'C', '无', 'admin:sysDictType:list', 2, 0, '', '/admin/dict/index', 60, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 12:07:17.793', null), + (59, 'SysDictDataManagfe', '字典数据', 'education', '/admin/dict/data/:dictId', '/0/2/59', 'C', '无', 'admin:sysDictData:list', 2, 0, '', '/admin/dict/data', 100, '1', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 12:04:38.536', null), + (60, 'Tools', '开发工具', 'dev-tools', '/dev-tools', '/0/60', 'M', '无', '', 0, 0, '', 'Layout', 40, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-05 22:15:03.465', null), + (61, 'Swagger', '系统接口', 'guide', '/dev-tools/swagger', '/0/60/61', 'C', '无', '', 60, 0, '', '/dev-tools/swagger/index', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-05 22:15:03.465', null), + (62, 'SysConfigManage', '参数管理', 'swagger', '/admin/sys-config', '/0/2/62', 'C', '无', 'admin:sysConfig:list', 2, 0, '', '/admin/sys-config/index', 70, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (63, '', '接口权限', 'bug', '', '/0/63', 'M', '', '', 0, 0, '', '', 99, '1', '1', 1, 0, '2020-04-11 15:52:48', '2020-04-12 16:39:32', '2021-06-03 23:35:25.479'), + (64, '', '用户管理', 'user', '', '/0/63/64', 'M', '', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:58.338'), + (66, '', '菜单管理', 'tree-table', '', '/0/63/66', 'C', '', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:56.694'), + (69, '', '字典', 'dict', '', '/0/63/69', 'M', '', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:54.790'), + (70, '', '类型', 'dict', '', '/0/63/69/70', 'C', '', '', 69, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:49.425'), + (201, '', '角色管理', 'peoples', '', '/0/63/201', 'C', 'GET', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:24.239'), + (202, '', '参数设置', 'list', '', '/0/63/202', 'C', 'DELETE', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:22.982'), + (203, '', '部门管理', 'tree', '', '/0/63/203', 'C', 'POST', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:21.555'), + (204, '', '岗位管理', 'pass', '', '/0/63/204', 'C', '', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:20.121'), + (205, '', '角色菜单管理', 'nested', '', '/0/63/205', 'C', '', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:18.681'), + (206, '', '数据', '', '', '/0/63/69/206', 'C', 'PUT', '', 69, 0, '', '', 2, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:52.742'), + (211, 'Log', '日志管理', 'log', '/log', '/0/2/211', 'M', '', '', 2, 0, '', '/log/index', 80, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (212, 'SysLoginLogManage', '登录日志', 'logininfor', '/admin/sys-login-log', '/0/2/211/212', 'C', '', 'admin:sysLoginLog:list', 211, 0, '', '/admin/sys-login-log/index', 1, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (214, '', '日志管理', 'log', '', '/0/63/214', 'M', 'GET', '', 63, 0, '', '', 1, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:34:42.363'), + (216, 'OperLog', '操作日志', 'skill', '/admin/sys-oper-log', '/0/2/211/216', 'C', '', 'admin:sysOperLog:list', 211, 0, '', '/admin/sys-oper-log/index', 1, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (220, '', '新增菜单', 'app-group-fill', '', '/0/2/51/220', 'F', '', 'admin:sysMenu:add', 51, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:57:29.113', null), + (221, '', '修改菜单', 'app-group-fill', '', '/0/2/51/221', 'F', '', 'admin:sysMenu:edit', 51, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:57:49.043', null), + (222, '', '查询菜单', 'app-group-fill', '', '/0/2/51/222', 'F', '', 'admin:sysMenu:query', 51, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:57:58.526', null), + (223, '', '删除菜单', 'app-group-fill', '', '/0/2/51/223', 'F', '', 'admin:sysMenu:remove', 51, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:58:07.281', null), + (224, '', '新增角色', 'app-group-fill', '', '/0/2/52/224', 'F', '', 'admin:sysRole:add', 52, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:51:57.183', null), + (225, '', '查询角色', 'app-group-fill', '', '/0/2/52/225', 'F', '', 'admin:sysRole:query', 52, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:52:24.793', null), + (226, '', '修改角色', 'app-group-fill', '', '/0/2/52/226', 'F', '', 'admin:sysRole:update', 52, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:56:38.445', null), + (227, '', '删除角色', 'app-group-fill', '', '/0/2/52/227', 'F', '', 'admin:sysRole:remove', 52, 0, '', '', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:53:08.087', null), + (228, '', '查询部门', 'app-group-fill', '', '/0/2/56/228', 'F', '', 'admin:sysDept:query', 56, 0, '', '', 40, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:59:07.935', null), + (229, '', '新增部门', 'app-group-fill', '', '/0/2/56/229', 'F', '', 'admin:sysDept:add', 56, 0, '', '', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:58:38.549', null), + (230, '', '修改部门', 'app-group-fill', '', '/0/2/56/230', 'F', '', 'admin:sysDept:edit', 56, 0, '', '', 30, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:58:58.802', null), + (231, '', '删除部门', 'app-group-fill', '', '/0/2/56/231', 'F', '', 'admin:sysDept:remove', 56, 0, '', '', 20, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-13 11:58:48.835', null), + (232, '', '查询岗位', 'app-group-fill', '', '/0/2/57/232', 'F', '', 'admin:sysPost:query', 57, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:59:39.067', null), + (233, '', '新增岗位', 'app-group-fill', '', '/0/2/57/233', 'F', '', 'admin:sysPost:add', 57, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:59:46.485', null), + (234, '', '修改岗位', 'app-group-fill', '', '/0/2/57/234', 'F', '', 'admin:sysPost:edit', 57, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 11:59:54.707', null), + (235, '', '删除岗位', 'app-group-fill', '', '/0/2/57/235', 'F', '', 'admin:sysPost:remove', 57, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:00:01.968', null), + (236, '', '查询字典', 'app-group-fill', '', '/0/2/58/236', 'F', '', 'admin:sysDictType:query', 58, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:07:26.913', null), + (237, '', '新增类型', 'app-group-fill', '', '/0/2/58/237', 'F', '', 'admin:sysDictType:add', 58, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:03:52.022', null), + (238, '', '修改类型', 'app-group-fill', '', '/0/2/58/238', 'F', '', 'admin:sysDictType:edit', 58, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:04:05.328', null), + (239, '', '删除类型', 'app-group-fill', '', '/0/2/58/239', 'F', '', 'system:sysdicttype:remove', 58, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:04:17.149', null), + (240, '', '查询数据', 'app-group-fill', '', '/0/2/59/240', 'F', '', 'admin:sysDictData:query', 59, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:04:45.918', null), + (241, '', '新增数据', 'app-group-fill', '', '/0/2/59/241', 'F', '', 'admin:sysDictData:add', 59, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:06:27.120', null), + (242, '', '修改数据', 'app-group-fill', '', '/0/2/59/242', 'F', '', 'admin:sysDictData:edit', 59, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:06:58.892', null), + (243, '', '删除数据', 'app-group-fill', '', '/0/2/59/243', 'F', '', 'admin:sysDictData:remove', 59, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-13 12:07:52.824', null), + (244, '', '查询参数', 'app-group-fill', '', '/0/2/62/244', 'F', '', 'admin:sysConfig:query', 62, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (245, '', '新增参数', 'app-group-fill', '', '/0/2/62/245', 'F', '', 'admin:sysConfig:add', 62, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (246, '', '修改参数', 'app-group-fill', '', '/0/2/62/246', 'F', '', 'admin:sysConfig:edit', 62, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (247, '', '删除参数', 'app-group-fill', '', '/0/2/62/247', 'F', '', 'admin:sysConfig:remove', 62, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (248, '', '查询登录日志', 'app-group-fill', '', '/0/2/211/212/248', 'F', '', 'admin:sysLoginLog:query', 212, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (249, '', '删除登录日志', 'app-group-fill', '', '/0/2/211/212/249', 'F', '', 'admin:sysLoginLog:remove', 212, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (250, '', '查询操作日志', 'app-group-fill', '', '/0/2/211/216/250', 'F', '', 'admin:sysOperLog:query', 216, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (251, '', '删除操作日志', 'app-group-fill', '', '/0/2/211/216/251', 'F', '', 'admin:sysOperLog:remove', 216, 0, '', '', 0, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-12 23:53:56.276', null), + (256, '', '必开接口', '', '', '/0/63/256', 'M', 'GET', '', 63, 0, '', '', 0, '1', '1', 1, 0, '2020-04-11 15:52:48', null, '2021-06-03 23:35:14.269'), + (261, 'Gen', '代码生成', 'code', '/dev-tools/gen', '/0/60/261', 'C', '', '', 60, 0, '', '/dev-tools/gen/index', 2, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-05 22:15:03.465', null), + (262, 'EditTable', '代码生成修改', 'build', '/dev-tools/editTable', '/0/60/262', 'C', '', '', 60, 0, '', '/dev-tools/gen/editTable', 100, '1', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-05 22:15:03.465', null), + (264, 'Build', '表单构建', 'build', '/dev-tools/build', '/0/60/264', 'C', '', '', 60, 0, '', '/dev-tools/build/index', 1, '0', '1', 1, 1, '2020-04-11 15:52:48', '2021-06-05 22:15:03.465', null), + (267, '', '个人中心', '', '', '/0/63/256/267', 'M', '', '', 256, 0, '', '', 0, '1', '1', 1, 1, '2020-05-03 20:49:39', '2020-05-03 20:49:39', '2021-06-03 23:35:12.343'), + (269, 'ServerMonitor', '服务监控', 'druid', '/sys-tools/monitor', '/0/60/269', 'C', '', 'sysTools:serverMonitor:list', 537, 0, '', '/sys-tools/monitor', 0, '0', '1', 1, 1, '2020-04-14 00:28:19', '2021-06-05 22:15:03.465', null), + (459, 'Schedule', '定时任务', 'time-range', '/schedule', '/0/459', 'M', '无', '', 0, 0, '', 'Layout', 20, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (460, 'ScheduleManage', 'Schedule', 'job', '/schedule/manage', '/0/459/460', 'C', '无', 'job:sysJob:list', 459, 0, '', '/schedule/index', 0, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (461, 'sys_job', '分页获取定时任务', 'app-group-fill', 'sys_job', '/0/459/460/461', 'F', '无', 'job:sysJob:query', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (462, 'sys_job', '创建定时任务', 'app-group-fill', 'sys_job', '/0/459/460/462', 'F', '无', 'job:sysJob:add', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (463, 'sys_job', '修改定时任务', 'app-group-fill', 'sys_job', '/0/459/460/463', 'F', '无', 'job:sysJob:edit', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (464, 'sys_job', '删除定时任务', 'app-group-fill', 'sys_job', '/0/459/460/464', 'F', '无', 'job:sysJob:remove', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37', '2021-06-05 22:15:03.465', null), + (465, 'sys_job', '定时任务', 'bug', 'sys_job', '/0/63/465', 'M', '无', '', 63, 0, '', '', 0, '1', '1', 1, 0, '2020-08-03 09:17:37', '2020-08-03 09:17:37', '2021-06-03 23:35:01.509'), + (471, 'job_log', '日志', 'bug', '/schedule/log', '/0/459/471', 'C', '', '', 459, 0, '', '/schedule/log', 0, '1', '1', 1, 1, '2020-08-05 21:24:46', '2021-06-05 22:15:03.465', null), + (496, 'Sources', '资源管理', 'network', '/sources', '/0/496', 'M', '无', '', 0, 1, '', 'Layout', 50, '0', '1', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (497, 'File', '文件管理', 'documentation', '/sources/file-manage', '/0/496/497', 'C', '', '', 496, 1, '', '/other/fileManage/index', 0, '0', '1', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (498, '', '内容管理', 'archived', '/cms', '/0/498', 'M', '无', '', 0, 1, '', 'Layout', 60, '0', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', null), + (499, 'SysCategoryManage', '分类', 'list', '/cms/sys-category', '/0/498/499', 'C', '无', 'cms:sysCategory:list', 498, 1, '', '/sys-category/index', 0, '0', '0', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', null), + (500, '', '分页获取分类', 'app-group-fill', '', '/0/498/499/500', 'F', '无', 'cms:sysCategory:query', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (501, '', '创建分类', 'app-group-fill', '', '/0/498/499/501', 'F', '无', 'cms:sysCategory:add', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (502, '', '修改分类', 'app-group-fill', '', '/0/498/499/502', 'F', '无', 'cms:sysCategory:edit', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (503, '', '删除分类', 'app-group-fill', '', '/0/498/499/503', 'F', '无', 'cms:sysCategory:remove', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (504, 'Category', '分类', 'bug', 'category', '/0/63/504', 'M', '无', '', 63, 1, '', '', 0, '1', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-05-13 19:56:39.690', '2021-06-03 23:35:00.021'), + (511, 'SysContentManage', '内容管理', 'pass', '/cms/sys-content', '/0/498/511', 'C', '无', 'cms:sysContent:list', 498, 1, '', '/sys-content/index', 0, '0', '0', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', null), + (512, '', '分页获取内容管理', 'app-group-fill', '', '/0/510/511/512', 'F', '无', 'cms:sysContent:query', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (513, '', '创建内容管理', 'app-group-fill', '', '/0/510/511/513', 'F', '无', 'cms:sysContent:add', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (514, '', '修改内容管理', 'app-group-fill', '', '/0/510/511/514', 'F', '无', 'cms:sysContent:edit', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (515, '', '删除内容管理', 'app-group-fill', '', '/0/510/511/515', 'F', '无', 'cms:sysContent:remove', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', null), + (516, 'Content', '内容管理', 'bug', 'content', '/0/63/516', 'M', '无', '', 63, 1, '', '', 0, '1', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-05-13 19:56:39.690', '2021-06-03 23:35:04.361'), + (522, 'SysContentCreate', '新增', 'form', '/cms/sys-content/create', '/0/498/522', 'C', '', 'cms:sysContent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', null), + (523, 'SysContentEdit', '编辑', 'edit', '/cms/sys-content/edit:id', '/0/498/523', 'C', '', 'cmd:sysContent:edit', 498, 0, '', '/sys-content/edit.vue', 0, '1', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', null), + (528, 'SysApiManage', '接口管理', 'api-doc', '/admin/sys-api', '/0/527/528', 'C', '无', 'admin:sysApi:list', 2, 0, '', '/admin/sys-api/index', 0, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (529, '', '查询接口', 'app-group-fill', 'sys_api', '/0/527/528/529', 'F', '无', 'admin:sysApi:query', 528, 0, '', '', 40, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (530, '', '创建接口', 'app-group-fill', 'sys_api', '/0/527/528/530', 'F', '无', 'admin:sysApi:add', 528, 0, '', '', 10, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-05 16:06:16.525', '2021-06-05 20:46:59.597'), + (531, '', '修改接口', 'app-group-fill', 'sys_api', '/0/527/528/531', 'F', '无', 'admin:sysApi:edit', 528, 0, '', '', 30, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', null), + (532, '', '删除接口', 'app-group-fill', 'sys_api', '/0/527/528/532', 'F', '无', 'admin:sysApi:remove', 528, 0, '', '', 20, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-12 23:53:56.276', '2021-06-13 11:47:48.647'), + (533, 'sys_api', 'SysApi', 'bug', 'sys_api', '/0/63/533', 'M', '无', '', 63, 0, '', '', 0, '1', '0', 1, 1, '2021-05-13 20:11:43.423', '2021-05-13 20:11:43.423', '2021-06-03 23:35:02.920'), + (537, 'SysTools', '系统工具', 'system-tools', '/sys-tools', '', 'M', '', '', 0, 0, '', 'Layout', 30, '0', '1', 1, 1, '2021-05-21 11:13:32.166', '2021-06-05 22:15:03.465', null), + (538, 'SysChinaAreaData', '行政区管理', 'nested', '/sys-tools/sys-china-area-data', '', 'C', '', 'sysTools:sysChinaAreaData:list', 537, 0, '', '/sys-tools/sys-china-area-data/index', 0, '0', '1', 1, 1, '2021-05-21 11:18:50.712', '2021-06-05 22:15:03.465', null), + (540, 'SysConfigSet', '参数设置', 'system-tools', '/admin/sys-config/set', '', 'C', '', 'admin:sysConfigSet:list', 2, 0, '', '/admin/sys-config/set', 0, '0', '1', 1, 1, '2021-05-25 16:06:52.560', '2021-06-13 11:46:55.224', null), + (541, '1', '1', 'api-doc', '1', '', 'M', '', '', 0, 0, '', '1', 0, '0', '1', 1, 1, '2021-05-31 22:51:58.389', '2021-05-31 22:55:04.687', '2021-05-31 22:55:10.561'), + (542, '', '修改', 'upload', '', '', 'F', '', 'admin:sysConfigSet:update', 540, 0, '', '', 0, '0', '1', 1, 1, '2021-06-13 11:45:48.670', '2021-06-13 11:47:15.042', null), + (543, '', '数据权限', 'api-server', '', '', 'F', '', '', 52, 0, '', '', 50, '0', '1', 1, 0, '2021-06-13 11:53:54.259', '2021-06-13 11:53:54.259', '2021-06-13 11:56:44.021'); +insert into sys_post (post_id, post_name, post_code, sort, status, remark, created_at, updated_at, deleted_at, create_by, update_by) +values (1, '首席执行官', 'CEO', 0, '2', '首席执行官', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null, 1, 1), + (2, '首席技术执行官', 'CTO', 2, '2', '首席技术执行官', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null, 1, 1), + (3, '首席运营官', 'COO', 3, '2', '测试工程师', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null, 1, 1); +insert into sys_role (role_id, role_name, status, role_key, role_sort, flag, remark, admin, data_scope, created_at, updated_at, deleted_at, create_by, update_by) +values (1, '系统管理员', '2', 'admin', 1, '', '', 1, '', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', null, 1, 1), + (2, '测试', '2', 'Test', 0, '', '', 0, '5', '2021-05-19 17:55:06.545', '2021-06-12 23:53:56.262', null, 1, 0); +insert into sys_user (create_by, update_by, created_at, updated_at, deleted_at, user_id, username, password, nick_name, phone, role_id, salt, avatar, sex, email, dept_id, post_id, remark, status) +values (1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:40.205', null, 1, 'admin', '$2a$10$/Glr4g9Svr6O0kvjsRJCXu3f0W8/dsP3XZyVNi1019ratWpSPMyw.', 'zhangwj', '13818888888', 1, '', '', '1', '1@qq.com', 1, 1, '', '2'), + (0, 0, '2021-05-24 17:14:20.826', '2021-06-12 23:50:35.803', null, 2, 'test', '$2a$10$VlnBKPkbmSpK4XaNpjCf0es.ILCuW2NaVgLAo.m8SGmmzIScH5GSa', '测试用户1', '13111111111', 2, '', '', '0', 'qq@qq.com', 7, 3, '', '2'); +insert into sys_menu_api_rule (sys_menu_menu_id, sys_api_id) +values (58, 21), + (236, 21), + (238, 23), + (59, 24), + (240, 24), + (242, 25), + (58, 26), + (236, 26), + (56, 27), + (228, 27), + (230, 28), + (226, 29), + (51, 39), + (222, 39), + (221, 41), + (52, 44), + (225, 44), + (226, 45), + (226, 46), + (226, 47), + (57, 59), + (232, 59), + (234, 60), + (241, 80), + (237, 81), + (229, 82), + (220, 88), + (233, 89), + (224, 90), + (531, 92), + (242, 101), + (238, 102), + (230, 103), + (226, 106), + (226, 107), + (221, 109), + (234, 110), + (243, 120), + (239, 121), + (231, 122), + (223, 126), + (235, 127), + (227, 128), + (528, 135), + (529, 135), + (531, 136), + (542, 139), + (540, 140), + (3, 141), + (44, 141), + (45, 142), + (43, 150), + (45, 151), + (46, 156); COMMIT; +SET FOREIGN_KEY_CHECKS = 1; + -- 数据完成 ; \ No newline at end of file diff --git a/config/extend.go b/config/extend.go index e477fbf..bd06e03 100644 --- a/config/extend.go +++ b/config/extend.go @@ -1,16 +1,16 @@ package config -var ExtConfig Extand +var ExtConfig Extend -// 扩展配置 +// Extend 扩展配置 // extend: // demo: // name: demo-name // 使用方法: config.ExtConfig......即可!! -type Extand struct { - // Demo Demo // 这里配置对应配置文件的结构即可 +type Extend struct { + AMap AMap // 这里配置对应配置文件的结构即可 } -type Demo struct { - Name string -} \ No newline at end of file +type AMap struct { + Key string +} diff --git a/config/settings.yml b/config/settings.yml index 8544457..2e0ccad 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -44,9 +44,28 @@ settings: dbname: dbname # 代码生成是使用前端代码存放位置,需要指定到src文件夹,相对路径 frontpath: ../go-admin-ui/src - queue: - memory: - poolSize: 100 extend: # 扩展项使用说明 demo: name: data + cache: + redis: + addr: 127.0.0.1:6379 + password: xxxxxx + db: 2 + queue: + memory: + poolSize: 100 +# redis: +# addr: 127.0.0.1:6379 +# password: xxxxxx +# producer: +# streamMaxLength: 100 +# approximateMaxLength: true +# consumer: +# visibilityTimeout: 60 +# bufferSize: 100 +# concurrency: 10 +# blockingTimeout: 5 +# reclaimInterval: 1 + locker: + redis: \ No newline at end of file diff --git a/docs/docs.go b/docs/docs.go index 9afd04a..8547698 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -28,6 +28,43 @@ var doc = `{ "host": "{{.Host}}", "basePath": "{{.BasePath}}", "paths": { + "/api/v1/app-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取系统配置信息,主要注意这里不在验证数据权限", + "tags": [ + "配置管理" + ], + "summary": "获取系统前台配置信息,主要注意这里不在验证数据权限", + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + } + ] + } + } + } + } + }, "/api/v1/db/columns/page": { "get": { "description": "数据库表列分页列表 / database table column page list", @@ -281,6 +318,37 @@ var doc = `{ } } }, + "/api/v1/dict-data/option-select": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "数据字典根据key获取", + "tags": [ + "字典数据" + ], + "summary": "数据字典根据key获取", + "parameters": [ + { + "type": "integer", + "description": "dictType", + "name": "dictType", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/dict/data": { "get": { "security": [ @@ -434,6 +502,11 @@ var doc = `{ } }, "delete": { + "security": [ + { + "Bearer": [] + } + ], "description": "删除数据", "tags": [ "字典数据" @@ -557,7 +630,7 @@ var doc = `{ "tags": [ "字典类型" ], - "summary": "字典类型全部数据", + "summary": "字典类型全部数据 代码生成使用接口", "parameters": [ { "type": "string", @@ -599,7 +672,7 @@ var doc = `{ "tags": [ "字典类型" ], - "summary": "通过字典id获取字典类型", + "summary": "字典类型通过字典id获取", "parameters": [ { "type": "integer", @@ -677,7 +750,69 @@ var doc = `{ } } }, + "/api/v1/login": { + "post": { + "description": "获取token\nLoginHandler can be used by clients to get a jwt token.\nPayload needs to be json in the form of {\"username\": \"USERNAME\", \"password\": \"PASSWORD\"}.\nReply will be of the form {\"token\": \"TOKEN\"}.\ndev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password\n注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值", + "consumes": [ + "application/json" + ], + "summary": "登陆", + "parameters": [ + { + "description": "account", + "name": "account", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/handler.Login" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"expire\": \"2019-08-07T12:45:48+08:00\", \"token\": \".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A\" }", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/menu": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "菜单" + ], + "summary": "Menu列表数据", + "parameters": [ + { + "type": "string", + "description": "menuName", + "name": "menuName", + "in": "query" + }, + { + "type": "string", + "description": "menuName", + "name": "menuName", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + }, "post": { "security": [ { @@ -743,9 +878,7 @@ var doc = `{ } } } - } - }, - "/api/v1/menu/": { + }, "delete": { "description": "删除数据", "tags": [ @@ -844,7 +977,7 @@ var doc = `{ } } }, - "/api/v1/menuTreeselect": { + "/api/v1/menuTreeselect/{roleId}": { "get": { "security": [ { @@ -858,7 +991,16 @@ var doc = `{ "tags": [ "菜单" ], - "summary": "获取菜单树", + "summary": "角色修改使用的菜单列表", + "parameters": [ + { + "type": "integer", + "description": "roleId", + "name": "roleId", + "in": "path", + "required": true + } + ], "responses": { "200": { "description": "{\"code\": -1, \"message\": \"添加失败\"}", @@ -900,36 +1042,6 @@ var doc = `{ } } }, - "/api/v1/menulist": { - "get": { - "security": [ - { - "Bearer": [] - } - ], - "description": "获取JSON", - "tags": [ - "菜单" - ], - "summary": "Menu列表数据", - "parameters": [ - { - "type": "string", - "description": "menuName", - "name": "menuName", - "in": "query" - } - ], - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/api/v1/menurole": { "get": { "security": [ @@ -941,16 +1053,7 @@ var doc = `{ "tags": [ "菜单" ], - "summary": "根据角色名称获取菜单列表数据(左菜单使用)", - "parameters": [ - { - "type": "integer", - "description": "id", - "name": "id", - "in": "path", - "required": true - } - ], + "summary": "根据登录角色名称获取菜单列表数据(左菜单使用)", "responses": { "200": { "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", @@ -1359,24 +1462,7 @@ var doc = `{ } } }, - "/api/v1/setting": { - "get": { - "description": "获取JSON", - "tags": [ - "系统信息" - ], - "summary": "查询系统信息", - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", - "schema": { - "type": "string" - } - } - } - } - }, - "/api/v1/settings/serverInfo": { + "/api/v1/server-monitor": { "get": { "description": "获取JSON", "tags": [ @@ -1393,6 +1479,646 @@ var doc = `{ } } }, + "/api/v1/set-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "界面操作设置配置值的获取", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "获取配置", + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": true + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "界面操作设置配置值", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "设置配置", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/dto.GetSetSysConfigReq" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-api": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取接口管理列表", + "tags": [ + "接口管理" + ], + "summary": "获取接口管理列表", + "parameters": [ + { + "type": "string", + "description": "名称", + "name": "name", + "in": "query" + }, + { + "type": "string", + "description": "标题", + "name": "title", + "in": "query" + }, + { + "type": "string", + "description": "地址", + "name": "path", + "in": "query" + }, + { + "type": "string", + "description": "类型", + "name": "action", + "in": "query" + }, + { + "type": "integer", + "description": "页条数", + "name": "pageSize", + "in": "query" + }, + { + "type": "integer", + "description": "页码", + "name": "pageIndex", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "allOf": [ + { + "$ref": "#/definitions/response.Page" + }, + { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + } + } + } + ] + } + } + } + ] + } + } + } + }, + "delete": { + "security": [ + { + "Bearer": [] + } + ], + "description": "删除接口管理", + "tags": [ + "接口管理" + ], + "summary": "删除接口管理", + "parameters": [ + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-api/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取接口管理", + "tags": [ + "接口管理" + ], + "summary": "获取接口管理", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.SysApi" + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "修改接口管理", + "consumes": [ + "application/json" + ], + "tags": [ + "接口管理" + ], + "summary": "修改接口管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysApiControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取配置管理列表", + "tags": [ + "配置管理" + ], + "summary": "获取配置管理列表", + "parameters": [ + { + "type": "string", + "description": "名称", + "name": "configName", + "in": "query" + }, + { + "type": "string", + "description": "key", + "name": "configKey", + "in": "query" + }, + { + "type": "string", + "description": "类型", + "name": "configType", + "in": "query" + }, + { + "type": "integer", + "description": "是否前端", + "name": "isFrontend", + "in": "query" + }, + { + "type": "integer", + "description": "页条数", + "name": "pageSize", + "in": "query" + }, + { + "type": "integer", + "description": "页码", + "name": "pageIndex", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "allOf": [ + { + "$ref": "#/definitions/response.Page" + }, + { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + } + } + } + ] + } + } + } + ] + } + } + } + }, + "post": { + "security": [ + { + "Bearer": [] + } + ], + "description": "创建配置管理", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "创建配置管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysConfigControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"创建成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + }, + "delete": { + "security": [ + { + "Bearer": [] + } + ], + "description": "删除配置管理", + "tags": [ + "配置管理" + ], + "summary": "删除配置管理", + "parameters": [ + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-config/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取配置管理", + "tags": [ + "配置管理" + ], + "summary": "获取配置管理", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.SysConfig" + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "修改配置管理", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "修改配置管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysConfigControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-opera-log": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "操作日志" + ], + "summary": "操作日志列表", + "parameters": [ + { + "type": "string", + "description": "title", + "name": "title", + "in": "query" + }, + { + "type": "string", + "description": "method", + "name": "method", + "in": "query" + }, + { + "type": "string", + "description": "requestMethod", + "name": "requestMethod", + "in": "query" + }, + { + "type": "string", + "description": "operUrl", + "name": "operUrl", + "in": "query" + }, + { + "type": "string", + "description": "operIp", + "name": "operIp", + "in": "query" + }, + { + "type": "string", + "description": "status", + "name": "status", + "in": "query" + }, + { + "type": "string", + "description": "beginTime", + "name": "beginTime", + "in": "query" + }, + { + "type": "string", + "description": "endTime", + "name": "endTime", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + }, + "delete": { + "description": "删除数据", + "tags": [ + "操作日志" + ], + "summary": "删除操作日志", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysOperaLogById" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/api/v1/sys-opera-log/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "操作日志" + ], + "summary": "操作日志通过id获取", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "query" + }, + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/sys/tables/info": { "put": { "security": [ @@ -1642,34 +2368,6 @@ var doc = `{ } } }, - "/api/v1/system/setting": { - "post": { - "description": "获取JSON", - "tags": [ - "系统信息" - ], - "summary": "更新或提交系统信息", - "parameters": [ - { - "description": "body", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/dto.SysSettingControl" - } - } - ], - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/api/v1/sysuser/{userId}": { "put": { "description": "获取JSON", @@ -1812,34 +2510,6 @@ var doc = `{ } } }, - "/login": { - "post": { - "description": "获取token\nLoginHandler can be used by clients to get a jwt token.\nPayload needs to be json in the form of {\"username\": \"USERNAME\", \"password\": \"PASSWORD\"}.\nReply will be of the form {\"token\": \"TOKEN\"}.\ndev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password\n注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值", - "consumes": [ - "application/json" - ], - "summary": "登陆", - "parameters": [ - { - "description": "account", - "name": "account", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/handler.Login" - } - } - ], - "responses": { - "200": { - "description": "{\"code\": 200, \"expire\": \"2019-08-07T12:45:48+08:00\", \"token\": \".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A\" }", - "schema": { - "type": "string" - } - } - } - } - }, "/logout": { "post": { "security": [ @@ -1864,6 +2534,17 @@ var doc = `{ } }, "definitions": { + "dto.GetSetSysConfigReq": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configValue": { + "type": "string" + } + } + }, "dto.PassWord": { "type": "object", "required": [ @@ -1879,6 +2560,77 @@ var doc = `{ } } }, + "dto.SysApiControl": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "handle": { + "type": "string" + }, + "id": { + "description": "编码", + "type": "integer" + }, + "path": { + "type": "string" + }, + "title": { + "type": "string" + }, + "type": { + "type": "string" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysConfigByKeyReq": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + } + } + }, + "dto.SysConfigControl": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configName": { + "type": "string" + }, + "configType": { + "type": "string" + }, + "configValue": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "id": { + "description": "编码", + "type": "integer" + }, + "isFrontend": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "updateBy": { + "type": "integer" + } + } + }, "dto.SysDeptById": { "type": "object", "properties": { @@ -1896,6 +2648,9 @@ var doc = `{ "dto.SysDeptControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "deptId": { "description": "编码", "type": "integer" @@ -1931,12 +2686,18 @@ var doc = `{ "status": { "description": "状态", "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysDictDataControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "cssClass": { "type": "string" }, @@ -1969,12 +2730,18 @@ var doc = `{ }, "status": { "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysDictTypeControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "dictName": { "type": "string" }, @@ -1989,12 +2756,18 @@ var doc = `{ }, "status": { "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysMenuById": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "id": { "type": "integer" }, @@ -2003,6 +2776,9 @@ var doc = `{ "items": { "type": "integer" } + }, + "updateBy": { + "type": "integer" } } }, @@ -2013,6 +2789,12 @@ var doc = `{ "description": "请求方式", "type": "string" }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, "breadcrumb": { "description": "是否面包屑", "type": "string" @@ -2021,6 +2803,9 @@ var doc = `{ "description": "组件", "type": "string" }, + "createBy": { + "type": "integer" + }, "icon": { "description": "图标", "type": "string" @@ -2065,19 +2850,45 @@ var doc = `{ "description": "排序", "type": "integer" }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, "title": { "description": "显示名称", "type": "string" }, + "updateBy": { + "type": "integer" + }, "visible": { "description": "是否显示", "type": "string" } } }, + "dto.SysOperaLogById": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "dto.SysPostControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "postCode": { "description": "编码", "type": "string" @@ -2101,6 +2912,9 @@ var doc = `{ "status": { "description": "状态", "type": "integer" + }, + "updateBy": { + "type": "integer" } } }, @@ -2124,6 +2938,9 @@ var doc = `{ "admin": { "type": "boolean" }, + "createBy": { + "type": "integer" + }, "dataScope": { "type": "string" }, @@ -2160,27 +2977,14 @@ var doc = `{ "status": { "description": "状态", "type": "string" - } - } - }, - "dto.SysSettingControl": { - "type": "object", - "required": [ - "logo", - "name", - "settings_id" - ], - "properties": { - "logo": { - "description": "头像", - "type": "string" }, - "name": { - "description": "名称", - "type": "string" + "sysMenu": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } }, - "settings_id": { - "description": "头像", + "updateBy": { "type": "integer" } } @@ -2191,6 +2995,9 @@ var doc = `{ "avatar": { "type": "string" }, + "createBy": { + "type": "integer" + }, "deptId": { "type": "integer" }, @@ -2221,6 +3028,9 @@ var doc = `{ "status": { "type": "string" }, + "updateBy": { + "type": "integer" + }, "userId": { "description": "用户ID", "type": "integer" @@ -2253,6 +3063,188 @@ var doc = `{ } } }, + "models.SysApi": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "handle": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "path": { + "type": "string" + }, + "title": { + "type": "string" + }, + "type": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + } + } + }, + "models.SysConfig": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configName": { + "type": "string" + }, + "configType": { + "type": "string" + }, + "configValue": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "isFrontend": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + } + } + }, + "models.SysMenu": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, + "breadcrumb": { + "type": "string" + }, + "children": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } + }, + "component": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "icon": { + "type": "string" + }, + "isFrame": { + "type": "string" + }, + "is_select": { + "type": "boolean" + }, + "menuId": { + "type": "integer" + }, + "menuName": { + "type": "string" + }, + "menuType": { + "type": "string" + }, + "noCache": { + "type": "boolean" + }, + "params": { + "type": "string" + }, + "parentId": { + "type": "integer" + }, + "path": { + "type": "string" + }, + "paths": { + "type": "string" + }, + "permission": { + "type": "string" + }, + "roleId": { + "type": "integer" + }, + "sort": { + "type": "integer" + }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, + "title": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + }, + "visible": { + "type": "string" + } + } + }, + "response.Page": { + "type": "object", + "properties": { + "count": { + "type": "integer" + }, + "pageIndex": { + "type": "integer" + }, + "pageSize": { + "type": "integer" + } + } + }, "response.Response": { "type": "object", "properties": { @@ -2263,6 +3255,7 @@ var doc = `{ "type": "string" }, "requestId": { + "description": "数据集", "type": "string" }, "status": { @@ -2429,7 +3422,7 @@ var doc = `{ } }, "createBy": { - "type": "string" + "type": "integer" }, "createdAt": { "type": "string" @@ -2469,8 +3462,12 @@ var doc = `{ "logicalDeleteColumn": { "type": "string" }, + "moduleFrontName": { + "description": "前端文件名", + "type": "string" + }, "moduleName": { - "description": "模块名", + "description": "go文件名", "type": "string" }, "options": { @@ -2523,7 +3520,7 @@ var doc = `{ "type": "string" }, "updateBy": { - "type": "string" + "type": "integer" }, "updatedAt": { "type": "string" @@ -2551,12 +3548,12 @@ type swaggerInfo struct { // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = swaggerInfo{ - Version: "1.3.1", + Version: "2.0.0", Host: "", BasePath: "", Schemes: []string{}, Title: "go-admin API", - Description: "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 74520518 进入技术交流群 请备注,谢谢!", + Description: "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 521386980 进入技术交流群 请先star,谢谢!", } type s struct{} diff --git a/docs/swagger.json b/docs/swagger.json index 7d371bf..dcbaeae 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1,16 +1,53 @@ { "swagger": "2.0", "info": { - "description": "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 74520518 进入技术交流群 请备注,谢谢!", + "description": "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 521386980 进入技术交流群 请先star,谢谢!", "title": "go-admin API", "contact": {}, "license": { "name": "MIT", "url": "https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md" }, - "version": "1.3.1" + "version": "2.0.0" }, "paths": { + "/api/v1/app-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取系统配置信息,主要注意这里不在验证数据权限", + "tags": [ + "配置管理" + ], + "summary": "获取系统前台配置信息,主要注意这里不在验证数据权限", + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + } + ] + } + } + } + } + }, "/api/v1/db/columns/page": { "get": { "description": "数据库表列分页列表 / database table column page list", @@ -264,6 +301,37 @@ } } }, + "/api/v1/dict-data/option-select": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "数据字典根据key获取", + "tags": [ + "字典数据" + ], + "summary": "数据字典根据key获取", + "parameters": [ + { + "type": "integer", + "description": "dictType", + "name": "dictType", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/dict/data": { "get": { "security": [ @@ -417,6 +485,11 @@ } }, "delete": { + "security": [ + { + "Bearer": [] + } + ], "description": "删除数据", "tags": [ "字典数据" @@ -540,7 +613,7 @@ "tags": [ "字典类型" ], - "summary": "字典类型全部数据", + "summary": "字典类型全部数据 代码生成使用接口", "parameters": [ { "type": "string", @@ -582,7 +655,7 @@ "tags": [ "字典类型" ], - "summary": "通过字典id获取字典类型", + "summary": "字典类型通过字典id获取", "parameters": [ { "type": "integer", @@ -660,7 +733,69 @@ } } }, + "/api/v1/login": { + "post": { + "description": "获取token\nLoginHandler can be used by clients to get a jwt token.\nPayload needs to be json in the form of {\"username\": \"USERNAME\", \"password\": \"PASSWORD\"}.\nReply will be of the form {\"token\": \"TOKEN\"}.\ndev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password\n注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值", + "consumes": [ + "application/json" + ], + "summary": "登陆", + "parameters": [ + { + "description": "account", + "name": "account", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/handler.Login" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"expire\": \"2019-08-07T12:45:48+08:00\", \"token\": \".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A\" }", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/menu": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "菜单" + ], + "summary": "Menu列表数据", + "parameters": [ + { + "type": "string", + "description": "menuName", + "name": "menuName", + "in": "query" + }, + { + "type": "string", + "description": "menuName", + "name": "menuName", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + }, "post": { "security": [ { @@ -726,9 +861,7 @@ } } } - } - }, - "/api/v1/menu/": { + }, "delete": { "description": "删除数据", "tags": [ @@ -827,7 +960,7 @@ } } }, - "/api/v1/menuTreeselect": { + "/api/v1/menuTreeselect/{roleId}": { "get": { "security": [ { @@ -841,7 +974,16 @@ "tags": [ "菜单" ], - "summary": "获取菜单树", + "summary": "角色修改使用的菜单列表", + "parameters": [ + { + "type": "integer", + "description": "roleId", + "name": "roleId", + "in": "path", + "required": true + } + ], "responses": { "200": { "description": "{\"code\": -1, \"message\": \"添加失败\"}", @@ -883,36 +1025,6 @@ } } }, - "/api/v1/menulist": { - "get": { - "security": [ - { - "Bearer": [] - } - ], - "description": "获取JSON", - "tags": [ - "菜单" - ], - "summary": "Menu列表数据", - "parameters": [ - { - "type": "string", - "description": "menuName", - "name": "menuName", - "in": "query" - } - ], - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/api/v1/menurole": { "get": { "security": [ @@ -924,16 +1036,7 @@ "tags": [ "菜单" ], - "summary": "根据角色名称获取菜单列表数据(左菜单使用)", - "parameters": [ - { - "type": "integer", - "description": "id", - "name": "id", - "in": "path", - "required": true - } - ], + "summary": "根据登录角色名称获取菜单列表数据(左菜单使用)", "responses": { "200": { "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", @@ -1342,24 +1445,7 @@ } } }, - "/api/v1/setting": { - "get": { - "description": "获取JSON", - "tags": [ - "系统信息" - ], - "summary": "查询系统信息", - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", - "schema": { - "type": "string" - } - } - } - } - }, - "/api/v1/settings/serverInfo": { + "/api/v1/server-monitor": { "get": { "description": "获取JSON", "tags": [ @@ -1376,6 +1462,646 @@ } } }, + "/api/v1/set-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "界面操作设置配置值的获取", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "获取配置", + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": true + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "界面操作设置配置值", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "设置配置", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/dto.GetSetSysConfigReq" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-api": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取接口管理列表", + "tags": [ + "接口管理" + ], + "summary": "获取接口管理列表", + "parameters": [ + { + "type": "string", + "description": "名称", + "name": "name", + "in": "query" + }, + { + "type": "string", + "description": "标题", + "name": "title", + "in": "query" + }, + { + "type": "string", + "description": "地址", + "name": "path", + "in": "query" + }, + { + "type": "string", + "description": "类型", + "name": "action", + "in": "query" + }, + { + "type": "integer", + "description": "页条数", + "name": "pageSize", + "in": "query" + }, + { + "type": "integer", + "description": "页码", + "name": "pageIndex", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "allOf": [ + { + "$ref": "#/definitions/response.Page" + }, + { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + } + } + } + ] + } + } + } + ] + } + } + } + }, + "delete": { + "security": [ + { + "Bearer": [] + } + ], + "description": "删除接口管理", + "tags": [ + "接口管理" + ], + "summary": "删除接口管理", + "parameters": [ + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-api/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取接口管理", + "tags": [ + "接口管理" + ], + "summary": "获取接口管理", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.SysApi" + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "修改接口管理", + "consumes": [ + "application/json" + ], + "tags": [ + "接口管理" + ], + "summary": "修改接口管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysApiControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-config": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取配置管理列表", + "tags": [ + "配置管理" + ], + "summary": "获取配置管理列表", + "parameters": [ + { + "type": "string", + "description": "名称", + "name": "configName", + "in": "query" + }, + { + "type": "string", + "description": "key", + "name": "configKey", + "in": "query" + }, + { + "type": "string", + "description": "类型", + "name": "configType", + "in": "query" + }, + { + "type": "integer", + "description": "是否前端", + "name": "isFrontend", + "in": "query" + }, + { + "type": "integer", + "description": "页条数", + "name": "pageSize", + "in": "query" + }, + { + "type": "integer", + "description": "页码", + "name": "pageIndex", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "allOf": [ + { + "$ref": "#/definitions/response.Page" + }, + { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + } + } + } + ] + } + } + } + ] + } + } + } + }, + "post": { + "security": [ + { + "Bearer": [] + } + ], + "description": "创建配置管理", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "创建配置管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysConfigControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"创建成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + }, + "delete": { + "security": [ + { + "Bearer": [] + } + ], + "description": "删除配置管理", + "tags": [ + "配置管理" + ], + "summary": "删除配置管理", + "parameters": [ + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-config/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取配置管理", + "tags": [ + "配置管理" + ], + "summary": "获取配置管理", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path" + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"data\": [...]}", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.SysConfig" + } + } + } + ] + } + } + } + }, + "put": { + "security": [ + { + "Bearer": [] + } + ], + "description": "修改配置管理", + "consumes": [ + "application/json" + ], + "tags": [ + "配置管理" + ], + "summary": "修改配置管理", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysConfigControl" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": 200, \"message\": \"修改成功\"}", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/api/v1/sys-opera-log": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "操作日志" + ], + "summary": "操作日志列表", + "parameters": [ + { + "type": "string", + "description": "title", + "name": "title", + "in": "query" + }, + { + "type": "string", + "description": "method", + "name": "method", + "in": "query" + }, + { + "type": "string", + "description": "requestMethod", + "name": "requestMethod", + "in": "query" + }, + { + "type": "string", + "description": "operUrl", + "name": "operUrl", + "in": "query" + }, + { + "type": "string", + "description": "operIp", + "name": "operIp", + "in": "query" + }, + { + "type": "string", + "description": "status", + "name": "status", + "in": "query" + }, + { + "type": "string", + "description": "beginTime", + "name": "beginTime", + "in": "query" + }, + { + "type": "string", + "description": "endTime", + "name": "endTime", + "in": "query" + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + }, + "delete": { + "description": "删除数据", + "tags": [ + "操作日志" + ], + "summary": "删除操作日志", + "parameters": [ + { + "description": "body", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysOperaLogById" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/api/v1/sys-opera-log/{id}": { + "get": { + "security": [ + { + "Bearer": [] + } + ], + "description": "获取JSON", + "tags": [ + "操作日志" + ], + "summary": "操作日志通过id获取", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "query" + }, + { + "description": "ids", + "name": "ids", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "integer" + } + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"抱歉未找到相关信息\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/sys/tables/info": { "put": { "security": [ @@ -1625,34 +2351,6 @@ } } }, - "/api/v1/system/setting": { - "post": { - "description": "获取JSON", - "tags": [ - "系统信息" - ], - "summary": "更新或提交系统信息", - "parameters": [ - { - "description": "body", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/dto.SysSettingControl" - } - } - ], - "responses": { - "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/api/v1/sysuser/{userId}": { "put": { "description": "获取JSON", @@ -1795,34 +2493,6 @@ } } }, - "/login": { - "post": { - "description": "获取token\nLoginHandler can be used by clients to get a jwt token.\nPayload needs to be json in the form of {\"username\": \"USERNAME\", \"password\": \"PASSWORD\"}.\nReply will be of the form {\"token\": \"TOKEN\"}.\ndev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password\n注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值", - "consumes": [ - "application/json" - ], - "summary": "登陆", - "parameters": [ - { - "description": "account", - "name": "account", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/handler.Login" - } - } - ], - "responses": { - "200": { - "description": "{\"code\": 200, \"expire\": \"2019-08-07T12:45:48+08:00\", \"token\": \".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A\" }", - "schema": { - "type": "string" - } - } - } - } - }, "/logout": { "post": { "security": [ @@ -1847,6 +2517,17 @@ } }, "definitions": { + "dto.GetSetSysConfigReq": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configValue": { + "type": "string" + } + } + }, "dto.PassWord": { "type": "object", "required": [ @@ -1862,6 +2543,77 @@ } } }, + "dto.SysApiControl": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "handle": { + "type": "string" + }, + "id": { + "description": "编码", + "type": "integer" + }, + "path": { + "type": "string" + }, + "title": { + "type": "string" + }, + "type": { + "type": "string" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysConfigByKeyReq": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + } + } + }, + "dto.SysConfigControl": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configName": { + "type": "string" + }, + "configType": { + "type": "string" + }, + "configValue": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "id": { + "description": "编码", + "type": "integer" + }, + "isFrontend": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "updateBy": { + "type": "integer" + } + } + }, "dto.SysDeptById": { "type": "object", "properties": { @@ -1879,6 +2631,9 @@ "dto.SysDeptControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "deptId": { "description": "编码", "type": "integer" @@ -1914,12 +2669,18 @@ "status": { "description": "状态", "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysDictDataControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "cssClass": { "type": "string" }, @@ -1952,12 +2713,18 @@ }, "status": { "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysDictTypeControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "dictName": { "type": "string" }, @@ -1972,12 +2739,18 @@ }, "status": { "type": "string" + }, + "updateBy": { + "type": "integer" } } }, "dto.SysMenuById": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "id": { "type": "integer" }, @@ -1986,6 +2759,9 @@ "items": { "type": "integer" } + }, + "updateBy": { + "type": "integer" } } }, @@ -1996,6 +2772,12 @@ "description": "请求方式", "type": "string" }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, "breadcrumb": { "description": "是否面包屑", "type": "string" @@ -2004,6 +2786,9 @@ "description": "组件", "type": "string" }, + "createBy": { + "type": "integer" + }, "icon": { "description": "图标", "type": "string" @@ -2048,19 +2833,45 @@ "description": "排序", "type": "integer" }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, "title": { "description": "显示名称", "type": "string" }, + "updateBy": { + "type": "integer" + }, "visible": { "description": "是否显示", "type": "string" } } }, + "dto.SysOperaLogById": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "dto.SysPostControl": { "type": "object", "properties": { + "createBy": { + "type": "integer" + }, "postCode": { "description": "编码", "type": "string" @@ -2084,6 +2895,9 @@ "status": { "description": "状态", "type": "integer" + }, + "updateBy": { + "type": "integer" } } }, @@ -2107,6 +2921,9 @@ "admin": { "type": "boolean" }, + "createBy": { + "type": "integer" + }, "dataScope": { "type": "string" }, @@ -2143,27 +2960,14 @@ "status": { "description": "状态", "type": "string" - } - } - }, - "dto.SysSettingControl": { - "type": "object", - "required": [ - "logo", - "name", - "settings_id" - ], - "properties": { - "logo": { - "description": "头像", - "type": "string" }, - "name": { - "description": "名称", - "type": "string" + "sysMenu": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } }, - "settings_id": { - "description": "头像", + "updateBy": { "type": "integer" } } @@ -2174,6 +2978,9 @@ "avatar": { "type": "string" }, + "createBy": { + "type": "integer" + }, "deptId": { "type": "integer" }, @@ -2204,6 +3011,9 @@ "status": { "type": "string" }, + "updateBy": { + "type": "integer" + }, "userId": { "description": "用户ID", "type": "integer" @@ -2236,6 +3046,188 @@ } } }, + "models.SysApi": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "handle": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "path": { + "type": "string" + }, + "title": { + "type": "string" + }, + "type": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + } + } + }, + "models.SysConfig": { + "type": "object", + "properties": { + "configKey": { + "type": "string" + }, + "configName": { + "type": "string" + }, + "configType": { + "type": "string" + }, + "configValue": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "isFrontend": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + } + } + }, + "models.SysMenu": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, + "breadcrumb": { + "type": "string" + }, + "children": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } + }, + "component": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "icon": { + "type": "string" + }, + "isFrame": { + "type": "string" + }, + "is_select": { + "type": "boolean" + }, + "menuId": { + "type": "integer" + }, + "menuName": { + "type": "string" + }, + "menuType": { + "type": "string" + }, + "noCache": { + "type": "boolean" + }, + "params": { + "type": "string" + }, + "parentId": { + "type": "integer" + }, + "path": { + "type": "string" + }, + "paths": { + "type": "string" + }, + "permission": { + "type": "string" + }, + "roleId": { + "type": "integer" + }, + "sort": { + "type": "integer" + }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, + "title": { + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "updatedAt": { + "type": "string" + }, + "visible": { + "type": "string" + } + } + }, + "response.Page": { + "type": "object", + "properties": { + "count": { + "type": "integer" + }, + "pageIndex": { + "type": "integer" + }, + "pageSize": { + "type": "integer" + } + } + }, "response.Response": { "type": "object", "properties": { @@ -2246,6 +3238,7 @@ "type": "string" }, "requestId": { + "description": "数据集", "type": "string" }, "status": { @@ -2412,7 +3405,7 @@ } }, "createBy": { - "type": "string" + "type": "integer" }, "createdAt": { "type": "string" @@ -2452,8 +3445,12 @@ "logicalDeleteColumn": { "type": "string" }, + "moduleFrontName": { + "description": "前端文件名", + "type": "string" + }, "moduleName": { - "description": "模块名", + "description": "go文件名", "type": "string" }, "options": { @@ -2506,7 +3503,7 @@ "type": "string" }, "updateBy": { - "type": "string" + "type": "integer" }, "updatedAt": { "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index b8cbf28..f31c389 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,4 +1,11 @@ definitions: + dto.GetSetSysConfigReq: + properties: + configKey: + type: string + configValue: + type: string + type: object dto.PassWord: properties: newPassword: @@ -9,6 +16,53 @@ definitions: - newPassword - oldPassword type: object + dto.SysApiControl: + properties: + action: + type: string + createBy: + type: integer + handle: + type: string + id: + description: 编码 + type: integer + path: + type: string + title: + type: string + type: + type: string + updateBy: + type: integer + type: object + dto.SysConfigByKeyReq: + properties: + configKey: + type: string + type: object + dto.SysConfigControl: + properties: + configKey: + type: string + configName: + type: string + configType: + type: string + configValue: + type: string + createBy: + type: integer + id: + description: 编码 + type: integer + isFrontend: + type: integer + remark: + type: string + updateBy: + type: integer + type: object dto.SysDeptById: properties: id: @@ -20,6 +74,8 @@ definitions: type: object dto.SysDeptControl: properties: + createBy: + type: integer deptId: description: 编码 type: integer @@ -47,9 +103,13 @@ definitions: status: description: 状态 type: string + updateBy: + type: integer type: object dto.SysDictDataControl: properties: + createBy: + type: integer cssClass: type: string default: @@ -72,9 +132,13 @@ definitions: type: string status: type: string + updateBy: + type: integer type: object dto.SysDictTypeControl: properties: + createBy: + type: integer dictName: type: string dictType: @@ -85,27 +149,39 @@ definitions: type: string status: type: string + updateBy: + type: integer type: object dto.SysMenuById: properties: + createBy: + type: integer id: type: integer ids: items: type: integer type: array + updateBy: + type: integer type: object dto.SysMenuControl: properties: action: description: 请求方式 type: string + apis: + items: + type: integer + type: array breadcrumb: description: 是否面包屑 type: string component: description: 组件 type: string + createBy: + type: integer icon: description: 图标 type: string @@ -139,15 +215,32 @@ definitions: sort: description: 排序 type: integer + sysApi: + items: + $ref: '#/definitions/models.SysApi' + type: array title: description: 显示名称 type: string + updateBy: + type: integer visible: description: 是否显示 type: string type: object + dto.SysOperaLogById: + properties: + id: + type: integer + ids: + items: + type: integer + type: array + type: object dto.SysPostControl: properties: + createBy: + type: integer postCode: description: 编码 type: string @@ -166,6 +259,8 @@ definitions: status: description: 状态 type: integer + updateBy: + type: integer type: object dto.SysRoleById: properties: @@ -180,6 +275,8 @@ definitions: properties: admin: type: boolean + createBy: + type: integer dataScope: type: string flag: @@ -207,27 +304,19 @@ definitions: status: description: 状态 type: string - type: object - dto.SysSettingControl: - properties: - logo: - description: 头像 - type: string - name: - description: 名称 - type: string - settings_id: - description: 头像 + sysMenu: + items: + $ref: '#/definitions/models.SysMenu' + type: array + updateBy: type: integer - required: - - logo - - name - - settings_id type: object dto.SysUserControl: properties: avatar: type: string + createBy: + type: integer deptId: type: integer email: @@ -248,6 +337,8 @@ definitions: type: string status: type: string + updateBy: + type: integer userId: description: 用户ID type: integer @@ -270,6 +361,126 @@ definitions: - username - uuid type: object + models.SysApi: + properties: + action: + type: string + createBy: + type: integer + createdAt: + type: string + handle: + type: string + id: + type: integer + path: + type: string + title: + type: string + type: + type: string + updateBy: + type: integer + updatedAt: + type: string + type: object + models.SysConfig: + properties: + configKey: + type: string + configName: + type: string + configType: + type: string + configValue: + type: string + createBy: + type: integer + createdAt: + type: string + id: + type: integer + isFrontend: + type: integer + remark: + type: string + updateBy: + type: integer + updatedAt: + type: string + type: object + models.SysMenu: + properties: + action: + type: string + apis: + items: + type: integer + type: array + breadcrumb: + type: string + children: + items: + $ref: '#/definitions/models.SysMenu' + type: array + component: + type: string + createBy: + type: integer + createdAt: + type: string + dataScope: + type: string + icon: + type: string + is_select: + type: boolean + isFrame: + type: string + menuId: + type: integer + menuName: + type: string + menuType: + type: string + noCache: + type: boolean + params: + type: string + parentId: + type: integer + path: + type: string + paths: + type: string + permission: + type: string + roleId: + type: integer + sort: + type: integer + sysApi: + items: + $ref: '#/definitions/models.SysApi' + type: array + title: + type: string + updateBy: + type: integer + updatedAt: + type: string + visible: + type: string + type: object + response.Page: + properties: + count: + type: integer + pageIndex: + type: integer + pageSize: + type: integer + type: object response.Response: properties: code: @@ -277,6 +488,7 @@ definitions: msg: type: string requestId: + description: 数据集 type: string status: type: string @@ -387,7 +599,7 @@ definitions: $ref: '#/definitions/tools.SysColumns' type: array createBy: - type: string + type: integer createdAt: type: string crud: @@ -414,8 +626,11 @@ definitions: type: boolean logicalDeleteColumn: type: string + moduleFrontName: + description: 前端文件名 + type: string moduleName: - description: 模块名 + description: go文件名 type: string options: type: string @@ -452,7 +667,7 @@ definitions: treeParentCode: type: string updateBy: - type: string + type: integer updatedAt: type: string type: object @@ -460,13 +675,33 @@ info: contact: {} description: |- 基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档 - 添加qq群: 74520518 进入技术交流群 请备注,谢谢! + 添加qq群: 521386980 进入技术交流群 请先star,谢谢! license: name: MIT url: https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md title: go-admin API - version: 1.3.1 + version: 2.0.0 paths: + /api/v1/app-config: + get: + description: 获取系统配置信息,主要注意这里不在验证数据权限 + responses: + "200": + description: '{"code": 200, "data": [...]}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + additionalProperties: + type: string + type: object + type: object + security: + - Bearer: [] + summary: 获取系统前台配置信息,主要注意这里不在验证数据权限 + tags: + - 配置管理 /api/v1/db/columns/page: get: description: 数据库表列分页列表 / database table column page list @@ -627,6 +862,25 @@ paths: summary: 修改部门 tags: - 部门 + /api/v1/dict-data/option-select: + get: + description: 数据字典根据key获取 + parameters: + - description: dictType + in: query + name: dictType + required: true + type: integer + responses: + "200": + description: '{"code": -1, "message": "删除失败"}' + schema: + type: string + security: + - Bearer: [] + summary: 数据字典根据key获取 + tags: + - 字典数据 /api/v1/dict/data: get: description: 获取JSON @@ -696,6 +950,8 @@ paths: description: '{"code": -1, "message": "删除失败"}' schema: type: string + security: + - Bearer: [] summary: 删除字典数据 tags: - 字典数据 @@ -816,7 +1072,7 @@ paths: $ref: '#/definitions/response.Response' security: - Bearer: [] - summary: 字典类型全部数据 + summary: 字典类型全部数据 代码生成使用接口 tags: - 字典类型 /api/v1/dict/type/{dictId}: @@ -851,7 +1107,7 @@ paths: $ref: '#/definitions/response.Response' security: - Bearer: [] - summary: 通过字典id获取字典类型 + summary: 字典类型通过字典id获取 tags: - 字典类型 put: @@ -875,7 +1131,71 @@ paths: summary: 修改字典类型 tags: - 字典类型 + /api/v1/login: + post: + consumes: + - application/json + description: |- + 获取token + LoginHandler can be used by clients to get a jwt token. + Payload needs to be json in the form of {"username": "USERNAME", "password": "PASSWORD"}. + Reply will be of the form {"token": "TOKEN"}. + dev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password + 注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值 + parameters: + - description: account + in: body + name: account + required: true + schema: + $ref: '#/definitions/handler.Login' + responses: + "200": + description: '{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": + ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" + }' + schema: + type: string + summary: 登陆 /api/v1/menu: + delete: + description: 删除数据 + parameters: + - description: body + in: body + name: data + required: true + schema: + $ref: '#/definitions/dto.SysMenuById' + responses: + "200": + description: '{"code": -1, "message": "删除失败"}' + schema: + type: string + summary: 删除菜单 + tags: + - 菜单 + get: + description: 获取JSON + parameters: + - description: menuName + in: query + name: menuName + type: string + - description: menuName + in: query + name: menuName + type: string + responses: + "200": + description: '{"code": -1, "message": "抱歉未找到相关信息"}' + schema: + type: string + security: + - Bearer: [] + summary: Menu列表数据 + tags: + - 菜单 post: consumes: - application/x-www-form-urlencoded @@ -920,24 +1240,6 @@ paths: summary: 创建菜单 tags: - 菜单 - /api/v1/menu/: - delete: - description: 删除数据 - parameters: - - description: body - in: body - name: data - required: true - schema: - $ref: '#/definitions/dto.SysMenuById' - responses: - "200": - description: '{"code": -1, "message": "删除失败"}' - schema: - type: string - summary: 删除菜单 - tags: - - 菜单 /api/v1/menu/{id}: get: description: 获取JSON @@ -982,11 +1284,17 @@ paths: summary: 修改菜单 tags: - 菜单 - /api/v1/menuTreeselect: + /api/v1/menuTreeselect/{roleId}: get: consumes: - application/x-www-form-urlencoded description: 获取JSON + parameters: + - description: roleId + in: path + name: roleId + required: true + type: integer responses: "200": description: '{"code": -1, "message": "添加失败"}' @@ -994,7 +1302,7 @@ paths: type: string security: - Bearer: [] - summary: 获取菜单树 + summary: 角色修改使用的菜单列表 tags: - 菜单 /api/v1/menuids/{id}: @@ -1016,33 +1324,9 @@ paths: summary: 获取角色对应的菜单id数组 tags: - 菜单 - /api/v1/menulist: - get: - description: 获取JSON - parameters: - - description: menuName - in: query - name: menuName - type: string - responses: - "200": - description: '{"code": -1, "message": "抱歉未找到相关信息"}' - schema: - type: string - security: - - Bearer: [] - summary: Menu列表数据 - tags: - - 菜单 /api/v1/menurole: get: description: 获取JSON - parameters: - - description: id - in: path - name: id - required: true - type: integer responses: "200": description: '{"code": -1, "message": "抱歉未找到相关信息"}' @@ -1050,7 +1334,7 @@ paths: type: string security: - Bearer: [] - summary: 根据角色名称获取菜单列表数据(左菜单使用) + summary: 根据登录角色名称获取菜单列表数据(左菜单使用) tags: - 菜单 /api/v1/post: @@ -1302,18 +1586,7 @@ paths: summary: 修改用户角色 tags: - 角色/Role - /api/v1/setting: - get: - description: 获取JSON - responses: - "200": - description: '{"code": -1, "message": "添加失败"}' - schema: - type: string - summary: 查询系统信息 - tags: - - 系统信息 - /api/v1/settings/serverInfo: + /api/v1/server-monitor: get: description: 获取JSON responses: @@ -1324,6 +1597,387 @@ paths: summary: 系统信息 tags: - 系统信息 + /api/v1/set-config: + get: + consumes: + - application/json + description: 界面操作设置配置值的获取 + responses: + "200": + description: '{"code": 200, "message": "修改成功"}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + additionalProperties: true + type: object + type: object + security: + - Bearer: [] + summary: 获取配置 + tags: + - 配置管理 + put: + consumes: + - application/json + description: 界面操作设置配置值 + parameters: + - description: body + in: body + name: data + required: true + schema: + items: + $ref: '#/definitions/dto.GetSetSysConfigReq' + type: array + responses: + "200": + description: '{"code": 200, "message": "修改成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 设置配置 + tags: + - 配置管理 + /api/v1/sys-api: + delete: + description: 删除接口管理 + parameters: + - description: ids + in: body + name: ids + schema: + items: + type: integer + type: array + responses: + "200": + description: '{"code": 200, "message": "删除成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 删除接口管理 + tags: + - 接口管理 + get: + description: 获取接口管理列表 + parameters: + - description: 名称 + in: query + name: name + type: string + - description: 标题 + in: query + name: title + type: string + - description: 地址 + in: query + name: path + type: string + - description: 类型 + in: query + name: action + type: string + - description: 页条数 + in: query + name: pageSize + type: integer + - description: 页码 + in: query + name: pageIndex + type: integer + responses: + "200": + description: '{"code": 200, "data": [...]}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + allOf: + - $ref: '#/definitions/response.Page' + - properties: + list: + items: + $ref: '#/definitions/models.SysApi' + type: array + type: object + type: object + security: + - Bearer: [] + summary: 获取接口管理列表 + tags: + - 接口管理 + /api/v1/sys-api/{id}: + get: + description: 获取接口管理 + parameters: + - description: id + in: path + name: id + type: string + responses: + "200": + description: '{"code": 200, "data": [...]}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + $ref: '#/definitions/models.SysApi' + type: object + security: + - Bearer: [] + summary: 获取接口管理 + tags: + - 接口管理 + put: + consumes: + - application/json + description: 修改接口管理 + parameters: + - description: body + in: body + name: data + required: true + schema: + $ref: '#/definitions/dto.SysApiControl' + responses: + "200": + description: '{"code": 200, "message": "修改成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 修改接口管理 + tags: + - 接口管理 + /api/v1/sys-config: + delete: + description: 删除配置管理 + parameters: + - description: ids + in: body + name: ids + schema: + items: + type: integer + type: array + responses: + "200": + description: '{"code": 200, "message": "删除成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 删除配置管理 + tags: + - 配置管理 + get: + description: 获取配置管理列表 + parameters: + - description: 名称 + in: query + name: configName + type: string + - description: key + in: query + name: configKey + type: string + - description: 类型 + in: query + name: configType + type: string + - description: 是否前端 + in: query + name: isFrontend + type: integer + - description: 页条数 + in: query + name: pageSize + type: integer + - description: 页码 + in: query + name: pageIndex + type: integer + responses: + "200": + description: '{"code": 200, "data": [...]}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + allOf: + - $ref: '#/definitions/response.Page' + - properties: + list: + items: + $ref: '#/definitions/models.SysApi' + type: array + type: object + type: object + security: + - Bearer: [] + summary: 获取配置管理列表 + tags: + - 配置管理 + post: + consumes: + - application/json + description: 创建配置管理 + parameters: + - description: body + in: body + name: data + required: true + schema: + $ref: '#/definitions/dto.SysConfigControl' + responses: + "200": + description: '{"code": 200, "message": "创建成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 创建配置管理 + tags: + - 配置管理 + /api/v1/sys-config/{id}: + get: + description: 获取配置管理 + parameters: + - description: id + in: path + name: id + type: string + responses: + "200": + description: '{"code": 200, "data": [...]}' + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + $ref: '#/definitions/models.SysConfig' + type: object + security: + - Bearer: [] + summary: 获取配置管理 + tags: + - 配置管理 + put: + consumes: + - application/json + description: 修改配置管理 + parameters: + - description: body + in: body + name: data + required: true + schema: + $ref: '#/definitions/dto.SysConfigControl' + responses: + "200": + description: '{"code": 200, "message": "修改成功"}' + schema: + $ref: '#/definitions/response.Response' + security: + - Bearer: [] + summary: 修改配置管理 + tags: + - 配置管理 + /api/v1/sys-opera-log: + delete: + description: 删除数据 + parameters: + - description: body + in: body + name: data + required: true + schema: + $ref: '#/definitions/dto.SysOperaLogById' + responses: + "200": + description: '{"code": -1, "message": "删除失败"}' + schema: + type: string + summary: 删除操作日志 + tags: + - 操作日志 + get: + description: 获取JSON + parameters: + - description: title + in: query + name: title + type: string + - description: method + in: query + name: method + type: string + - description: requestMethod + in: query + name: requestMethod + type: string + - description: operUrl + in: query + name: operUrl + type: string + - description: operIp + in: query + name: operIp + type: string + - description: status + in: query + name: status + type: string + - description: beginTime + in: query + name: beginTime + type: string + - description: endTime + in: query + name: endTime + type: string + responses: + "200": + description: '{"code": -1, "message": "抱歉未找到相关信息"}' + schema: + type: string + security: + - Bearer: [] + summary: 操作日志列表 + tags: + - 操作日志 + /api/v1/sys-opera-log/{id}: + get: + description: 获取JSON + parameters: + - description: id + in: query + name: id + type: string + - description: ids + in: body + name: ids + schema: + items: + type: integer + type: array + responses: + "200": + description: '{"code": -1, "message": "抱歉未找到相关信息"}' + schema: + type: string + security: + - Bearer: [] + summary: 操作日志通过id获取 + tags: + - 操作日志 /api/v1/sys/tables/info: post: consumes: @@ -1480,24 +2134,6 @@ paths: summary: 获取用户 tags: - 用户 - /api/v1/system/setting: - post: - description: 获取JSON - parameters: - - description: body - in: body - name: data - required: true - schema: - $ref: '#/definitions/dto.SysSettingControl' - responses: - "200": - description: '{"code": -1, "message": "添加失败"}' - schema: - type: string - summary: 更新或提交系统信息 - tags: - - 系统信息 /api/v1/sysuser/{userId}: delete: description: 删除数据 @@ -1588,32 +2224,6 @@ paths: summary: 重置密码 tags: - 用户 - /login: - post: - consumes: - - application/json - description: |- - 获取token - LoginHandler can be used by clients to get a jwt token. - Payload needs to be json in the form of {"username": "USERNAME", "password": "PASSWORD"}. - Reply will be of the form {"token": "TOKEN"}. - dev mode:It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password - 注意:开发模式:需要注意全部字段不能为空,账号密码外可以传入0值 - parameters: - - description: account - in: body - name: account - required: true - schema: - $ref: '#/definitions/handler.Login' - responses: - "200": - description: '{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": - ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" - }' - schema: - type: string - summary: 登陆 /logout: post: consumes: diff --git a/go.mod b/go.mod index 0e3eb80..33f8f4e 100644 --- a/go.mod +++ b/go.mod @@ -8,24 +8,30 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/casbin/casbin/v2 v2.25.1 - github.com/gin-gonic/gin v1.6.3 - github.com/go-admin-team/go-admin-core v1.3.5-rc.1 - github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.1 + github.com/gin-gonic/gin v1.7.1 + github.com/go-admin-team/go-admin-core v1.3.5-rc.6 + github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6 github.com/google/uuid v1.2.0 github.com/mssola/user_agent v0.5.2 github.com/opentracing/opentracing-go v1.1.0 - github.com/prometheus/client_golang v1.1.0 + github.com/prometheus/client_golang v1.11.0 github.com/robfig/cron/v3 v3.0.1 - github.com/shirou/gopsutil v2.20.7+incompatible + github.com/shirou/gopsutil v3.21.5+incompatible github.com/spf13/cast v1.3.1 github.com/spf13/cobra v1.0.0 github.com/swaggo/gin-swagger v1.2.0 github.com/swaggo/swag v1.6.7 + github.com/tklauser/go-sysconf v0.3.6 // indirect github.com/unrolled/secure v1.0.8 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect gorm.io/driver/mysql v1.0.4-0.20201206014609-ae5fd10184f6 gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba - gorm.io/gorm v1.21.6 + gorm.io/gorm v1.21.10 ) + +//replace ( +// github.com/go-admin-team/go-admin-core v1.3.5-rc.6 => ../go-admin-core +// github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6 => ../go-admin-core/sdk +//) diff --git a/main.go b/main.go index 7e2c69f..d41f30d 100644 --- a/main.go +++ b/main.go @@ -7,9 +7,9 @@ import ( //go:generate swag init --parseDependency --parseDepth=6 // @title go-admin API -// @version 1.3.1 +// @version 2.0.0 // @description 基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档 -// @description 添加qq群: 74520518 进入技术交流群 请备注,谢谢! +// @description 添加qq群: 521386980 进入技术交流群 请先star,谢谢! // @license.name MIT // @license.url https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md diff --git a/template/v4/no_actions/apis.go.template b/template/v4/no_actions/apis.go.template index 47b69f4..f6f7e9b 100644 --- a/template/v4/no_actions/apis.go.template +++ b/template/v4/no_actions/apis.go.template @@ -1,9 +1,10 @@ -package {{.ModuleName}} +package apis import ( "net/http" "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" @@ -11,11 +12,10 @@ import ( "go-admin/app/{{.PackageName}}/service" "go-admin/app/{{.PackageName}}/service/dto" "go-admin/common/actions" - "go-admin/common/apis" ) type {{.ClassName}} struct { - apis.Api + api.Api } // Get{{.ClassName}}List 获取{{.TableComment}}列表 @@ -111,7 +111,7 @@ func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { return } - e.OK( object, "查看成功") + e.OK( object, "查询成功") } // Insert{{.ClassName}} 创建{{.TableComment}} diff --git a/template/v4/no_actions/router_check_role.go.template b/template/v4/no_actions/router_check_role.go.template index 0aeb43e..b045297 100644 --- a/template/v4/no_actions/router_check_role.go.template +++ b/template/v4/no_actions/router_check_role.go.template @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/{{.PackageName}}/apis/{{.ModuleName}}" + "go-admin/app/{{.PackageName}}/apis" "go-admin/common/middleware" ) @@ -14,7 +14,7 @@ func init() { // register{{.ClassName}}Router func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := &{{.ModuleName}}.{{.ClassName}}{} + api := apis.{{.ClassName}}{} r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.Get{{.ClassName}}List) diff --git a/template/v4/no_actions/router_no_check_role.go.template b/template/v4/no_actions/router_no_check_role.go.template index d079678..a110b1c 100644 --- a/template/v4/no_actions/router_no_check_role.go.template +++ b/template/v4/no_actions/router_no_check_role.go.template @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/{{.PackageName}}/apis/{{.ModuleName}}" + "go-admin/app/{{.PackageName}}/apis" ) func init() { @@ -13,7 +13,7 @@ func init() { // register{{.ClassName}}Router func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := &{{.ModuleName}}.{{.ClassName}}{} + api := apis.{{.ClassName}}{} r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()) { r.GET("", api.Get{{.ClassName}}) diff --git a/template/v4/no_actions/service.go.template b/template/v4/no_actions/service.go.template index aaa60a8..bd515d2 100644 --- a/template/v4/no_actions/service.go.template +++ b/template/v4/no_actions/service.go.template @@ -3,13 +3,13 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" "go-admin/app/{{.PackageName}}/models" "go-admin/common/actions" cDto "go-admin/common/dto" "go-admin/app/{{.PackageName}}/service/dto" - "go-admin/common/service" ) type {{.ClassName}} struct { diff --git a/template/v4/vue.go.template b/template/v4/vue.go.template index 93389cd..70c5de6 100644 --- a/template/v4/vue.go.template +++ b/template/v4/vue.go.template @@ -6,7 +6,7 @@ {{range .Columns}} {{- $x := .IsQuery -}} - {{- if ($x) -}} + {{- if (eq $x "1") -}} {{- if ne .FkTableName "" -}}