修改,兼容go-admin sdk方案

This commit is contained in:
linwenxiang committed 2021-03-09 19:12:49 +08:00
1 parent c541d09076
commit 25d8364bf4
151 files changed
+578 -3525

No files matched your search

+6 -5
View File
@@ -4,13 +4,14 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"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"
"go-admin/common/actions"
"go-admin/common/apis"
"go-admin/tools"
)
type SysFileDir struct {
@@ -99,7 +100,7 @@ func (e *SysFileDir) InsertSysFileDir(c *gin.Context) {
return
}
// 设置创建人
control.CreateBy = tools.GetUserId(c)
control.CreateBy = user.GetUserId(c)
serviceSysFileDir := service.SysFileDir{}
serviceSysFileDir.Orm = db
@@ -134,7 +135,7 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
}
// 设置创建人
control.UpdateBy = tools.GetUserId(c)
control.UpdateBy = user.GetUserId(c)
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -160,7 +161,7 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
//删除操作
err = c.ShouldBindUri(control)
if err != nil {
@@ -174,7 +175,7 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
}
// 设置编辑人
control.UpdateBy = tools.GetUserId(c)
control.UpdateBy = user.GetUserId(c)
// 数据权限检查
p := actions.GetPermissionFromContext(c)
+4 -4
View File
@@ -4,13 +4,13 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"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"
"go-admin/common/actions"
"go-admin/common/apis"
"go-admin/tools"
)
type SysFileInfo struct {
@@ -108,7 +108,7 @@ func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) {
return
}
// 设置创建人
control.CreateBy = tools.GetUserId(c)
control.CreateBy = user.GetUserId(c)
serviceSysFileInfo := service.SysFileInfo{}
serviceSysFileInfo.Orm = db
@@ -145,7 +145,7 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) {
return
}
// 设置创建人
control.UpdateBy = tools.GetUserId(c)
control.UpdateBy = user.GetUserId(c)
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -186,7 +186,7 @@ func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) {
}
// 设置编辑人
control.UpdateBy = tools.GetUserId(c)
control.UpdateBy = user.GetUserId(c)
// 数据权限检查
p := actions.GetPermissionFromContext(c)