From 408dcc50573eb221eeaa9a9eac5b680153821ab0 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Fri, 21 May 2021 18:25:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_api.go | 88 ++++------ app/admin/apis/sys_config.go | 67 +++----- app/admin/apis/sys_dept.go | 202 +++++++++------------- app/admin/apis/sys_dict_data.go | 220 ++++++++++-------------- app/admin/apis/sys_dict_type.go | 222 ++++++++++--------------- app/admin/apis/sys_login_log.go | 140 ++++++++-------- app/admin/apis/sys_menu.go | 34 ++-- app/admin/apis/sys_opera_log.go | 141 ++++++++-------- app/admin/models/sys_api.go | 14 +- app/admin/router/sys_login_log.go | 4 +- app/admin/router/sys_opera_log.go | 4 +- app/admin/service/dto/sys_config.go | 84 +++------- app/admin/service/dto/sys_dept.go | 74 +++------ app/admin/service/dto/sys_dict_data.go | 47 ++---- app/admin/service/dto/sys_dict_type.go | 57 +++---- app/admin/service/dto/sys_login_log.go | 4 + app/admin/service/dto/sys_menu.go | 56 +------ app/admin/service/dto/sys_post.go | 4 + app/admin/service/dto/sys_role.go | 4 + app/admin/service/dto/sys_setting.go | 6 +- app/admin/service/dto/sys_user.go | 14 +- app/admin/service/sys_api.go | 9 +- app/admin/service/sys_config.go | 21 ++- app/admin/service/sys_dept.go | 25 ++- app/admin/service/sys_dict_data.go | 24 ++- app/admin/service/sys_dict_type.go | 26 ++- cmd/api/server.go | 8 - common/middleware/logger.go | 32 +--- 28 files changed, 649 insertions(+), 982 deletions(-) diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go index 7602fa6..7cc7dd3 100644 --- a/app/admin/apis/sys_api.go +++ b/app/admin/apis/sys_api.go @@ -1,6 +1,7 @@ package apis import ( + "github.com/gin-gonic/gin/binding" "net/http" "github.com/gin-gonic/gin" @@ -32,38 +33,28 @@ type SysApi struct { // @Router /api/v1/sys_api [get] // @Security Bearer func (e SysApi) GetSysApiList(c *gin.Context) { - e.MakeContext(c) - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - + s := new(service.SysApi) d := new(dto.SysApiSearch) - //查询列表 - err = d.Bind(c) + err := e.MakeContext(c). + MakeOrm(). + Bind(d,binding.Form). + MakeService(&s.Service). + Errors if err != nil { - log.Warnf("request body bind error, %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - //数据权限检查 p := actions.GetPermissionFromContext(c) - list := make([]models.SysApi, 0) var count int64 - serviceSysApi := service.SysApi{} - serviceSysApi.Log = log - serviceSysApi.Orm = db - err = serviceSysApi.GetSysApiPage(d, p, &list, &count) + err = s.GetSysApiPage(d, p, &list, &count) if err != nil { - log.Errorf("Get SysApi Page error, %s", err.Error()) + e.Logger.Errorf("Get SysApi Page error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "查询失败") return } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") } @@ -80,7 +71,7 @@ func (e SysApi) GetSysApi(c *gin.Context) { s := new(service.SysApi) err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(control,nil). MakeService(&s.Service). Errors if err != nil { @@ -114,26 +105,20 @@ func (e SysApi) GetSysApi(c *gin.Context) { // @Router /api/v1/sys_api/{id} [put] // @Security Bearer func (e SysApi) UpdateSysApi(c *gin.Context) { - e.MakeContext(c) - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } - control := new(dto.SysApiControl) - - //更新操作 - err = control.Bind(c) + s := new(service.SysApi) + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Warnf("request body bind error, %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Logger.Error(err) return } object, err := control.GenerateM() if err != nil { - log.Errorf("generate SysApi model error, %s", err.Error()) + e.Logger.Errorf("generate SysApi model error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "模型生成失败") return } @@ -142,12 +127,9 @@ func (e SysApi) UpdateSysApi(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - serviceSysApi := service.SysApi{} - serviceSysApi.Orm = db - serviceSysApi.Log = log - err = serviceSysApi.UpdateSysApi(object.(*models.SysApi), p) + err = s.UpdateSysApi(object.(*models.SysApi), p) if err != nil { - log.Errorf("Update SysApi error, %s", err.Error()) + e.Logger.Errorf("Update SysApi error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "更新失败") return } @@ -163,21 +145,16 @@ func (e SysApi) UpdateSysApi(c *gin.Context) { // @Router /api/v1/sys_api [delete] // @Security Bearer func (e SysApi) DeleteSysApi(c *gin.Context) { - e.MakeContext(c) - log := e.GetLogger() - db, err := e.GetOrm() - if err != nil { - log.Error(err) - return - } control := new(dto.SysApiById) - - //删除操作 - err = control.Bind(c) + s := service.SysApi{} + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Warnf("request body bind error, %s", err.Error()) - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Logger.Error(err) return } @@ -187,12 +164,9 @@ func (e SysApi) DeleteSysApi(c *gin.Context) { // 数据权限检查 p := actions.GetPermissionFromContext(c) - serviceSysApi := service.SysApi{} - serviceSysApi.Orm = db - serviceSysApi.Log = log - err = serviceSysApi.RemoveSysApi(control, p) + err = s.RemoveSysApi(control, p) if err != nil { - log.Errorf("Remove SysApi error, %s", err.Error()) + e.Logger.Errorf("Remove SysApi error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "删除失败") return } diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go index ef62c4e..2cf6f3c 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -30,7 +30,6 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { return } - list := make([]models.SysConfig, 0) var count int64 err = s.GetSysConfigPage(d, &list, &count) @@ -113,22 +112,16 @@ func (e SysConfig) InsertSysConfig(c *gin.Context) { return } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) - return - } // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) + control.SetCreateBy(user.GetUserId(c)) - err = s.InsertSysConfig(object) + err = s.InsertSysConfig(control) if err != nil { e.Logger.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") return } - e.OK(object.GetId(), "创建成功") + e.OK(control.GetId(), "创建成功") } func (e SysConfig) UpdateSysConfig(c *gin.Context) { @@ -144,21 +137,15 @@ func (e SysConfig) UpdateSysConfig(c *gin.Context) { return } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) - return - } - object.SetUpdateBy(user.GetUserId(c)) + control.SetUpdateBy(user.GetUserId(c)) - err = s.UpdateSysConfig(object) + err = s.UpdateSysConfig(control) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "更新失败") e.Logger.Errorf("Orm获取失败, error:%s", err) return } - e.OK(object.GetId(), "更新成功") + e.OK(control.GetId(), "更新成功") } func (e SysConfig) DeleteSysConfig(c *gin.Context) { @@ -174,49 +161,37 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) { return } - object, err := control.GenerateM() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) - return - } - // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) + control.SetUpdateBy(user.GetUserId(c)) - err = s.RemoveSysConfig(control, object) + err = s.RemoveSysConfig(control) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "删除失败") e.Logger.Errorf("Orm获取失败, error:%s", err) return } - e.OK(object.GetId(), "删除成功") + e.OK(control.GetId(), "删除成功") } // GetSysConfigByKEYForService 根据Key获取SysConfig的Service func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() + var s = new(service.SysConfig) + var control = new(dto.SysConfigControl) + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Logger.Error(err) return } - var v dto.SysConfigControl - err = v.Bind(c) + + err = s.GetSysConfigByKEY(control) 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.Logger.Errorf("通过Key获取配置失败, error:%s", err) e.Error(500, err, "") return } - e.OK(v, s.Msg) + e.OK(control, s.Msg) } \ No newline at end of file diff --git a/app/admin/apis/sys_dept.go b/app/admin/apis/sys_dept.go index 622973c..c5e5f89 100644 --- a/app/admin/apis/sys_dept.go +++ b/app/admin/apis/sys_dept.go @@ -1,6 +1,7 @@ package apis import ( + "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/pkg" "go-admin/app/admin/models" "net/http" @@ -18,6 +19,7 @@ type SysDept struct { api.Api } +// GetSysDeptList // @Summary 分页部门列表数据 // @Description 分页列表 // @Tags 部门 @@ -28,27 +30,21 @@ type SysDept struct { // @Router /api/v1/dept [get] // @Security Bearer func (e SysDept) GetSysDeptList(c *gin.Context) { - e.Context = c - log := e.GetLogger() + s := new(service.SysDept) d := new(dto.SysDeptSearch) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(d, binding.Form). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - return - } - list := make([]models.SysDept, 0) - serviceStudent := service.SysDept{} - serviceStudent.Log = log - serviceStudent.Orm = db - list, err = serviceStudent.SetDeptPage(d) + + list, err = s.SetDeptPage(d) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return @@ -57,6 +53,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) { e.OK(list, "查询成功") } +// GetSysDept // @Summary 部门列表数据 // @Description 获取JSON // @Tags 部门 @@ -66,27 +63,21 @@ func (e SysDept) GetSysDeptList(c *gin.Context) { // @Router /api/v1/dept/{deptId} [get] // @Security Bearer func (e SysDept) GetSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() + s := new(service.SysDept) control := new(dto.SysDeptById) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - //查看详情 - err = control.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } var object models.SysDept - serviceSysOperlog := service.SysDept{} - serviceSysOperlog.Log = log - serviceSysOperlog.Orm = db - err = serviceSysOperlog.GetSysDept(control, &object) + err = s.GetSysDept(control, &object) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return @@ -95,6 +86,7 @@ func (e SysDept) GetSysDept(c *gin.Context) { e.OK(object, "查看成功") } +// InsertSysDept 添加部门 // @Summary 添加部门 // @Description 获取JSON // @Tags 部门 @@ -106,42 +98,33 @@ func (e SysDept) GetSysDept(c *gin.Context) { // @Router /api/v1/dept [post] // @Security Bearer func (e SysDept) InsertSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() + s := new(service.SysDept) control := new(dto.SysDeptControl) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.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)) + control.SetCreateBy(user.GetUserId(c)) - serviceSysDept := service.SysDept{} - serviceSysDept.Orm = db - serviceSysDept.Log = log - err = serviceSysDept.InsertSysDept(object) + err = s.InsertSysDept(control) if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") return } - e.OK(object.GetId(), "创建成功") + e.OK(control.GetId(), "创建成功") } +// UpdateSysDept // @Summary 修改部门 // @Description 获取JSON // @Tags 部门 @@ -154,39 +137,30 @@ func (e SysDept) InsertSysDept(c *gin.Context) { // @Router /api/v1/dept/{deptId} [put] // @Security Bearer func (e SysDept) UpdateSysDept(c *gin.Context) { - e.Context = c - log := e.GetLogger() + s := new(service.SysDept) control := new(dto.SysDeptControl) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.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)) + control.SetUpdateBy(user.GetUserId(c)) - serviceSysDept := service.SysDept{} - serviceSysDept.Orm = db - serviceSysDept.Log = log - err = serviceSysDept.UpdateSysDept(object) + err = s.UpdateSysDept(control) if err != nil { - log.Error(err) + e.Logger.Error(err) return } - e.OK(object.GetId(), "更新成功") + e.OK(control.GetId(), "更新成功") } +// DeleteSysDept // @Summary 删除部门 // @Description 删除数据 // @Tags 部门 @@ -195,29 +169,22 @@ func (e SysDept) UpdateSysDept(c *gin.Context) { // @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() + s := service.SysDept{} control := new(dto.SysDeptById) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(control). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - //删除操作 - err = control.Bind(c) + err = s.RemoveSysDept(control) 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.Logger.Errorf("RemoveSysDept error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "删除失败") return } @@ -226,64 +193,53 @@ func (e SysDept) DeleteSysDept(c *gin.Context) { // GetDeptTree 用户管理 左侧部门树 func (e SysDept) GetDeptTree(c *gin.Context) { - e.Context = c - log := e.GetLogger() + s := service.SysDept{} d := new(dto.SysDeptSearch) - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - //查询列表 - err = d.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } list := make([]dto.DeptLabel, 0) - serviceStudent := service.SysDept{} - serviceStudent.Log = log - serviceStudent.Orm = db - list, err = serviceStudent.SetDeptTree(d) + + list, err = s.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, "") } +// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起 func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() + s := service.SysDept{} + err := e.MakeContext(c). + MakeOrm(). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.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.Logger.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.Logger.Errorf("抱歉未找到相关信息, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "") } } diff --git a/app/admin/apis/sys_dict_data.go b/app/admin/apis/sys_dict_data.go index d05a63e..a3277cb 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -11,13 +11,13 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" - common "go-admin/common/models" ) type SysDictData struct { api.Api } +// GetSysDictDataList // @Summary 字典数据列表 // @Description 获取JSON // @Tags 字典数据 @@ -30,39 +30,32 @@ type SysDictData struct { // @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() + s := service.SysDictData{} + d := &dto.SysDictDataSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors 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, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } list := make([]models.SysDictData, 0) var count int64 - s := service.SysDictData{} - s.Log = log - s.Orm = db.Debug() - err = s.GetPage(req, &list, &count) + err = s.GetPage(d, &list, &count) if err != nil { - log.Errorf("GetPage error, %s", err.Error()) + e.Logger.Errorf("GetPage error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "查询失败") return } - e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") + e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") } +// GetSysDictData // @Summary 通过编码获取字典数据 // @Description 获取JSON // @Tags 字典数据 @@ -71,30 +64,24 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) { // @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() + s := service.SysDictData{} + d := &dto.SysDictDataById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.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 models.SysDictData - s := service.SysDictData{} - s.Log = log - s.Orm = db - err = s.Get(req, &object) + err = s.Get(d, &object) if err != nil { - log.Warnf("Get error: %s", err.Error()) + e.Logger.Warnf("Get error: %s", err.Error()) e.Error(http.StatusInternalServerError, err, "查询失败") return } @@ -102,6 +89,7 @@ func (e SysDictData) GetSysDictData(c *gin.Context) { e.OK(object, "查看成功") } +// InsertSysDictData // @Summary 添加字典数据 // @Description 获取JSON // @Tags 字典数据 @@ -113,39 +101,33 @@ func (e SysDictData) GetSysDictData(c *gin.Context) { // @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.(*models.SysDictData)) + d := &dto.SysDictDataControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Errorf("Insert error, %s", err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) + return + } + + // 设置创建人 + d.SetCreateBy(user.GetUserId(c)) + + err = s.Insert(d) + if err != nil { + e.Logger.Errorf("Insert error, %s", err) e.Error(http.StatusInternalServerError, err, "创建失败") return } - e.OK(object.GetId(), "创建成功") + e.OK(d.GetId(), "创建成功") } +// UpdateSysDictData // @Summary 修改字典数据 // @Description 获取JSON // @Tags 字典数据 @@ -157,37 +139,30 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) { // @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.(*models.SysDictData)) + d := &dto.SysDictDataControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Errorf("Update error, %s", err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) + return + } + + d.SetUpdateBy(user.GetUserId(c)) + err = s.Update(d) + if err != nil { + e.Logger.Errorf("Update error, %s", err) e.Error(http.StatusInternalServerError, err, "更新失败") return } - e.OK(object.GetId(), "更新成功") + e.OK(d.GetId(), "更新成功") } +// DeleteSysDictData // @Summary 删除字典数据 // @Description 删除数据 // @Tags 字典数据 @@ -196,71 +171,50 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) { // @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() + s := service.SysDictData{} + d := new(dto.SysDictDataById) + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors 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, "模型生成失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } // 设置编辑人 - object.SetUpdateBy(user.GetUserId(c)) + d.SetUpdateBy(user.GetUserId(c)) - s := service.SysDictData{} - s.Orm = db - s.Log = log - err = s.Remove(req, object.(*models.SysDictData)) + err = s.Remove(d) if err != nil { - log.Errorf("Remove error, %s", err) + e.Logger.Errorf("Remove error, %s", err) e.Error(http.StatusInternalServerError, err, "删除失败") return } - e.OK(object.GetId(), "删除成功") + e.OK(d.GetId(), "删除成功") } func (e SysDictData) GetSysDictDataAll(c *gin.Context) { - e.Context = c - log := e.GetLogger() - db, err := e.GetOrm() + s := service.SysDictData{} + d := &dto.SysDictDataSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors 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, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } list := make([]models.SysDictData, 0) - s := service.SysDictData{} - s.Log = log - s.Orm = db - err = s.GetAll(req, &list) + + err = s.GetAll(d, &list) if err != nil { - log.Errorf("GetAll error, %s", err.Error()) + e.Logger.Errorf("GetAll error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, "查询失败") return } diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index 73bab4e..cb2ab4c 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -11,13 +11,13 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" - common "go-admin/common/models" ) type SysDictType struct { api.Api } +// GetSysDictTypeList 字典类型列表数据 // @Summary 字典类型列表数据 // @Description 获取JSON // @Tags 字典类型 @@ -30,38 +30,33 @@ type SysDictType struct { // @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() + s := service.SysDictType{} + d := &dto.SysDictTypeSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictTypeSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } list := make([]models.SysDictType, 0) var count int64 - s := service.SysDictType{} - s.Log = log - s.Orm = db.Debug() - err = s.GetPage(req, &list, &count) + + err = s.GetPage(d, &list, &count) if err != nil { e.Error(http.StatusInternalServerError, err, "查询失败") return } - e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") + e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") } -// @Summary 通过字典id获取字典类型 +// GetSysDictType 字典类型通过字典id获取 +// @Summary 字典类型通过字典id获取 // @Description 获取JSON // @Tags 字典类型 // @Param dictId path int true "字典类型编码" @@ -69,27 +64,20 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) { // @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() + s := service.SysDictType{} + d := &dto.SysDictTypeById{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - //查看详情 - req := &dto.SysDictTypeById{} - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } var object models.SysDictType - - s := service.SysDictType{} - s.Log = log - s.Orm = db - err = s.Get(req, &object) + err = s.Get(d, &object) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return @@ -98,6 +86,7 @@ func (e SysDictType) GetSysDictType(c *gin.Context) { e.OK(object, "查看成功") } +//InsertSysDictType 字典类型创建 // @Summary 添加字典类型 // @Description 获取JSON // @Tags 字典类型 @@ -109,38 +98,32 @@ func (e SysDictType) GetSysDictType(c *gin.Context) { // @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.(*models.SysDictType)) + d := &dto.SysDictTypeControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) + return + } + + d.SetCreateBy(user.GetUserId(c)) + + err = s.Insert(d) + if err != nil { + e.Logger.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") return } - e.OK(object.GetId(), "创建成功") + e.OK(d.GetId(), "创建成功") } +// UpdateSysDictType // @Summary 修改字典类型 // @Description 获取JSON // @Tags 字典类型 @@ -152,35 +135,30 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) { // @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.(*models.SysDictType)) + d := &dto.SysDictTypeControl{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - e.OK(object.GetId(), "更新成功") + + d.SetUpdateBy(user.GetUserId(c)) + + err = s.Update(d) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(d.GetId(), "更新成功") } +// DeleteSysDictType // @Summary 删除字典类型 // @Description 删除数据 // @Tags 字典类型 @@ -189,43 +167,29 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) { // @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.(*models.SysDictType)) + d := new(dto.SysDictTypeById) + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - e.OK(object.GetId(), "删除成功") + // 设置编辑人 + d.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(d) + if err != nil { + e.Logger.Error(err) + return + } + e.OK(d.GetId(), "删除成功") } +// GetSysDictTypeAll // @Summary 字典类型全部数据 // @Description 获取JSON // @Tags 字典类型 @@ -236,28 +200,22 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) { // @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() + s := service.SysDictType{} + d := &dto.SysDictTypeSearch{} + err := e.MakeContext(c). + MakeOrm(). + Bind(d). + MakeService(&s.Service). + Errors if err != nil { - log.Error(err) - return - } - - req := &dto.SysDictTypeSearch{} - - //查询列表 - err = req.Bind(c) - if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } list := make([]models.SysDictType, 0) - s := service.SysDictType{} - s.Log = log - s.Orm = db - err = s.GetAll(req, &list) + + err = s.GetAll(d, &list) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index 54d158f..b0d3495 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -77,77 +77,77 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) { 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 - } +//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(), "创建成功") +//} - //新增操作 - 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) 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 diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index c6deea9..052ea76 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -1,6 +1,7 @@ package apis import ( + "github.com/gin-gonic/gin/binding" "go-admin/app/admin/models" "net/http" @@ -26,27 +27,22 @@ type SysMenu struct { // @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) + s := service.SysMenu{} + d := new(dto.SysMenuSearch) + err := e.MakeContext(c). + MakeOrm(). + Bind(d, binding.Form). + MakeService(&s.Service). + Errors if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } var list *[]models.SysMenu - serviceSysMenu := service.SysMenu{} - serviceSysMenu.Log = log - serviceSysMenu.Orm = db - list, err = serviceSysMenu.GetSysMenuPage(d) + list, err = s.GetSysMenuPage(d) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return @@ -69,7 +65,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control, nil). + Bind(control). MakeService(&s.Service). Errors if err != nil { @@ -109,7 +105,7 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) { s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(control, binding.JSON). MakeService(&s.Service). Errors if err != nil { @@ -145,7 +141,7 @@ func (e SysMenu) UpdateSysMenu(c *gin.Context) { s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(control, binding.JSON). MakeService(&s.Service). Errors if err != nil { @@ -175,7 +171,7 @@ func (e SysMenu) DeleteSysMenu(c *gin.Context) { s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(control, binding.JSON). MakeService(&s.Service). Errors if err != nil { diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index 4cddfc0..67cda4f 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -6,8 +6,6 @@ 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/jwtauth/user" - "go-admin/app/admin/service" "go-admin/app/admin/service/dto" ) @@ -16,6 +14,7 @@ type SysOperaLog struct { api.Api } +// GetSysOperaLogList 操作日志列表 func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { e.Context = c log := e.GetLogger() @@ -47,6 +46,7 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") } +// GetSysOperaLog 操作日志通过id获取 func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { e.Context = c log := e.GetLogger() @@ -77,76 +77,77 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { 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)) +//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(), "创建成功") +//} - 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) 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 diff --git a/app/admin/models/sys_api.go b/app/admin/models/sys_api.go index edf131b..27e83a4 100644 --- a/app/admin/models/sys_api.go +++ b/app/admin/models/sys_api.go @@ -55,12 +55,14 @@ func SaveSysApi(message storage.Messager) (err error) { dbList := sdk.Runtime.GetDb() for _, d := range dbList { for _, v := range l.List { - err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}). - Attrs(SysApi{Handle: v.Handler}). - FirstOrCreate(&SysApi{}).Error - if err != nil { - err := fmt.Errorf("Models SaveSysApi error: %s \r\n ", err.Error()) - return err + if v.HttpMethod != "HEAD" { + err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}). + Attrs(SysApi{Handle: v.Handler}). + FirstOrCreate(&SysApi{}).Error + if err != nil { + err := fmt.Errorf("Models SaveSysApi error: %s \r\n ", err.Error()) + return err + } } } } diff --git a/app/admin/router/sys_login_log.go b/app/admin/router/sys_login_log.go index 4564c84..dfa68e3 100644 --- a/app/admin/router/sys_login_log.go +++ b/app/admin/router/sys_login_log.go @@ -19,8 +19,6 @@ func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi { r.GET("", api.GetSysLoginLogList) r.GET("/:id", api.GetSysLoginLog) - r.POST("", api.InsertSysLoginLog) - r.PUT("/:id", api.UpdateSysLoginLog) r.DELETE("", api.DeleteSysLoginLog) } -} +} \ 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 f9df9d5..6900a1a 100644 --- a/app/admin/router/sys_opera_log.go +++ b/app/admin/router/sys_opera_log.go @@ -18,8 +18,6 @@ func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi { r.GET("", api.GetSysOperaLogList) r.GET("/:id", api.GetSysOperaLog) - r.POST("", api.InsertSysOperaLog) - r.PUT("/:id", api.UpdateSysOperaLog) r.DELETE("", api.DeleteSysOperaLog) } -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index dd7f5d4..21041d1 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -1,12 +1,6 @@ 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" "go-admin/common/dto" common "go-admin/common/models" @@ -15,10 +9,10 @@ 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 `json:"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"` } func (m *SysConfigSearch) GetNeedSearch() interface{} { @@ -27,58 +21,40 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} { // 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() (*models.SysConfig, error) { - return &models.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 } // SysConfigById 获取单个或者删除的结构体 type SysConfigById struct { Id int `uri:"id"` Ids []int `json:"ids"` + common.ControlBy } func (s *SysConfigById) Generate() *SysConfigById { @@ -87,23 +63,9 @@ func (s *SysConfigById) Generate() *SysConfigById { } func (s *SysConfigById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } 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() (*models.SysConfig, error) { - return &models.SysConfig{}, nil } \ No newline at end of file diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index e064520..08c787f 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -1,11 +1,10 @@ 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/common/dto" @@ -39,7 +38,7 @@ func (m *SysDeptSearch) Bind(ctx *gin.Context) error { return err } -// SysConfigControl 增、改使用的结构体 +// SysDeptControl 增、改使用的结构体 type SysDeptControl struct { DeptId int `uri:"id" comment:"编码"` // 编码 ParentId int `form:"parentId" comment:"上级部门"` //上级部门 @@ -50,42 +49,30 @@ 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 - } - 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 *SysDeptControl) SetCreateBy(id int) { + s.CreateBy = id } -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysDeptControl) Generate() (*models.SysDept, error) { - return &models.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 +func (s *SysDeptControl) SetUpdateBy(id int) { + s.UpdateBy = id +} + +// Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型 +func (s *SysDeptControl) Generate(model *models.SysDept) { + if s.DeptId != 0 { + model.DeptId = s.DeptId + } + 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 @@ -105,22 +92,13 @@ 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() (*models.SysDept, error) { return &models.SysDept{}, nil diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 5b026d7..262385e 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -50,41 +50,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 &models.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,6 +75,7 @@ func (s *SysDictDataControl) GetId() interface{} { type SysDictDataById struct { Id int `uri:"dictCode"` Ids []int `json:"ids"` + common.ControlBy } func (s *SysDictDataById) Bind(ctx *gin.Context) error { @@ -111,6 +93,7 @@ func (s *SysDictDataById) Bind(ctx *gin.Context) error { func (s *SysDictDataById) GetId() interface{} { if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) return s.Ids } return s.Id diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 511f779..92c2731 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -36,45 +36,23 @@ func (m *SysDictTypeSearch) Generate() dto.Index { } 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 &models.SysDictType{ - - ID: s.Id, - DictName: s.DictName, - DictType: s.DictType, - Status: s.Status, - Remark: s.Remark, - }, nil } func (s *SysDictTypeControl) GetId() interface{} { @@ -83,6 +61,7 @@ func (s *SysDictTypeControl) GetId() interface{} { type SysDictTypeById struct { dto.ObjectById + common.ControlBy } func (s *SysDictTypeById) Generate() dto.Control { @@ -90,6 +69,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 &models.SysDictType{}, nil } \ No newline at end of file diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index c83d553..3de970f 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -19,6 +19,10 @@ type SysLoginLogSearch struct { LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"` } +type SysLoginLogOrder struct { + HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"created_at_order"` +} + func (m *SysLoginLogSearch) GetNeedSearch() interface{} { return *m } diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index ae62d2c..389fcc7 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -1,10 +1,6 @@ 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" common "go-admin/common/models" @@ -28,15 +24,6 @@ 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 -} // SysMenuControl 增、改使用的结构体 type SysMenuControl struct { @@ -69,27 +56,6 @@ func (s *SysMenuControl) SetUpdateBy(id int) { s.UpdateBy = id } -// 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 -} - // Generate 结构体数据转化 从 Control 至 model 对应的模型 func (s *SysMenuControl) Generate(model *models.SysMenu) { if s.MenuId != 0 { @@ -124,35 +90,27 @@ 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 { cp := *s return &cp } 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() (*models.SysMenu, error) { return &models.SysMenu{}, nil } diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index ab43c63..1f15c47 100644 --- a/app/admin/service/dto/sys_post.go +++ b/app/admin/service/dto/sys_post.go @@ -96,6 +96,10 @@ func (s *SysPostById) Generate() *SysPostById { } func (s *SysPostById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } return s.Id } diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index 459b004..1dca221 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -119,6 +119,10 @@ 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 } diff --git a/app/admin/service/dto/sys_setting.go b/app/admin/service/dto/sys_setting.go index 5a8c771..face358 100644 --- a/app/admin/service/dto/sys_setting.go +++ b/app/admin/service/dto/sys_setting.go @@ -66,6 +66,10 @@ func (s *SysSettingById) Generate() *SysSettingById { } func (s *SysSettingById) GetId() interface{} { + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } return s.Id } @@ -85,4 +89,4 @@ func (s *SysSettingById) Bind(ctx *gin.Context) error { func (s *SysSettingById) GenerateM() (*models.SysSetting, error) { return &models.SysSetting{}, nil -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 4abd426..9b00ac0 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -59,11 +59,7 @@ type SysUserControl struct { 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()) @@ -107,6 +103,14 @@ func (s *SysUserById) Generate() dto.Control { 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 &models.SysUser{}, nil } diff --git a/app/admin/service/sys_api.go b/app/admin/service/sys_api.go index ee90040..ab9e8ca 100644 --- a/app/admin/service/sys_api.go +++ b/app/admin/service/sys_api.go @@ -41,7 +41,6 @@ func (e *SysApi) GetSysApiPage(c *dto.SysApiSearch, p *actions.DataPermission, l // GetSysApi 获取SysApi对象 func (e *SysApi) GetSysApi(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), @@ -50,18 +49,18 @@ func (e *SysApi) GetSysApi(d *dto.SysApiById, p *actions.DataPermission, model * if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") e.Log.Errorf("Service GetSysApi error:%s", err) - e.AddError(err) + _ = e.AddError(err) return e } if err != nil { e.Log.Errorf("db error:%s", err) - e.AddError(err) + _ = e.AddError(err) return e } - return nil + return e } -// InsertSysApi 创建SysApi对象 +// 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}). diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index b7c191c..bc017f6 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -67,12 +67,11 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig) } // InsertSysConfig 创建SysConfig对象 -func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error { +func (e *SysConfig) InsertSysConfig(c *dto.SysConfigControl) error { var err error var data models.SysConfig - - err = e.Orm.Model(&data). - Create(model).Error + c.Generate(&data) + err = e.Orm.Create(data).Error if err != nil { e.Log.Errorf("Service InsertSysConfig error:%s", err) return err @@ -81,11 +80,12 @@ func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error { } // UpdateSysConfig 修改SysConfig对象 -func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error { +func (e *SysConfig) UpdateSysConfig(c *dto.SysConfigControl) error { var err error - - db := e.Orm.Model(c). - Where(c.GetId()).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) @@ -99,12 +99,11 @@ func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error { } // RemoveSysConfig 删除SysConfig -func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *models.SysConfig) error { +func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error { var err error var data models.SysConfig - db := e.Orm.Model(&data). - Where(d.Ids).Delete(c) + db := e.Orm.Delete(&data, d.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Service RemoveSysConfig error:%s", err) diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index bfda59f..b36ed82 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -55,27 +55,26 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error { } // InsertSysDept 创建SysDept对象 -func (e *SysDept) InsertSysDept(model *models.SysDept) error { +func (e *SysDept) InsertSysDept(c *dto.SysDeptControl) error { var err error var data models.SysDept - - err = e.Orm.Model(&data). - Create(model).Error + 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 { + deptPath := "/" + pkg.IntToString(data.DeptId) + if data.ParentId != 0 { var deptP models.SysDept - e.Orm.Model(&data).First(&deptP, model.ParentId) + e.Orm.First(&deptP, data.ParentId) deptPath = deptP.DeptPath + deptPath } else { 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 } @@ -83,12 +82,12 @@ func (e *SysDept) InsertSysDept(model *models.SysDept) error { } // UpdateSysDept 修改SysDept对象 -func (e *SysDept) UpdateSysDept(c *models.SysDept) error { +func (e *SysDept) UpdateSysDept(c *dto.SysDeptControl) error { var err error - var data models.SysDept - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + var model = models.SysDept{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + db := e.Orm.Where(c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index ddf6a7e..3c82f94 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -55,12 +55,11 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) err } // Insert 创建对象 -func (e *SysDictData) Insert(model *models.SysDictData) error { +func (e *SysDictData) Insert(c *dto.SysDictDataControl) error { var err error - var data models.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,12 @@ func (e *SysDictData) Insert(model *models.SysDictData) error { } // Update 修改对象 -func (e *SysDictData) Update(c *models.SysDictData) error { +func (e *SysDictData) Update(c *dto.SysDictDataControl) error { var err error - var data models.SysDictData - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + 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 @@ -87,12 +86,11 @@ func (e *SysDictData) Update(c *models.SysDictData) error { } // Remove 删除 -func (e *SysDictData) Remove(d *dto.SysDictDataById, c *models.SysDictData) error { +func (e *SysDictData) Remove(c *dto.SysDictDataById) error { var err error var data models.SysDictData - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + db := e.Orm.Delete(&data, c.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index d4dde51..656682b 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -37,10 +37,8 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictTy // Get 获取对象 func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error { var err error - var data models.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 *models.SysDictType) err } // Insert 创建对象 -func (e *SysDictType) Insert(model *models.SysDictType) error { +func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error { var err error var data models.SysDictType - - err = e.Orm.Model(&data). - Create(model).Error + c.Generate(&data) + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("db error: %s", err) return err @@ -69,12 +66,12 @@ func (e *SysDictType) Insert(model *models.SysDictType) error { } // Update 修改对象 -func (e *SysDictType) Update(c *models.SysDictType) error { +func (e *SysDictType) Update(c *dto.SysDictTypeControl) error { var err error - var data models.SysDictType - - db := e.Orm.Model(&data). - Where(c.GetId()).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 @@ -87,12 +84,11 @@ func (e *SysDictType) Update(c *models.SysDictType) error { } // Remove 删除 -func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *models.SysDictType) error { +func (e *SysDictType) Remove(d *dto.SysDictTypeById) error { var err error var data models.SysDictType - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + db := e.Orm.Delete(&data, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/cmd/api/server.go b/cmd/api/server.go index 4ae9c0a..2c250ef 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -149,14 +149,6 @@ func run() error { } } } - //serviceApi := service.SysApi{} - //serviceApi.Orm = sdk.Runtime.GetDb()["*"] - //var routers = sdk.Runtime.GetRouter() - //err := serviceApi.CheckStorageSysApi(&routers) - //if err != nil { - // log.Println("Server check api data :", err) - //} - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() diff --git a/common/middleware/logger.go b/common/middleware/logger.go index 229a93e..965b3e2 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -24,8 +24,9 @@ func LoggerToFile() gin.HandlerFunc { // 处理请求 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 } // 结束时间 @@ -77,8 +78,7 @@ func LoggerToFile() gin.HandlerFunc { "uri": reqUri, } log.WithFields(logData).Info() - //l := logger.Logger{Logger: log.Fields(logData)} - //l.Info(logData) + if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) } @@ -98,25 +98,9 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string 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 { @@ -133,4 +117,4 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string log.Errorf("Append message error, %s", err.Error()) } } -} +} \ No newline at end of file