From da347e095fe0bbbe815f5465b4f92cf35e923251 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Mon, 22 Feb 2021 22:00:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/system/sys_role/sys_role.go | 8 +- app/admin/router/sys_config.go | 2 +- app/admin/router/sys_role.go | 2 +- app/admin/router/sysrouter.go | 4 +- app/admin/service/dto/sys_config.go | 2 +- app/admin/service/dto/sys_role.go | 17 +-- app/admin/service/sys_role.go | 20 ++-- .../version/1613998164781_migrate.go | 104 ++++++++++++++++++ common/dto/generate.go | 15 ++- 9 files changed, 140 insertions(+), 34 deletions(-) create mode 100644 cmd/migrate/migration/version/1613998164781_migrate.go diff --git a/app/admin/apis/system/sys_role/sys_role.go b/app/admin/apis/system/sys_role/sys_role.go index c28af47..f66ddff 100644 --- a/app/admin/apis/system/sys_role/sys_role.go +++ b/app/admin/apis/system/sys_role/sys_role.go @@ -126,6 +126,9 @@ func (e *SysRole) InsertSysRole(c *gin.Context) { } // 设置创建人 object.CreateBy = tools.GetUserId(c) + if object.Status == "" { + object.Status = "2" + } s := service.SysRole{} s.Orm = db @@ -195,10 +198,10 @@ func (e *SysRole) UpdateSysRole(c *gin.Context) { // @Summary 删除用户角色 // @Description 删除数据 // @Tags 角色/Role -// @Param roleId path int true "roleId" +// @Param data body dto.SysRoleById true "body" // @Success 200 {string} string "{"code": 200, "message": "删除成功"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/role/{roleId} [delete] +// @Router /api/v1/role [delete] // @Security Bearer func (e *SysRole) DeleteSysRole(c *gin.Context) { control := new(dto.SysRoleById) @@ -223,6 +226,7 @@ func (e *SysRole) DeleteSysRole(c *gin.Context) { err = s.RemoveSysRole(control) if err != nil { log.Error(err) + e.Error(c, http.StatusInternalServerError, err, "") return } _, err = global.LoadPolicy(c) diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go index e869a2c..e1c5e82 100644 --- a/app/admin/router/sys_config.go +++ b/app/admin/router/sys_config.go @@ -26,6 +26,6 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { api := &sys_config.SysConfig{} - r1.POST("", api.GetSysConfigByKEYForService) + r1.GET("/:configKey", api.GetSysConfigByKEYForService) } } diff --git a/app/admin/router/sys_role.go b/app/admin/router/sys_role.go index 809580f..c9945f1 100644 --- a/app/admin/router/sys_role.go +++ b/app/admin/router/sys_role.go @@ -20,7 +20,7 @@ func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r.GET("/:id", api.GetSysRole) r.POST("", api.InsertSysRole) r.PUT("/:id", api.UpdateSysRole) - r.DELETE("/:id", api.DeleteSysRole) + r.DELETE("", api.DeleteSysRole) } v1.PUT("/roledatascope", api.UpdateRoleDataScope) } diff --git a/app/admin/router/sysrouter.go b/app/admin/router/sysrouter.go index 8f7e780..ba202a1 100644 --- a/app/admin/router/sysrouter.go +++ b/app/admin/router/sysrouter.go @@ -167,14 +167,14 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar dicts.GET("/data/:dictCode", dataApi.GetSysDictData) dicts.POST("/data", dataApi.InsertSysDictData) dicts.PUT("/data/:dictCode", dataApi.UpdateSysDictData) - dicts.DELETE("/data/:dictCode", dataApi.DeleteSysDictData) + dicts.DELETE("/data", dataApi.DeleteSysDictData) dicts.GET("/type-option-select", dictApi.GetSysDictTypeAll) dicts.GET("/type", dictApi.GetSysDictTypeList) dicts.GET("/type/:id", dictApi.GetSysDictType) dicts.POST("/type", dictApi.InsertSysDictType) dicts.PUT("/type/:id", dictApi.UpdateSysDictType) - dicts.DELETE("/type/:id", dictApi.DeleteSysDictType) + dicts.DELETE("/type", dictApi.DeleteSysDictType) } } diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index 1cb69e4..bb791a5 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -37,7 +37,7 @@ func (m *SysConfigSearch) Bind(ctx *gin.Context) error { type SysConfigControl struct { ID int `uri:"ID" comment:"编码"` // 编码 ConfigName string `json:"configName" comment:""` - ConfigKey string `json:"configKey" comment:""` + ConfigKey string `uri:"configKey" json:"configKey" comment:""` ConfigValue string `json:"configValue" comment:""` ConfigType string `json:"configType" comment:""` Remark string `json:"remark" comment:""` diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index f5c0131..9cc19d3 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -98,8 +98,7 @@ func (s *SysRoleControl) GetId() interface{} { // SysConfigById 获取单个或者删除的结构体 type SysRoleById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` + dto.ObjectById } func (s *SysRoleById) Generate() *SysRoleById { @@ -111,20 +110,6 @@ func (s *SysRoleById) GetId() interface{} { return s.Id } -func (s *SysRoleById) Bind(ctx *gin.Context) error { - msgID := tools.GenerateMsgIDFromContext(ctx) - err := ctx.ShouldBindUri(s) - if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) - return err - } - err = ctx.ShouldBind(s) - if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) - } - return err -} - func (s *SysRoleById) GenerateM() (*models.SysRole, error) { return &models.SysRole{}, nil } diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index 00692ff..5303d07 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -155,7 +155,17 @@ func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { } }() - db := tx.Model(&data).Delete(&data, d.GetId()) + s := SysRoleMenu{} + s.Orm = tx + s.MsgID = msgID + for _, roleId := range d.Ids { + err = s.DeleteRoleMenu(tx, roleId) + if err != nil { + log.Errorf("msgID[%s] insert role menu error, %", msgID, err.Error()) + return err + } + } + db := tx.Model(&data).Delete(&data, d.Ids) if db.Error != nil { err = db.Error log.Errorf("MsgID[%s] Delete error: %s", msgID, err) @@ -165,14 +175,6 @@ func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { err = errors.New("无权删除该数据") return err } - s := SysRoleMenu{} - s.Orm = db - s.MsgID = msgID - err = s.DeleteRoleMenu(tx, d.Id) - if err != nil { - log.Errorf("msgID[%s] insert role menu error, %", msgID, err.Error()) - return err - } return nil } diff --git a/cmd/migrate/migration/version/1613998164781_migrate.go b/cmd/migrate/migration/version/1613998164781_migrate.go new file mode 100644 index 0000000..4e201cd --- /dev/null +++ b/cmd/migrate/migration/version/1613998164781_migrate.go @@ -0,0 +1,104 @@ +package version + +import ( + "go-admin/app/admin/models" + //"go-admin/app/admin/models" + "gorm.io/gorm" + "runtime" + + "go-admin/cmd/migrate/migration" + common "go-admin/common/models" +) + +func init() { + _, fileName, _, _ := runtime.Caller(0) + migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613998164781Test) +} + +func _1613998164781Test(db *gorm.DB, version string) error { + return db.Transaction(func(tx *gorm.DB) error { + + err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/deptList").Update("path", "/api/v1/dept").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/roleList").Update("path", "/api/v1/role").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/menuList").Update("path", "/api/v1/menu").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/postList").Update("path", "/api/v1/post").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/typelist").Update("path", "/api/v1/dict/type").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/datalist").Update("path", "/api/v1/dict/data").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/data"). + Where("action = ?", "PUT").Update("path", "/api/v1/dict/data/:id").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/data/:id"). + Where("action = ?", "DELETE").Update("path", "/api/v1/dict/data").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/type"). + Where("action = ?", "PUT").Update("path", "/api/v1/dict/type/:id").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/type/:id"). + Where("action = ?", "DELETE").Update("path", "/api/v1/dict/type").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/operloglist").Update("path", "/api/v1/sys-opera-log").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/loginloglist").Update("path", "/api/v1/sys-login-log").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/loginlog/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/operloglist%").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/role/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/role").Error + if err != nil { + return err + } + + return tx.Create(&common.Migration{ + Version: version, + }).Error + }) +} diff --git a/common/dto/generate.go b/common/dto/generate.go index ec70b9b..46d0001 100644 --- a/common/dto/generate.go +++ b/common/dto/generate.go @@ -12,16 +12,27 @@ type ObjectById struct { } func (s *ObjectById) Bind(ctx *gin.Context) error { + var err error + err = ctx.ShouldBindUri(s) + if err != nil { + return err + } if ctx.Request.Method == http.MethodDelete { - err := ctx.ShouldBind(&s.Ids) + err = ctx.ShouldBind(&s.Ids) if err != nil { return err } if len(s.Ids) > 0 { return nil } + if s.Ids == nil { + s.Ids = make([]int, 0) + } + if s.Id != 0 { + s.Ids = append(s.Ids, s.Id) + } } - return ctx.ShouldBindUri(s) + return err } func (s *ObjectById) GetId() interface{} {