diff --git a/README.Zh-cn.md b/README.Zh-cn.md index 36aac13f..57f5679b 100644 --- a/README.Zh-cn.md +++ b/README.Zh-cn.md @@ -234,13 +234,13 @@ npm run dev - - + + - - + +
微信此群已满go-admin技术交流乙号go-admin技术交流丁号🆕go-admin技术交流柄号🆕
diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index a90de727..7477e2f6 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -4,7 +4,6 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "go-admin/app/admin/models" "go-admin/app/admin/service" @@ -61,10 +60,10 @@ func (e SysLoginLog) GetPage(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Get(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogById{} + req := dto.SysLoginLogGetReq{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.JSON, nil). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -91,7 +90,7 @@ func (e SysLoginLog) Get(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Delete(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogById{} + req := dto.SysLoginLogDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -102,7 +101,6 @@ func (e SysLoginLog) Delete(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) err = s.Remove(&req) if err != nil { e.Error(500, err, "删除失败") diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go index 1ea88bbd..5e53d071 100644 --- a/app/admin/service/dto/sys_api.go +++ b/app/admin/service/dto/sys_api.go @@ -77,10 +77,20 @@ func (s *SysApiUpdateReq) GetId() interface{} { // SysApiGetReq 功能获取请求参数 type SysApiGetReq struct { - dto.ObjectGetReq + Id int `uri:"id"` } +func (s *SysApiGetReq) GetId() interface{} { + return s.Id +} + + // SysApiDeleteReq 功能删除请求参数 type SysApiDeleteReq struct { - dto.ObjectDeleteReq + Ids []int `json:"ids"` } + +func (s *SysApiDeleteReq) GetId() interface{} { + return s.Ids +} + diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index c1061df2..79c98a7b 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -61,21 +61,19 @@ func (s *SysLoginLogControl) GetId() interface{} { return s.ID } -type SysLoginLogById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` - common.ControlBy +type SysLoginLogGetReq struct { + Id int `uri:"id"` } -func (s *SysLoginLogById) GetId() interface{} { +func (s *SysLoginLogGetReq) GetId() interface{} { return s.Id } -func (s *SysLoginLogById) Generate() *SysLoginLogById { - cp := *s - return &cp +// SysLoginLogDeleteReq 功能删除请求参数 +type SysLoginLogDeleteReq struct { + Ids []int `json:"ids"` } -func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { - return &models.SysLoginLog{}, nil +func (s *SysLoginLogDeleteReq) GetId() interface{} { + return s.Ids } \ No newline at end of file diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index 72bc6aed..f83f6061 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -79,19 +79,19 @@ func (s *SysOperaLogControl) GetId() interface{} { return s.ID } -type SysOperaLogById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` +type SysOperaLogGetReq struct { + Id int `uri:"id"` } -func (s *SysOperaLogById) GetId() interface{} { - if len(s.Ids) > 0 { - s.Ids = append(s.Ids, s.Id) - return s.Ids - } +func (s *SysOperaLogGetReq) GetId() interface{} { return s.Id } -func (s *SysOperaLogById) SetUpdateBy(id int) { +// SysOperaLogDeleteReq 功能删除请求参数 +type SysOperaLogDeleteReq struct { + Ids []int `json:"ids"` +} +func (s *SysOperaLogDeleteReq) GetId() interface{} { + return s.Ids } diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index cb077b83..8bc51236 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -34,8 +34,8 @@ func (e *SysLoginLog) GetPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginL return nil } -// GetSysLoginLog 获取SysLoginLog对象 -func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) error { +// Get 获取SysLoginLog对象 +func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) error { var err error db := e.Orm.First(model, d.GetId()) err = db.Error @@ -52,7 +52,7 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) err } // Remove 删除SysLoginLog -func (e *SysLoginLog) Remove(c *dto.SysLoginLogById) error { +func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error { var err error var data models.SysLoginLog diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index a5313501..c94b82c0 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -35,7 +35,7 @@ func (e *SysOperaLog) GetPage(c *dto.SysOperaLogGetPageReq, list *[]models.SysOp } // Get 获取SysOperaLog对象 -func (e *SysOperaLog) Get(d *dto.SysOperaLogById, model *models.SysOperaLog) error { +func (e *SysOperaLog) Get(d *dto.SysOperaLogGetReq, model *models.SysOperaLog) error { var data models.SysOperaLog err := e.Orm.Model(&data). @@ -67,7 +67,7 @@ func (e *SysOperaLog) Insert(model *models.SysOperaLog) error { } // Remove 删除SysOperaLog -func (e *SysOperaLog) Remove(d *dto.SysOperaLogById) error { +func (e *SysOperaLog) Remove(d *dto.SysOperaLogDeleteReq) error { var err error var data models.SysOperaLog