数据库连接初始化优化
权限部分修改
This commit is contained in:
1 parent
4979fd659f
commit
deeb82048b
37 files changed
+726
-721
No files matched your search
+27
-33
@@ -1,47 +1,47 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"net/http"
|
||||
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
saas bool
|
||||
dbs map[string]*DBConfig
|
||||
db *DBConfig
|
||||
engine http.Handler
|
||||
dbs map[string]*gorm.DB
|
||||
casbins map[string]*casbin.SyncedEnforcer
|
||||
engine http.Handler
|
||||
}
|
||||
|
||||
type DBConfig struct {
|
||||
Driver string
|
||||
DB *sql.DB
|
||||
}
|
||||
|
||||
// SetDbs 设置对应key的db
|
||||
func (c *Config) SetDbs(key string, db *DBConfig) {
|
||||
// SetDb 设置对应key的db
|
||||
func (c *Config) SetDb(key string, db *gorm.DB) {
|
||||
c.dbs[key] = db
|
||||
}
|
||||
|
||||
// GetDbs 获取所有map里的db数据
|
||||
func (c *Config) GetDbs() map[string]*DBConfig {
|
||||
// GetDb 获取所有map里的db数据
|
||||
func (c *Config) GetDb() map[string]*gorm.DB {
|
||||
return c.dbs
|
||||
}
|
||||
|
||||
// GetDbByKey 根据key获取db
|
||||
func (c *Config) GetDbByKey(key string) *DBConfig {
|
||||
func (c *Config) GetDbByKey(key string) *gorm.DB {
|
||||
if db, ok := c.dbs["*"]; ok {
|
||||
return db
|
||||
}
|
||||
return c.dbs[key]
|
||||
}
|
||||
|
||||
// SetDb 设置单个db
|
||||
func (c *Config) SetDb(db *DBConfig) {
|
||||
c.db = db
|
||||
func (c *Config) SetCasbin(key string, enforcer *casbin.SyncedEnforcer) {
|
||||
c.casbins[key] = enforcer
|
||||
}
|
||||
|
||||
// GetDb 获取单个db
|
||||
func (c *Config) GetDb() *DBConfig {
|
||||
return c.db
|
||||
// GetCasbinKey 根据key获取casbin
|
||||
func (c *Config) GetCasbinKey(key string) *casbin.SyncedEnforcer {
|
||||
if e, ok := c.casbins["*"]; ok {
|
||||
return e
|
||||
}
|
||||
return c.casbins[key]
|
||||
}
|
||||
|
||||
// SetEngine 设置路由引擎
|
||||
@@ -64,16 +64,10 @@ func (c *Config) GetLogger() logger.Logger {
|
||||
return logger.DefaultLogger
|
||||
}
|
||||
|
||||
// SetSaas 设置是否是saas应用
|
||||
func (c *Config) SetSaas(saas bool) {
|
||||
c.saas = saas
|
||||
}
|
||||
|
||||
// GetSaas 获取是否是saas应用
|
||||
func (c *Config) GetSaas() bool {
|
||||
return c.saas
|
||||
}
|
||||
|
||||
func DefaultConfig() *Config {
|
||||
return &Config{}
|
||||
// NewConfig 默认值
|
||||
func NewConfig() *Config {
|
||||
return &Config{
|
||||
dbs: make(map[string]*gorm.DB),
|
||||
casbins: make(map[string]*casbin.SyncedEnforcer),
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,21 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"net/http"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Conf interface {
|
||||
//多db设置,⚠️SetDbs不允许并发,可以根据自己的业务,例如app分库、host分库
|
||||
SetDbs(key string, db *DBConfig)
|
||||
GetDbs() map[string]*DBConfig
|
||||
GetDbByKey(key string) *DBConfig
|
||||
GetSaas() bool
|
||||
SetSaas(bool)
|
||||
SetDb(key string, db *gorm.DB)
|
||||
GetDb() map[string]*gorm.DB
|
||||
GetDbByKey(key string) *gorm.DB
|
||||
|
||||
//单库业务实现这两个接口
|
||||
SetDb(db *DBConfig)
|
||||
GetDb() *DBConfig
|
||||
SetCasbin(key string, enforcer *casbin.SyncedEnforcer)
|
||||
GetCasbinKey(key string) *casbin.SyncedEnforcer
|
||||
|
||||
//使用的路由
|
||||
SetEngine(engine http.Handler)
|
||||
|
||||
@@ -1,17 +1,59 @@
|
||||
// +build !sqlite3
|
||||
|
||||
package database
|
||||
|
||||
// Setup 配置数据库
|
||||
func Setup(driver string) {
|
||||
dbType := driver
|
||||
if dbType == "mysql" {
|
||||
var db = new(Mysql)
|
||||
db.Setup()
|
||||
}
|
||||
import (
|
||||
. "log"
|
||||
"time"
|
||||
|
||||
if dbType == "postgres" {
|
||||
var db = new(PgSql)
|
||||
db.Setup()
|
||||
logCore "github.com/go-admin-team/go-admin-core/logger"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
"gorm.io/gorm/schema"
|
||||
|
||||
"go-admin/common/global"
|
||||
"go-admin/common/log"
|
||||
mycasbin "go-admin/pkg/casbin"
|
||||
"go-admin/tools"
|
||||
toolsConfig "go-admin/tools/config"
|
||||
)
|
||||
|
||||
// Setup 配置数据库
|
||||
func Setup() {
|
||||
for k := range toolsConfig.DatabasesConfig {
|
||||
setupSimpleDatabase(k, toolsConfig.DatabasesConfig[k])
|
||||
}
|
||||
}
|
||||
|
||||
func setupSimpleDatabase(host string, c *toolsConfig.Database) {
|
||||
if global.Driver == "" {
|
||||
global.Driver = c.Driver
|
||||
}
|
||||
log.Infof("%s => %s", host, tools.Green(c.Source))
|
||||
db, err := gorm.Open(open[c.Driver](c.Source), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
Logger: logger.New(
|
||||
New(logCore.DefaultLogger.Options().Out, "\r\n", LstdFlags),
|
||||
logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.LogLevel(
|
||||
logCore.DefaultLogger.Options().Level.LevelForGorm()),
|
||||
},
|
||||
),
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal(tools.Red(c.Driver+" connect error :"), err)
|
||||
} else {
|
||||
log.Info(tools.Green(c.Driver + " connect success !"))
|
||||
}
|
||||
|
||||
e := mycasbin.Setup(db, "sys_")
|
||||
|
||||
if host == "*" {
|
||||
global.Eloquent = db
|
||||
}
|
||||
|
||||
global.Cfg.SetDb(host, db)
|
||||
global.Cfg.SetCasbin(host, e)
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
// +build sqlite3
|
||||
|
||||
package database
|
||||
|
||||
func Setup(driver string) {
|
||||
dbType := driver
|
||||
if dbType == "mysql" {
|
||||
var db = new(Mysql)
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "sqlite3" {
|
||||
var db = new(SqLite)
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "postgres" {
|
||||
var db = new(PgSql)
|
||||
db.Setup()
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package database
|
||||
|
||||
import "gorm.io/gorm"
|
||||
|
||||
// Database 数据库配置
|
||||
type Database interface {
|
||||
Setup()
|
||||
Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error)
|
||||
GetConnect() string
|
||||
GetDriver() string
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
. "log"
|
||||
"time"
|
||||
|
||||
goAdminLogger "github.com/go-admin-team/go-admin-core/logger"
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
"gorm.io/gorm/schema"
|
||||
|
||||
"go-admin/common/config"
|
||||
"go-admin/common/global"
|
||||
"go-admin/common/log"
|
||||
"go-admin/tools"
|
||||
toolsConfig "go-admin/tools/config"
|
||||
)
|
||||
|
||||
// Mysql mysql配置结构体
|
||||
type Mysql struct {
|
||||
}
|
||||
|
||||
// Setup 配置步骤
|
||||
func (e *Mysql) Setup() {
|
||||
global.Source = e.GetConnect()
|
||||
log.Info(tools.Green(global.Source))
|
||||
db, err := sql.Open("mysql", global.Source)
|
||||
if err != nil {
|
||||
log.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
|
||||
}
|
||||
global.Cfg.SetDb(&config.DBConfig{
|
||||
Driver: "mysql",
|
||||
DB: db,
|
||||
})
|
||||
global.Eloquent, err = e.Open(db, &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
|
||||
} else {
|
||||
log.Info(tools.Green(e.GetDriver() + " connect success !"))
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
|
||||
}
|
||||
|
||||
if toolsConfig.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(
|
||||
New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", LstdFlags),
|
||||
logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.LogLevel(
|
||||
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Open 打开数据库连接
|
||||
func (e *Mysql) Open(db *sql.DB, cfg *gorm.Config) (*gorm.DB, error) {
|
||||
return gorm.Open(mysql.New(mysql.Config{Conn: db}), cfg)
|
||||
}
|
||||
|
||||
// GetConnect 获取数据库连接
|
||||
func (e *Mysql) GetConnect() string {
|
||||
return toolsConfig.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
// GetDriver 获取连接
|
||||
func (e *Mysql) GetDriver() string {
|
||||
return toolsConfig.DatabaseConfig.Driver
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
// +build !sqlite3
|
||||
|
||||
package database
|
||||
|
||||
import (
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var open = map[string]func(string) gorm.Dialector{
|
||||
"mysql": mysql.Open,
|
||||
"postgres": postgres.Open,
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
// +build sqlite3
|
||||
|
||||
package database
|
||||
|
||||
import (
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var open = map[string]func(string) gorm.Dialector{
|
||||
"mysql": mysql.Open,
|
||||
"postgres": postgres.Open,
|
||||
"sqlite3": sqlite.Open,
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"go-admin/common/log"
|
||||
. "log"
|
||||
"time"
|
||||
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
"gorm.io/gorm/schema"
|
||||
|
||||
goAdminLogger "github.com/go-admin-team/go-admin-core/logger"
|
||||
"go-admin/common/config"
|
||||
"go-admin/common/global"
|
||||
"go-admin/tools"
|
||||
toolsConfig "go-admin/tools/config"
|
||||
)
|
||||
|
||||
type PgSql struct {
|
||||
}
|
||||
|
||||
func (e *PgSql) Setup() {
|
||||
var err error
|
||||
|
||||
global.Source = e.GetConnect()
|
||||
log.Info(global.Source)
|
||||
db, err := sql.Open("postgresql", global.Source)
|
||||
if err != nil {
|
||||
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
|
||||
}
|
||||
global.Cfg.SetDb(&config.DBConfig{
|
||||
Driver: "mysql",
|
||||
DB: db,
|
||||
})
|
||||
global.Eloquent, err = e.Open(db, &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", e.GetDriver(), err)
|
||||
} else {
|
||||
log.Infof("%s connect success!", e.GetDriver())
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
if toolsConfig.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(
|
||||
New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", LstdFlags),
|
||||
logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.LogLevel(
|
||||
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
func (e *PgSql) Open(db *sql.DB, cfg *gorm.Config) (*gorm.DB, error) {
|
||||
return gorm.Open(postgres.New(postgres.Config{Conn: db}), cfg)
|
||||
}
|
||||
|
||||
func (e *PgSql) GetConnect() string {
|
||||
return toolsConfig.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *PgSql) GetDriver() string {
|
||||
return toolsConfig.DatabaseConfig.Driver
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
// +build sqlite3
|
||||
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
. "log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
"gorm.io/gorm/schema"
|
||||
|
||||
"go-admin/common/config"
|
||||
"go-admin/common/global"
|
||||
"go-admin/common/log"
|
||||
"go-admin/tools"
|
||||
toolsConfig "go-admin/tools/config"
|
||||
)
|
||||
|
||||
type SqLite struct {
|
||||
}
|
||||
|
||||
func (e *SqLite) Setup() {
|
||||
var err error
|
||||
|
||||
global.Source = e.GetConnect()
|
||||
log.Info(global.Source)
|
||||
db, err := sql.Open("sqlite3", global.Source)
|
||||
if err != nil {
|
||||
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
|
||||
}
|
||||
global.Cfg.SetDb(&config.DBConfig{
|
||||
Driver: "sqlite3",
|
||||
DB: db,
|
||||
})
|
||||
global.Eloquent, err = e.Open(e.GetConnect(), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", e.GetDriver(), err)
|
||||
} else {
|
||||
log.Infof("%s connect success!", e.GetDriver())
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
if toolsConfig.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(
|
||||
New(os.Stdout, "\r\n", LstdFlags), logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.Info,
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
func (*SqLite) Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error) {
|
||||
return gorm.Open(sqlite.Open(conn), cfg)
|
||||
}
|
||||
|
||||
func (e *SqLite) GetConnect() string {
|
||||
return toolsConfig.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *SqLite) GetDriver() string {
|
||||
return toolsConfig.DatabaseConfig.Driver
|
||||
}
|
||||
@@ -2,9 +2,8 @@ package dto
|
||||
|
||||
import (
|
||||
"github.com/go-admin-team/go-admin-core/tools/search"
|
||||
"go-admin/common/global"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
type GeneralDelDto struct {
|
||||
@@ -45,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
|
||||
GormPublic: search.GormPublic{},
|
||||
Join: make([]*search.GormJoin, 0),
|
||||
}
|
||||
search.ResolveSearchQuery(config.DatabaseConfig.Driver, q, condition)
|
||||
search.ResolveSearchQuery(global.Driver, q, condition)
|
||||
for _, join := range condition.Join {
|
||||
if join == nil {
|
||||
continue
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/robfig/cron/v3"
|
||||
"gorm.io/gorm"
|
||||
@@ -15,10 +14,9 @@ const (
|
||||
Version = "1.2.3"
|
||||
)
|
||||
|
||||
var Cfg config.Conf = config.DefaultConfig()
|
||||
var Cfg config.Conf = config.NewConfig()
|
||||
|
||||
var GinEngine *gin.Engine
|
||||
var CasbinEnforcer *casbin.SyncedEnforcer
|
||||
var Eloquent *gorm.DB
|
||||
|
||||
var GADMCron *cron.Cron
|
||||
|
||||
@@ -3,13 +3,17 @@ package global
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/casbin/casbin/v2/log"
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
func LoadPolicy() (*casbin.SyncedEnforcer, error) {
|
||||
if err := CasbinEnforcer.LoadPolicy(); err == nil {
|
||||
return CasbinEnforcer, err
|
||||
func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
|
||||
if err := Cfg.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
|
||||
return Cfg.GetCasbinKey(c.Request.Host), err
|
||||
} else {
|
||||
log.LogPrintf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
log.LogPrintf("msgID[%s] casbin rbac_model or policy init error, message: %v \r\n", msgID, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
+5
-10
@@ -2,16 +2,11 @@ package middleware
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/common/global"
|
||||
)
|
||||
|
||||
func WithContextDb(dbMap map[string]*gorm.DB) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
if db, ok := dbMap["*"]; ok {
|
||||
c.Set("db", db)
|
||||
} else {
|
||||
c.Set("db", dbMap[c.Request.Host])
|
||||
}
|
||||
c.Next()
|
||||
}
|
||||
func WithContextDb(c *gin.Context) {
|
||||
c.Set("db", global.Cfg.GetDbByKey(c.Request.Host))
|
||||
c.Next()
|
||||
}
|
||||
Reference in new issue
Block a user