From 4dfd4e464780810de7bece1ca41f79deefeaf79e Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Thu, 3 Jun 2021 19:39:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8=20=EF=BC=9A=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_api.go | 74 ++++++-------- app/admin/apis/sys_config.go | 98 ++++++++----------- app/admin/apis/sys_dept.go | 56 +++++------ app/admin/apis/sys_dict_data.go | 89 +++++++---------- app/admin/apis/sys_dict_type.go | 85 +++++++--------- app/admin/apis/sys_login_log.go | 85 +++++++++------- app/admin/apis/sys_menu.go | 128 +++++++++++-------------- app/admin/apis/sys_opera_log.go | 31 +++--- app/admin/apis/sys_post.go | 12 +-- app/admin/apis/sys_role.go | 14 +-- app/admin/apis/sys_user.go | 32 +++---- app/admin/service/dto/sys_dept.go | 26 +---- app/admin/service/dto/sys_login_log.go | 4 +- common/models/by.go | 4 +- 14 files changed, 324 insertions(+), 414 deletions(-) diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go index b5b2e1e..9e83e30 100644 --- a/app/admin/apis/sys_api.go +++ b/app/admin/apis/sys_api.go @@ -1,10 +1,8 @@ package apis import ( - "github.com/gin-gonic/gin/binding" - "net/http" - "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" @@ -33,29 +31,28 @@ type SysApi struct { // @Router /api/v1/sys-api [get] // @Security Bearer func (e SysApi) GetSysApiList(c *gin.Context) { - s := new(service.SysApi) - d := new(dto.SysApiSearch) + s := service.SysApi{} + req := dto.SysApiSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) 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.GetSysApiPage(d, p, &list, &count) + err = s.GetSysApiPage(&req, p, &list, &count) if err != nil { - e.Logger.Errorf("Get SysApi Page error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") } // GetSysApi 获取接口管理 @@ -67,30 +64,25 @@ func (e SysApi) GetSysApiList(c *gin.Context) { // @Router /api/v1/sys-api/{id} [get] // @Security Bearer func (e SysApi) GetSysApi(c *gin.Context) { - control := new(dto.SysApiById) - s := new(service.SysApi) + req := dto.SysApiById{} + s := service.SysApi{} err := e.MakeContext(c). MakeOrm(). - Bind(control, nil). + Bind(&req, nil). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - var object models.SysApi - - //数据权限检查 p := actions.GetPermissionFromContext(c) - - err = s.GetSysApi(control, p, &object).Error + var object models.SysApi + err = s.GetSysApi(&req, p, &object).Error if err != nil { - e.Logger.Errorf("Get SysApi error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.OK(object, "查看成功") } @@ -105,27 +97,22 @@ func (e SysApi) GetSysApi(c *gin.Context) { // @Router /api/v1/sys-api/{id} [put] // @Security Bearer func (e SysApi) UpdateSysApi(c *gin.Context) { - req := new(dto.SysApiControl) - s := new(service.SysApi) + req := dto.SysApiControl{} + s := service.SysApi{} err := e.MakeContext(c). MakeOrm(). - Bind(req). + 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.UpdateSysApi(req, p) + err = s.UpdateSysApi(&req, p) if err != nil { - e.Logger.Errorf("Update SysApi error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "更新失败") + e.Error(500, err, "更新失败") return } e.OK(req.GetId(), "更新成功") @@ -140,30 +127,23 @@ func (e SysApi) UpdateSysApi(c *gin.Context) { // @Router /api/v1/sys-api [delete] // @Security Bearer func (e SysApi) DeleteSysApi(c *gin.Context) { - - control := new(dto.SysApiById) + req := dto.SysApiById{} s := service.SysApi{} err := e.MakeContext(c). MakeOrm(). - Bind(control, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) return } - - // 设置编辑人 - control.SetUpdateBy(user.GetUserId(c)) - - // 数据权限检查 + req.SetUpdateBy(user.GetUserId(c)) p := actions.GetPermissionFromContext(c) - - err = s.RemoveSysApi(control, p) + err = s.RemoveSysApi(&req, p) if err != nil { - e.Logger.Errorf("Remove SysApi error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "删除失败") + e.Error(500, err, "删除失败") return } - e.OK(control.GetId(), "删除成功") -} + 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 index 78a16e3..44eb026 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -1,8 +1,6 @@ package apis import ( - "net/http" - "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" @@ -32,10 +30,10 @@ type SysConfig struct { // @Security Bearer func (e SysConfig) GetSysConfigList(c *gin.Context) { s := service.SysConfig{} - d := new(dto.SysConfigSearch) + req := dto.SysConfigSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { @@ -45,13 +43,12 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { list := make([]models.SysConfig, 0) var count int64 - err = s.GetSysConfigPage(d, &list, &count) + err = s.GetSysConfigPage(&req, &list, &count) if err != nil { - e.Logger.Errorf("GetSysConfigPage 查询失败, error:%s", err) e.Error(500, err, "查询失败") return } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") } // GetSysConfigBySysApp 获取系统配置信息 @@ -62,24 +59,22 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { // @Router /api/v1/app-config [get] // @Security Bearer func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { - d := new(dto.SysConfigSearch) + req := dto.SysConfigSearch{} s := service.SysConfig{} err := e.MakeContext(c). MakeOrm(). - Bind(d, nil). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) return } - // 控制只读前台的数据 - d.IsFrontend = 1 + req.IsFrontend = 1 list := make([]models.SysConfig, 0) - err = s.GetSysConfigByKey(d, &list) + err = s.GetSysConfigByKey(&req, &list) if err != nil { - e.Logger.Errorf("GetSysConfigPage 查询失败, error:%s", err) e.Error(500, err, "查询失败") return } @@ -102,24 +97,23 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { // @Router /api/v1/sys-config/{id} [get] // @Security Bearer func (e SysConfig) GetSysConfig(c *gin.Context) { - control := new(dto.SysConfigById) + req := dto.SysConfigById{} s := service.SysConfig{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + 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.GetSysConfig(control, &object) + err = s.GetSysConfig(&req, &object) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") + e.Error(500, err, err.Error()) return } @@ -138,27 +132,25 @@ func (e SysConfig) GetSysConfig(c *gin.Context) { // @Security Bearer func (e SysConfig) InsertSysConfig(c *gin.Context) { s := service.SysConfig{} - control := new(dto.SysConfigControl) + req := dto.SysConfigControl{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + 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)) - // 设置创建人 - control.SetCreateBy(user.GetUserId(c)) - - err = s.InsertSysConfig(control) + err = s.InsertSysConfig(&req) if err != nil { - e.Logger.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") + e.Error(500, err, "创建失败") return } - e.OK(control.GetId(), "创建成功") + e.OK(req.GetId(), "创建成功") } // UpdateSysConfig 修改配置管理 @@ -173,26 +165,24 @@ func (e SysConfig) InsertSysConfig(c *gin.Context) { // @Security Bearer func (e SysConfig) UpdateSysConfig(c *gin.Context) { s := service.SysConfig{} - control := new(dto.SysConfigControl) + req := dto.SysConfigControl{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - control.SetUpdateBy(user.GetUserId(c)) - - err = s.UpdateSysConfig(control) + req.SetUpdateBy(user.GetUserId(c)) + err = s.UpdateSysConfig(&req) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "更新失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) + e.Error(500, err, "更新失败") return } - e.OK(control.GetId(), "更新成功") + e.OK(req.GetId(), "更新成功") } // GetSetSysConfig 获取配置 @@ -206,25 +196,24 @@ func (e SysConfig) UpdateSysConfig(c *gin.Context) { // @Security Bearer func (e SysConfig) GetSetSysConfig(c *gin.Context) { s := service.SysConfig{} + req := make([]dto.GetSetSysConfigReq, 1) err := e.MakeContext(c). MakeOrm(). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - d := make([]dto.GetSetSysConfigReq, 0) - err = s.GetSetSysConfig(&d) + err = s.GetSetSysConfig(&req) if err != nil { - e.Logger.Errorf("GetSetSysConfig 查询失败, error:%s", err) e.Error(500, err, "查询失败") return } m := make(map[string]interface{}, 0) - for _, req := range d { - m[req.ConfigKey] = req.ConfigValue + for _, v := range req { + m[v.ConfigKey] = v.ConfigValue } e.OK(m, "查询成功") } @@ -249,12 +238,12 @@ func (e SysConfig) UpdateSetSysConfig(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } err = s.UpdateSetSysConfig(&d) if err != nil { - e.Logger.Errorf("GetSetSysConfig 更新失败, error:%s", err) e.Error(500, err, err.Error()) return } @@ -272,27 +261,25 @@ func (e SysConfig) UpdateSetSysConfig(c *gin.Context) { // @Security Bearer func (e SysConfig) DeleteSysConfig(c *gin.Context) { s := service.SysConfig{} - control := new(dto.SysConfigById) + req := dto.SysConfigById{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(&req). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } + req.SetUpdateBy(user.GetUserId(c)) - // 设置编辑人 - control.SetUpdateBy(user.GetUserId(c)) - - err = s.RemoveSysConfig(control) + err = s.RemoveSysConfig(&req) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "删除失败") - e.Logger.Errorf("Orm获取失败, error:%s", err) + e.Error(500, err, "删除失败") return } - e.OK(control.GetId(), "删除成功") + e.OK(req.GetId(), "删除成功") } // GetSysConfigByKEYForService 根据Key获取SysConfig的Service @@ -309,7 +296,7 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { var resp = new(dto.GetSysConfigByKEYForServiceResp) err := e.MakeContext(c). MakeOrm(). - Bind(req,nil). + Bind(req, nil). MakeService(&s.Service). Errors if err != nil { @@ -320,9 +307,8 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { err = s.GetSysConfigByKEY(req, resp) if err != nil { - e.Logger.Errorf("通过Key获取配置失败, error:%s", err) 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 index f118d3f..4e2ea8d 100644 --- a/app/admin/apis/sys_dept.go +++ b/app/admin/apis/sys_dept.go @@ -1,15 +1,13 @@ 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" - "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" @@ -23,8 +21,8 @@ type SysDept struct { // @Summary 分页部门列表数据 // @Description 分页列表 // @Tags 部门 -// @Param name query string false "name" -// @Param id query string false "id" +// @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] @@ -38,18 +36,16 @@ func (e SysDept) GetSysDeptList(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) 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(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.OK(list, "查询成功") } @@ -71,15 +67,15 @@ func (e SysDept) GetSysDept(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysDept err = s.GetSysDept(&req, &object) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } @@ -106,21 +102,18 @@ func (e SysDept) InsertSysDept(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } // 设置创建人 req.SetCreateBy(user.GetUserId(c)) - err = s.InsertSysDept(&req) if err != nil { - e.Logger.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") + e.Error(500, err, "创建失败") return } - e.OK(req.GetId(), "创建成功") } @@ -145,16 +138,14 @@ func (e SysDept) UpdateSysDept(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) - err = s.UpdateSysDept(&req) if err != nil { - e.Logger.Error(err) + e.Error(500, err, err.Error()) return } e.OK(req.GetId(), "更新成功") @@ -177,15 +168,14 @@ func (e SysDept) DeleteSysDept(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } err = s.RemoveSysDept(&req) if err != nil { - e.Logger.Errorf("RemoveSysDept error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "删除失败") + e.Error(500, err, "删除失败") return } e.OK(req.GetId(), "删除成功") @@ -201,8 +191,8 @@ func (e SysDept) GetDeptTree(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -210,7 +200,7 @@ func (e SysDept) GetDeptTree(c *gin.Context) { list, err = s.SetDeptTree(&req) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } e.OK(list, "") @@ -224,27 +214,27 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) 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.Logger.Errorf("SetDeptLabel error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") + e.Error(500, err, err.Error()) + return } menuIds := make([]int, 0) if id != 0 { menuIds, err = s.GetRoleDeptId(id) if err != nil { - e.Logger.Errorf("抱歉未找到相关信息, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") + 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 index 6253349..850a387 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -32,28 +32,27 @@ type SysDictData struct { // @Security Bearer func (e SysDictData) GetSysDictDataList(c *gin.Context) { s := service.SysDictData{} - d := &dto.SysDictDataSearch{} + req := dto.SysDictDataSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } list := make([]models.SysDictData, 0) var count int64 - err = s.GetPage(d, &list, &count) + err = s.GetPage(&req, &list, &count) if err != nil { - e.Logger.Errorf("GetPage error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") } // GetSysDictData @@ -66,21 +65,21 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) { // @Security Bearer func (e SysDictData) GetSysDictData(c *gin.Context) { s := service.SysDictData{} - d := &dto.SysDictDataById{} + req := dto.SysDictDataById{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysDictData - err = s.Get(d, &object) + err = s.Get(&req, &object) if err != nil { e.Logger.Warnf("Get error: %s", err.Error()) e.Error(http.StatusInternalServerError, err, "查询失败") @@ -103,29 +102,25 @@ func (e SysDictData) GetSysDictData(c *gin.Context) { // @Security Bearer func (e SysDictData) InsertSysDictData(c *gin.Context) { s := service.SysDictData{} - d := &dto.SysDictDataControl{} + req := dto.SysDictDataControl{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - // 设置创建人 - d.SetCreateBy(user.GetUserId(c)) - - err = s.Insert(d) + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req) if err != nil { - e.Logger.Errorf("Insert error, %s", err) - e.Error(http.StatusInternalServerError, err, "创建失败") + e.Error(500, err, "创建失败") return } - e.OK(d.GetId(), "创建成功") + e.OK(req.GetId(), "创建成功") } // UpdateSysDictData @@ -141,26 +136,24 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) { // @Security Bearer func (e SysDictData) UpdateSysDictData(c *gin.Context) { s := service.SysDictData{} - d := &dto.SysDictDataControl{} + req := dto.SysDictDataControl{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - d.SetUpdateBy(user.GetUserId(c)) - err = s.Update(d) + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) if err != nil { - e.Logger.Errorf("Update error, %s", err) - e.Error(http.StatusInternalServerError, err, "更新失败") + e.Error(500, err, "更新失败") return } - e.OK(d.GetId(), "更新成功") + e.OK(req.GetId(), "更新成功") } // DeleteSysDictData @@ -174,28 +167,24 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) { // @Security Bearer func (e SysDictData) DeleteSysDictData(c *gin.Context) { s := service.SysDictData{} - d := new(dto.SysDictDataById) + req := dto.SysDictDataById{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - // 设置编辑人 - d.SetUpdateBy(user.GetUserId(c)) - - err = s.Remove(d) + req.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(&req) if err != nil { - e.Logger.Errorf("Remove error, %s", err) - e.Error(http.StatusInternalServerError, err, "删除失败") + e.Error(500, err, "删除失败") return } - e.OK(d.GetId(), "删除成功") + e.OK(req.GetId(), "删除成功") } // GetSysDictDataAll 数据字典根据key获取 业务页面使用 @@ -209,26 +198,22 @@ func (e SysDictData) DeleteSysDictData(c *gin.Context) { // @Security Bearer func (e SysDictData) GetSysDictDataAll(c *gin.Context) { s := service.SysDictData{} - d := &dto.SysDictDataSearch{} + req := dto.SysDictDataSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - list := make([]models.SysDictData, 0) - - err = s.GetAll(d, &list) + err = s.GetAll(&req, &list) if err != nil { - e.Logger.Errorf("GetAll error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "查询失败") + 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 index c428c6b..1cfd8a4 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -32,28 +32,25 @@ type SysDictType struct { // @Security Bearer func (e SysDictType) GetSysDictTypeList(c *gin.Context) { s := service.SysDictType{} - d := &dto.SysDictTypeSearch{} + req := dto.SysDictTypeSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - list := make([]models.SysDictType, 0) var count int64 - - err = s.GetPage(d, &list, &count) + err = s.GetPage(&req, &list, &count) if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") + e.Error(500, err, "查询失败") return } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") } // GetSysDictType 字典类型通过字典id获取 @@ -66,24 +63,23 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) { // @Security Bearer func (e SysDictType) GetSysDictType(c *gin.Context) { s := service.SysDictType{} - d := &dto.SysDictTypeById{} + req := dto.SysDictTypeById{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysDictType - err = s.Get(d, &object) + err = s.Get(&req, &object) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.OK(object, "查看成功") } @@ -100,28 +96,25 @@ func (e SysDictType) GetSysDictType(c *gin.Context) { // @Security Bearer func (e SysDictType) InsertSysDictType(c *gin.Context) { s := service.SysDictType{} - d := &dto.SysDictTypeControl{} + req := dto.SysDictTypeControl{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - d.SetCreateBy(user.GetUserId(c)) - - err = s.Insert(d) + req.SetCreateBy(user.GetUserId(c)) + err = s.Insert(&req) if err != nil { e.Logger.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") + e.Error(500, err, "创建失败") return } - - e.OK(d.GetId(), "创建成功") + e.OK(req.GetId(), "创建成功") } // UpdateSysDictType @@ -137,10 +130,10 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) { // @Security Bearer func (e SysDictType) UpdateSysDictType(c *gin.Context) { s := service.SysDictType{} - d := &dto.SysDictTypeControl{} + req := dto.SysDictTypeControl{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { @@ -148,15 +141,13 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) { e.Logger.Error(err) return } - - d.SetUpdateBy(user.GetUserId(c)) - - err = s.Update(d) + req.SetUpdateBy(user.GetUserId(c)) + err = s.Update(&req) if err != nil { e.Logger.Error(err) return } - e.OK(d.GetId(), "更新成功") + e.OK(req.GetId(), "更新成功") } // DeleteSysDictType @@ -169,25 +160,24 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [delete] func (e SysDictType) DeleteSysDictType(c *gin.Context) { s := service.SysDictType{} - d := new(dto.SysDictTypeById) + req := dto.SysDictTypeById{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - // 设置编辑人 - d.SetUpdateBy(user.GetUserId(c)) - err = s.Remove(d) + req.SetUpdateBy(user.GetUserId(c)) + err = s.Remove(&req) if err != nil { - e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - e.OK(d.GetId(), "删除成功") + e.OK(req.GetId(), "删除成功") } // GetSysDictTypeAll @@ -202,25 +192,22 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) { // @Security Bearer func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { s := service.SysDictType{} - d := &dto.SysDictTypeSearch{} + req := dto.SysDictTypeSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - list := make([]models.SysDictType, 0) - - err = s.GetAll(d, &list) + err = s.GetAll(&req, &list) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + 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 index da1b6f8..798e222 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -1,13 +1,11 @@ package apis import ( - "github.com/gin-gonic/gin/binding" - "go-admin/app/admin/models" - "net/http" - "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" @@ -17,78 +15,97 @@ type SysLoginLog struct { api.Api } +// GetSysLoginLogList 登录日志列表 +// @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) GetSysLoginLogList(c *gin.Context) { - s := new(service.SysLoginLog) - d := new(dto.SysLoginLogSearch) + s := service.SysLoginLog{} + req := dto.SysLoginLogSearch {} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - list := make([]models.SysLoginLog, 0) var count int64 - - err = s.GetSysLoginLogPage(d, &list, &count) + err = s.GetSysLoginLogPage(&req, &list, &count) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } - - e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") + 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) GetSysLoginLog(c *gin.Context) { - s := new(service.SysLoginLog) - control := new(dto.SysLoginLogById) + s := service.SysLoginLog{} + req := dto.SysLoginLogById{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - var object models.SysLoginLog - err = s.GetSysLoginLog(control, &object) + err = s.GetSysLoginLog(&req, &object) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + 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) DeleteSysLoginLog(c *gin.Context) { s := service.SysLoginLog{} - control := new(dto.SysLoginLogById) + req := dto.SysLoginLogById{} err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - // 设置编辑人 - control.SetUpdateBy(user.GetUserId(c)) - - err = s.RemoveSysLoginLog(control) + req.SetUpdateBy(user.GetUserId(c)) + err = s.RemoveSysLoginLog(&req) if err != nil { - e.Logger.Errorf("RemoveSysLoginLog error, %s", err) - e.Error(http.StatusInternalServerError, err, "删除失败") + e.Error(500, err, "删除失败") return } - e.OK(control.GetId(), "删除成功") -} + 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 index 02cf700..c7c9c1a 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -23,28 +23,26 @@ type SysMenu struct { // @Tags 菜单 // @Param menuName query string false "menuName" // @Param menuName query string false "menuName" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menu [get] // @Security Bearer func (e SysMenu) GetSysMenuList(c *gin.Context) { s := service.SysMenu{} - d := new(dto.SysMenuSearch) + req := dto.SysMenuSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d, binding.Form). + Bind(&req, binding.Form). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - - var list = make([]models.SysMenu, 0) - err = s.GetSysMenuPage(d, &list).Error + var list = make([]models.SysMenu, 1) + err = s.GetSysMenuPage(&req, &list).Error if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } e.OK(list, "查询成功") @@ -54,29 +52,28 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) { // @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": "抱歉未找到相关信息"}" +// @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) GetSysMenu(c *gin.Context) { - control := new(dto.SysMenuById) + req := dto.SysMenuById{} s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control). + Bind(&req, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object = models.SysMenu{} - err = s.GetSysMenu(control, &object).Error + err = s.GetSysMenu(&req, &object).Error if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } e.OK(object, "查看成功") @@ -86,74 +83,67 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { // @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": "添加失败"}" +// @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) InsertSysMenu(c *gin.Context) { - control := new(dto.SysMenuControl) + req := dto.SysMenuControl{} s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control, binding.JSON). + Bind(&req, binding.JSON). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } // 设置创建人 - control.SetCreateBy(user.GetUserId(c)) - err = s.InsertSysMenu(control).Error + req.SetCreateBy(user.GetUserId(c)) + err = s.InsertSysMenu(&req).Error if err != nil { - e.Logger.Error(err) - e.Error(http.StatusInternalServerError, err, "创建失败") + e.Error(500, err, "创建失败") return } - e.OK(control.GetId(), "创建成功") + e.OK(req.GetId(), "创建成功") } // UpdateSysMenu 修改菜单 // @Summary 修改菜单 // @Description 获取JSON // @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded +// @Accept application/json +// @Product application/json // @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": "修改失败"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menu/{id} [put] // @Security Bearer func (e SysMenu) UpdateSysMenu(c *gin.Context) { - control := new(dto.SysMenuControl) + req := dto.SysMenuControl{} s := new(service.SysMenu) err := e.MakeContext(c). MakeOrm(). - Bind(control, binding.JSON). + Bind(&req, binding.JSON, nil). MakeService(&s.Service). Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - control.SetUpdateBy(user.GetUserId(c)) - err = s.UpdateSysMenu(control).Error + req.SetUpdateBy(user.GetUserId(c)) + err = s.UpdateSysMenu(&req).Error if err != nil { - e.Logger.Error(err) + e.Error(500, err, "更新失败") return } - e.OK(control.GetId(), "更新成功") + e.OK(req.GetId(), "更新成功") } // DeleteSysMenu 删除菜单 @@ -161,8 +151,7 @@ func (e SysMenu) UpdateSysMenu(c *gin.Context) { // @Description 删除数据 // @Tags 菜单 // @Param data body dto.SysMenuById true "body" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menu [delete] func (e SysMenu) DeleteSysMenu(c *gin.Context) { control := new(dto.SysMenuById) @@ -174,6 +163,7 @@ func (e SysMenu) DeleteSysMenu(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } err = s.RemoveSysMenu(control).Error @@ -189,8 +179,7 @@ func (e SysMenu) DeleteSysMenu(c *gin.Context) { // @Summary 根据登录角色名称获取菜单列表数据(左菜单使用) // @Description 获取JSON // @Tags 菜单 -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menurole [get] // @Security Bearer func (e SysMenu) GetMenuRole(c *gin.Context) { @@ -201,6 +190,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -219,8 +209,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) { // @Description 获取JSON // @Tags 菜单 // @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menuids/{id} [get] // @Security Bearer func (e SysMenu) GetMenuIDS(c *gin.Context) { @@ -231,6 +220,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var data models.RoleMenu @@ -239,7 +229,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { result, err := data.GetIDS(s.Orm) if err != nil { e.Logger.Errorf("GetIDS error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "获取失败") + e.Error(500, err, "获取失败") return } e.OK(result, "") @@ -249,41 +239,39 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { // @Summary 角色修改使用的菜单列表 // @Description 获取JSON // @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded +// @Accept application/json +// @Product application/json // @Param roleId path int true "roleId" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/menuTreeselect/{roleId} [get] // @Security Bearer func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { - s := new(service.SysMenu) - sr := new(service.SysRole) - d := new(dto.SelectRole) + m := service.SysMenu{} + r := service.SysRole{} + req := dto.SelectRole{} err := e.MakeContext(c). MakeOrm(). - MakeService(&s.Service). - MakeService(&sr.Service). - Bind(&d, nil). + MakeService(&m.Service). + MakeService(&r.Service). + Bind(&req, nil). Errors if err != nil { e.Logger.Error(err) - e.Error(http.StatusUnprocessableEntity, err, err.Error()) + e.Error(500, err, err.Error()) return } - result, err := s.SetSysMenuLabel() + result, err := m.SetSysMenuLabel() if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } menuIds := make([]int, 0) - if d.RoleId != 0 { - menuIds, err = sr.GetRoleMenuId(d.RoleId) + if req.RoleId != 0 { + menuIds, err = r.GetRoleMenuId(req.RoleId) if err != nil { - e.Logger.Errorf("GetRoleMenuId error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") + e.Error(500, err, "") return } } @@ -291,4 +279,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { "menus": result, "checkedKeys": menuIds, }, "获取成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index fcdea3b..fa3621e 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -27,8 +27,7 @@ type SysOperaLog struct { // @Param status query string false "status" // @Param beginTime query string false "beginTime" // @Param endTime query string false "endTime" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/sys-opera-log [get] // @Security Bearer func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { @@ -40,8 +39,8 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -61,34 +60,29 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { // @Summary 操作日志通过id获取 // @Description 获取JSON // @Tags 操作日志 -// @Param id query string false "id" -// @Param ids body []int false "ids" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @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) GetSysOperaLog(c *gin.Context) { s := new(service.SysOperaLog) - req := new(dto.SysOperaLogById) + req := dto.SysOperaLogById{} err := e.MakeContext(c). MakeOrm(). - Bind(req). + Bind(&req, nil). MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } - var object models.SysOperaLog - - err = s.GetSysOperaLog(req, &object) + err = s.GetSysOperaLog(&req, &object) if err != nil { - e.Error(http.StatusUnprocessableEntity, err, "查询失败") + e.Error(500, err, "查询失败") return } - e.OK(object, "查看成功") } @@ -98,8 +92,7 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { // @Description 删除数据 // @Tags 操作日志 // @Param data body dto.SysOperaLogById true "body" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" // @Router /api/v1/sys-opera-log [delete] func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { s := new(service.SysOperaLog) @@ -110,8 +103,8 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -121,4 +114,4 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { 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 index 3bad947..27dad1a 100644 --- a/app/admin/apis/sys_post.go +++ b/app/admin/apis/sys_post.go @@ -38,8 +38,8 @@ func (e SysPost) GetSysPostList(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -72,8 +72,8 @@ func (e SysPost) GetSysPost(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysPost @@ -107,8 +107,8 @@ func (e SysPost) InsertSysPost(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -145,8 +145,8 @@ func (e SysPost) UpdateSysPost(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -177,8 +177,8 @@ func (e SysPost) DeleteSysPost(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } req.SetUpdateBy(user.GetUserId(c)) @@ -189,4 +189,4 @@ func (e SysPost) DeleteSysPost(c *gin.Context) { 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 index 57d13ec..65c8b6c 100644 --- a/app/admin/apis/sys_role.go +++ b/app/admin/apis/sys_role.go @@ -41,8 +41,8 @@ func (e SysRole) GetSysRoleList(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -76,8 +76,8 @@ func (e SysRole) GetSysRole(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -112,8 +112,8 @@ func (e SysRole) InsertSysRole(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -157,8 +157,8 @@ func (e SysRole) UpdateSysRole(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } cb := sdk.Runtime.GetCasbinKey(c.Request.Host) @@ -196,8 +196,8 @@ func (e SysRole) DeleteSysRole(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -225,8 +225,8 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } data := &models.SysRole{ @@ -242,4 +242,4 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { return } e.OK(nil, "操作成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index d6ed4fe..e2bd04f 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -38,8 +38,8 @@ func (e SysUser) GetSysUserList(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -51,7 +51,7 @@ func (e SysUser) GetSysUserList(c *gin.Context) { err = s.GetSysUserPage(&req, p, &list, &count) if err != nil { - e.Error(http.StatusInternalServerError, err, "查询失败") + e.Error(500, err, "查询失败") return } @@ -75,8 +75,8 @@ func (e SysUser) GetSysUser(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } var object models.SysUser @@ -109,8 +109,8 @@ func (e SysUser) InsertSysUser(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } // 设置创建人 @@ -118,7 +118,7 @@ func (e SysUser) InsertSysUser(c *gin.Context) { err = s.InsertSysUser(&req) if err != nil { e.Logger.Error(err) - e.Error(http.StatusInternalServerError, err, err.Error()) + e.Error(500, err, err.Error()) return } @@ -144,8 +144,8 @@ func (e SysUser) UpdateSysUser(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -179,8 +179,8 @@ func (e SysUser) DeleteSysUser(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -215,8 +215,8 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } // 数据权限检查 @@ -231,7 +231,7 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) { err = c.SaveUploadedFile(file, filPath) if err != nil { e.Logger.Errorf("save file error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "") + e.Error(500, err, "") return } } @@ -265,8 +265,8 @@ func (e SysUser) UpdateSysUserStatus(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -302,8 +302,8 @@ func (e SysUser) ResetSysUserPwd(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -339,8 +339,8 @@ func (e SysUser) UpdateSysUserPwd(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -371,8 +371,8 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -384,7 +384,7 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) { err = s.GetSysUserProfile(&req, user, &roles, &posts) if err != nil { e.Logger.Errorf("get user profile error, %s", err.Error()) - e.Error(http.StatusInternalServerError, err, "获取用户信息失败") + e.Error(500, err, "获取用户信息失败") return } e.OK(gin.H{ @@ -402,8 +402,8 @@ func (e SysUser) GetInfo(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) e.Logger.Error(err) + e.Error(500, err, err.Error()) return } @@ -454,4 +454,4 @@ func (e SysUser) GetInfo(c *gin.Context) { mp["deptId"] = sysUser.DeptId mp["name"] = sysUser.NickName e.OK(mp, "") -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index edc4afb..e7c8ba7 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -4,13 +4,10 @@ import ( "go-admin/app/admin/models" common "go-admin/common/models" - "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/api" - "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 @@ -28,15 +25,6 @@ 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 -} // SysDeptControl 增、改使用的结构体 type SysDeptControl struct { @@ -52,14 +40,6 @@ type SysDeptControl struct { common.ControlBy } -func (s *SysDeptControl) SetCreateBy(id int) { - s.CreateBy = id -} - -func (s *SysDeptControl) SetUpdateBy(id int) { - s.UpdateBy = id -} - // Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型 func (s *SysDeptControl) Generate(model *models.SysDept) { if s.DeptId != 0 { @@ -80,7 +60,7 @@ func (s *SysDeptControl) GetId() interface{} { return s.DeptId } -// SysConfigById 获取单个或者删除的结构体 +// SysDeptById 获取单个或者删除的结构体 type SysDeptById struct { Id int `uri:"id"` Ids []int `json:"ids"` @@ -107,4 +87,4 @@ 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_login_log.go b/app/admin/service/dto/sys_login_log.go index ffa5b59..993e3fb 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -17,6 +17,8 @@ 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 { @@ -115,4 +117,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById { func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { return &models.SysLoginLog{}, nil -} +} \ No newline at end of file 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