修改,兼容go-admin sdk方案

This commit is contained in:
linwenxiang
2021-03-09 19:12:49 +08:00
parent c541d09076
commit 25d8364bf4
151 changed files with 578 additions and 3525 deletions
+1 -1
View File
@@ -49,4 +49,4 @@ func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) {
type SysFileInfoById struct {
dto.ObjectById
UpdateBy int `json:"-"`
}
}
+2 -2
View File
@@ -2,6 +2,7 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"gorm.io/gorm"
@@ -9,7 +10,6 @@ import (
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
"go-admin/common/service"
"go-admin/tools"
)
type SysDept struct {
@@ -64,7 +64,7 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error {
e.Log.Errorf("db error:%s", err)
return err
}
deptPath := "/" + tools.IntToString(model.DeptId)
deptPath := "/" + pkg.IntToString(model.DeptId)
if model.ParentId != 0 {
var deptP system.SysDept
e.Orm.Model(&data).First(&deptP, model.ParentId)
+1 -1
View File
@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
}
return m
}
}
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"go-admin/app/jobs"
"go-admin/common/dto"
"go-admin/common/service"
"go-admin/tools/app/msg"
)
type SysJob struct {
@@ -38,7 +37,7 @@ func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
return err
}
case <-time.After(time.Second * 1):
e.Msg = msg.TimeOut
e.Msg = "操作超时!"
return nil
}
return nil
+3 -3
View File
@@ -2,11 +2,11 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service/dto"
cDto "go-admin/common/dto"
"go-admin/common/service"
"go-admin/tools"
"gorm.io/gorm"
)
@@ -93,9 +93,9 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error {
err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!")
return err
}
menu.Paths = parentMenu.Paths + "/" + tools.IntToString(menu.MenuId)
menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId)
} else {
menu.Paths = "/0/" + tools.IntToString(menu.MenuId)
menu.Paths = "/0/" + pkg.IntToString(menu.MenuId)
}
e.Orm.Model(&data).Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
return err