数据库连接初始化优化
权限部分修改
This commit is contained in:
1 parent
4979fd659f
commit
deeb82048b
37 files changed
+726
-721
No files matched your search
@@ -1,42 +0,0 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/schema"
|
||||
|
||||
"go-admin/common/config"
|
||||
"go-admin/common/global"
|
||||
"go-admin/common/middleware"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
var WithContextDb = middleware.WithContextDb
|
||||
|
||||
func GetGormFromConfig(cfg config.Conf) map[string]*gorm.DB {
|
||||
gormDB := make(map[string]*gorm.DB)
|
||||
if cfg.GetSaas() {
|
||||
var err error
|
||||
for k, v := range cfg.GetDbs() {
|
||||
gormDB[k], err = getGormFromDb(v.Driver, v.DB, &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
global.Logger.Fatal(tools.Red(k+" connect error :"), err)
|
||||
}
|
||||
}
|
||||
return gormDB
|
||||
}
|
||||
c := cfg.GetDb()
|
||||
db, err := getGormFromDb(c.Driver, c.DB, &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
global.Logger.Fatal(tools.Red(c.Driver+" connect error :"), err)
|
||||
}
|
||||
gormDB["*"] = db
|
||||
return gormDB
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
// +build !sqlite3
|
||||
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func getGormFromDb(driver string, db *sql.DB, config *gorm.Config) (*gorm.DB, error) {
|
||||
switch driver {
|
||||
case "mysql":
|
||||
return gorm.Open(mysql.New(mysql.Config{Conn: db}), config)
|
||||
case "postgres":
|
||||
return gorm.Open(postgres.New(postgres.Config{Conn: db}), config)
|
||||
default:
|
||||
return nil, errors.New("not support this db driver")
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
// +build sqlite3
|
||||
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/common/global"
|
||||
)
|
||||
|
||||
func getGormFromDb(driver string, db *sql.DB, config *gorm.Config) (*gorm.DB, error) {
|
||||
switch driver {
|
||||
case "mysql":
|
||||
return gorm.Open(mysql.New(mysql.Config{Conn: db}), config)
|
||||
case "postgres":
|
||||
return gorm.Open(postgres.New(postgres.Config{Conn: db}), config)
|
||||
case "sqlite3":
|
||||
return gorm.Open(sqlite.Open(global.Source), config)
|
||||
default:
|
||||
return nil, errors.New("not support this db driver")
|
||||
}
|
||||
}
|
||||
@@ -17,5 +17,7 @@ func InitMiddleware(r *gin.Engine) {
|
||||
// Secure is a middleware function that appends security
|
||||
r.Use(Secure)
|
||||
// 链路追踪
|
||||
r.Use(middleware.Trace())
|
||||
//r.Use(middleware.Trace())
|
||||
// 数据库链接
|
||||
r.Use(middleware.WithContextDb)
|
||||
}
|
||||
@@ -17,7 +17,7 @@ func AuthCheckRole() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
data, _ := c.Get(jwtauth.JwtPayloadKey)
|
||||
v := data.(jwtauth.MapClaims)
|
||||
e := global.CasbinEnforcer
|
||||
e := global.Cfg.GetCasbinKey(c.Request.Host)
|
||||
var res bool
|
||||
var err error
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
@@ -38,7 +38,7 @@ func AuthCheckRole() gin.HandlerFunc {
|
||||
log.Infof("msgID[%s] isTrue: %v role: %s method: %s path: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path)
|
||||
c.Next()
|
||||
} else {
|
||||
log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path,"当前request无权限,请管理员确认!")
|
||||
log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path, "当前request无权限,请管理员确认!")
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 403,
|
||||
"msg": "对不起,您没有该接口访问权限,请联系管理员",
|
||||
|
||||
Reference in new issue
Block a user