修改,兼容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
@@ -1,22 +1,23 @@
package actions
import (
"go-admin/common/apis"
"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"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// CreateAction 通用新增动作
func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
log := apis.GetRequestLogger(c)
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
@@ -35,7 +36,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
err = db.WithContext(c).Create(object).Error
if err != nil {
log.Errorf("Create error: %s", err)
+7 -6
View File
@@ -4,24 +4,25 @@ import (
"net/http"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"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/common/dto"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// DeleteAction 通用删除动作
func DeleteAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
//删除操作
req := control.Generate()
err = req.Bind(c)
@@ -37,7 +38,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
//数据权限检查
p := GetPermissionFromContext(c)
+5 -5
View File
@@ -5,25 +5,25 @@ import (
"net/http"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/dto"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// IndexAction 通用查询动作
func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
list := f()
object := m.Generate()
req := d.Generate()
+9 -9
View File
@@ -5,12 +5,12 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
"github.com/go-admin-team/go-admin-core/sdk/config"
"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"
"gorm.io/gorm"
)
type DataPermission struct {
@@ -22,15 +22,15 @@ type DataPermission struct {
func PermissionAction() gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
var p = new(DataPermission)
if userId := tools.GetUserIdStr(c); userId != "" {
if userId := user.GetUserIdStr(c); userId != "" {
p, err = newDataPermission(db, userId)
if err != nil {
log.Errorf("MsgID[%s] PermissionAction error: %s", msgID, err)
@@ -71,7 +71,7 @@ func Permission(tableName string, p *DataPermission) func(db *gorm.DB) *gorm.DB
case "3":
return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", p.DeptId)
case "4":
return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(p.DeptId)+"%")
return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(p.DeptId)+"%")
case "5":
return db.Where(tableName+".create_by = ?", p.UserId)
default:
+7 -6
View File
@@ -4,24 +4,25 @@ import (
"net/http"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"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/common/dto"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// UpdateAction 通用更新动作
func UpdateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
req := control.Generate()
//更新操作
err = req.Bind(c)
@@ -35,7 +36,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
//数据权限检查
p := GetPermissionFromContext(c)
+5 -5
View File
@@ -5,25 +5,25 @@ import (
"net/http"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"gorm.io/gorm"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/common/dto"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// ViewAction 通用详情动作
func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
//查看详情
req := control.Generate()
err = req.Bind(c)