修改,兼容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)
+6 -6
View File
@@ -2,14 +2,14 @@ package apis
import (
"encoding/json"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"gorm.io/gorm"
"go-admin/common/models"
"go-admin/tools"
)
type Api struct {
@@ -22,7 +22,7 @@ func (e *Api) GetLogger(c *gin.Context) *logger.Logger {
// GetOrm 获取Orm DB
func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
db, err := tools.GetOrm(c)
db, err := pkg.GetOrm(c)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return nil, err
@@ -39,7 +39,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) {
if msg != "" {
res.Msg = msg
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
res.RequestId = pkg.GenerateMsgIDFromContext(c)
Return := res.ReturnError(code)
e.setResult(c, Return, res.RequestId, code)
c.AbortWithStatusJSON(http.StatusOK, Return)
@@ -52,7 +52,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) {
if msg != "" {
res.Msg = msg
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
res.RequestId = pkg.GenerateMsgIDFromContext(c)
Return := res.ReturnOK()
e.setResult(c, Return, res.RequestId, 200)
c.AbortWithStatusJSON(http.StatusOK, Return)
@@ -70,7 +70,7 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in
// Custom 兼容函数
func (e *Api) Custom(c *gin.Context, data gin.H) {
msgID := tools.GenerateMsgIDFromContext(c)
msgID := pkg.GenerateMsgIDFromContext(c)
Return := data
e.setResult(c, Return, msgID, 200)
c.AbortWithStatusJSON(http.StatusOK, Return)
+6 -6
View File
@@ -2,17 +2,17 @@ package apis
import (
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/app"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"strings"
)
// GetRequestLogger 获取上下文提供的日志
func GetRequestLogger(c *gin.Context) *logger.Logger {
requestId := tools.GenerateMsgIDFromContext(c)
log := app.Runtime.GetLogger().Fields(map[string]interface{}{
strings.ToLower(tools.TrafficKey): requestId,
requestId := pkg.GenerateMsgIDFromContext(c)
log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
strings.ToLower(pkg.TrafficKey): requestId,
})
return &logger.Logger{Logger: log}
}
+12 -11
View File
@@ -1,7 +1,9 @@
package database
import (
"go-admin/tools/app"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/common/global"
. "log"
"time"
@@ -12,9 +14,8 @@ import (
"gorm.io/gorm/schema"
log "github.com/go-admin-team/go-admin-core/logger"
mycasbin "go-admin/pkg/casbin"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
toolsConfig "github.com/go-admin-team/go-admin-core/sdk/config"
mycasbin "github.com/go-admin-team/go-admin-core/sdk/pkg/casbin"
)
// Setup 配置数据库
@@ -25,10 +26,10 @@ func Setup() {
}
func setupSimpleDatabase(host string, c *toolsConfig.Database) {
if app.Driver == "" {
app.Driver = c.Driver
if global.Driver == "" {
global.Driver = c.Driver
}
log.Infof("%s => %s", host, tools.Green(c.Source))
log.Infof("%s => %s", host, pkg.Green(c.Source))
registers := make([]toolsDB.ResolverConfigure, len(c.Registers))
for i := range c.Registers {
registers[i] = toolsDB.NewResolverConfigure(
@@ -54,9 +55,9 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
}, opens[c.Driver])
if err != nil {
log.Fatal(tools.Red(c.Driver+" connect error :"), err)
log.Fatal(pkg.Red(c.Driver+" connect error :"), err)
} else {
log.Info(tools.Green(c.Driver + " connect success !"))
log.Info(pkg.Green(c.Driver + " connect success !"))
}
e := mycasbin.Setup(db, "sys_")
@@ -65,6 +66,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
// global.Eloquent = db
//}
app.Runtime.SetDb(host, db)
app.Runtime.SetCasbin(host, e)
sdk.Runtime.SetDb(host, db)
sdk.Runtime.SetCasbin(host, e)
}
+2 -2
View File
@@ -2,7 +2,7 @@ package dto
import (
"github.com/go-admin-team/go-admin-core/tools/search"
"go-admin/tools/app"
"go-admin/common/global"
"gorm.io/gorm"
)
@@ -44,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
GormPublic: search.GormPublic{},
Join: make([]*search.GormJoin, 0),
}
search.ResolveSearchQuery(app.Driver, q, condition)
search.ResolveSearchQuery(global.Driver, q, condition)
for _, join := range condition.Join {
if join == nil {
continue
-1
View File
@@ -1,7 +1,6 @@
package file_store
type FileStore struct {
}
// Setup 配置数据库
+1 -1
View File
@@ -3,4 +3,4 @@ package file_store
type FileStoreType interface {
Setup() error
UpLoad(yourObjectName string, localFile string) error
}
}
+12
View File
@@ -0,0 +1,12 @@
package global
const (
// go-admin Version Info
Version = "1.3.0-rc.0"
)
var (
Source string
Driver string
DBName string
)
+3 -3
View File
@@ -3,14 +3,14 @@ package global
import (
"github.com/casbin/casbin/v2"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk"
"go-admin/common/apis"
"go-admin/tools/app"
)
func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
log := apis.GetRequestLogger(c)
if err := app.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
return app.Runtime.GetCasbinKey(c.Request.Host), err
if err := sdk.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
return sdk.Runtime.GetCasbinKey(c.Request.Host), err
} else {
log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
return nil, err
+2 -2
View File
@@ -2,10 +2,10 @@ package middleware
import (
"github.com/gin-gonic/gin"
"go-admin/tools/app"
"github.com/go-admin-team/go-admin-core/sdk"
)
func WithContextDb(c *gin.Context) {
c.Set("db", app.Runtime.GetDbByKey(c.Request.Host))
c.Set("db", sdk.Runtime.GetDbByKey(c.Request.Host))
c.Next()
}
-9
View File
@@ -1,9 +0,0 @@
package middleware
import "github.com/gin-gonic/gin"
func SetLogger() gin.HandlerFunc {
return func(ctx *gin.Context) {
}
}
+49
View File
@@ -0,0 +1,49 @@
package middleware
import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/common/apis"
)
//权限检查中间件
func AuthCheckRole() gin.HandlerFunc {
return func(c *gin.Context) {
log := apis.GetRequestLogger(c)
data, _ := c.Get(jwtauth.JwtPayloadKey)
v := data.(jwtauth.MapClaims)
e := sdk.Runtime.GetCasbinKey(c.Request.Host)
var res bool
var err error
//检查权限
if v["rolekey"] == "admin" {
res = true
log.Infof("info:%s method:%s path:%s", v["rolekey"], c.Request.Method, c.Request.URL.Path)
} else {
res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method)
if err != nil {
log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path)
app.Error(c, 500, err, "")
return
}
}
if res {
log.Infof("isTrue: %v role: %s method: %s path: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path)
c.Next()
} else {
log.Warnf("isTrue: %v role: %s method: %s path: %s message: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path, "当前request无权限,请管理员确认!")
c.JSON(http.StatusOK, gin.H{
"code": 403,
"msg": "对不起,您没有该接口访问权限,请联系管理员",
})
c.Abort()
return
}
}
}
+1 -1
View File
@@ -27,4 +27,4 @@ type ModelTime struct {
CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"`
UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
DeletedAt gorm.DeletedAt `json:"-" gorm:"index;comment:删除时间"`
}
}
+1 -1
View File
@@ -27,4 +27,4 @@ func (res *Response) ReturnOK() *Response {
func (res *Response) ReturnError(code int) *Response {
res.Code = code
return res
}
}
+1 -1
View File
@@ -3,7 +3,7 @@ package models
import (
"gorm.io/gorm"
"go-admin/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
)
// BaseUser 密码登录基础用户
+1 -1
View File
@@ -1,7 +1,7 @@
package service
import (
"go-admin/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"gorm.io/gorm"
)