feat:Extract global configuration
This commit is contained in:
1 parent
a6970e9c67
commit
bfbc5081ea
15 files changed
+122
-174
No files matched your search
@@ -22,7 +22,7 @@ func GetDBTableList(c *gin.Context) {
|
|||||||
var err error
|
var err error
|
||||||
var pageSize = 10
|
var pageSize = 10
|
||||||
var pageIndex = 1
|
var pageIndex = 1
|
||||||
//if config2.DatabaseConfig.DbType=="sqlite3"{
|
//if config2.DatabaseConfig.Driver=="sqlite3"{
|
||||||
// res.Msg="对不起,sqlite3 暂不支持代码生成!"
|
// res.Msg="对不起,sqlite3 暂不支持代码生成!"
|
||||||
// c.JSON(http.StatusOK, res.ReturnError(500))
|
// c.JSON(http.StatusOK, res.ReturnError(500))
|
||||||
// return
|
// return
|
||||||
|
|||||||
+13
-17
@@ -11,7 +11,7 @@ import (
|
|||||||
"go-admin/global/orm"
|
"go-admin/global/orm"
|
||||||
"go-admin/router"
|
"go-admin/router"
|
||||||
"go-admin/tools"
|
"go-admin/tools"
|
||||||
config2 "go-admin/tools/config"
|
"go-admin/tools/config"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
@@ -20,7 +20,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
config string
|
configYml string
|
||||||
port string
|
port string
|
||||||
mode string
|
mode string
|
||||||
StartCmd = &cobra.Command{
|
StartCmd = &cobra.Command{
|
||||||
@@ -38,7 +38,7 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
||||||
StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on")
|
StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on")
|
||||||
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
|
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
|
||||||
}
|
}
|
||||||
@@ -49,19 +49,18 @@ func usage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func setup() {
|
func setup() {
|
||||||
|
|
||||||
//1. 读取配置
|
//1. 读取配置
|
||||||
config2.ConfigSetup(config)
|
config.ConfigSetup(configYml)
|
||||||
//2. 设置日志
|
//2. 设置日志
|
||||||
tools.InitLogger()
|
tools.InitLogger()
|
||||||
//3. 初始化数据库链接
|
//3. 初始化数据库链接
|
||||||
database.Setup()
|
database.Setup(config.DatabaseConfig.Driver)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func run() error {
|
func run() error {
|
||||||
if mode != "" {
|
if mode != "" {
|
||||||
config2.SetConfig(config, "settings.application.mode", mode)
|
config.SetConfig(configYml, "settings.application.mode", mode)
|
||||||
}
|
}
|
||||||
if viper.GetString("settings.application.mode") == string(tools.ModeProd) {
|
if viper.GetString("settings.application.mode") == string(tools.ModeProd) {
|
||||||
gin.SetMode(gin.ReleaseMode)
|
gin.SetMode(gin.ReleaseMode)
|
||||||
@@ -70,31 +69,28 @@ func run() error {
|
|||||||
r := router.InitRouter()
|
r := router.InitRouter()
|
||||||
|
|
||||||
defer orm.Eloquent.Close()
|
defer orm.Eloquent.Close()
|
||||||
if port != "" {
|
|
||||||
config2.SetConfig(config, "settings.application.port", port)
|
|
||||||
}
|
|
||||||
|
|
||||||
srv := &http.Server{
|
srv := &http.Server{
|
||||||
Addr: config2.ApplicationConfig.Host + ":" + config2.ApplicationConfig.Port,
|
Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port,
|
||||||
Handler: r,
|
Handler: r,
|
||||||
}
|
}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
// 服务连接
|
// 服务连接
|
||||||
if config2.ApplicationConfig.IsHttps {
|
if config.ApplicationConfig.IsHttps {
|
||||||
if err := srv.ListenAndServeTLS(config2.SslConfig.Pem, config2.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
|
if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
|
||||||
log.Fatalf("listen: %s\n", err)
|
log.Fatalf("listen: %s \r\n", err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||||
log.Fatalf("listen: %s\n", err)
|
log.Fatalf("listen: %s \r\n", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
content, _ := ioutil.ReadFile("./static/go-admin.txt")
|
content, _ := ioutil.ReadFile("./static/go-admin.txt")
|
||||||
fmt.Println(string(content))
|
fmt.Println(string(content))
|
||||||
fmt.Printf("%s Server Run http://127.0.0.1:%s/ \r\n", tools.GetCurrntTimeStr(), config2.ApplicationConfig.Port)
|
fmt.Printf("%s Server Run http://%s:%s/ \r\n", tools.GetCurrntTimeStr(), config.ApplicationConfig.Host, config.ApplicationConfig.Port)
|
||||||
fmt.Printf("%s Swagger URL http://127.0.0.1:%s/swagger/index.html \r\n", tools.GetCurrntTimeStr(), config2.ApplicationConfig.Port)
|
fmt.Printf("%s Swagger URL http://%s:%s/swagger/index.html \r\n", tools.GetCurrntTimeStr(), config.ApplicationConfig.Host, config.ApplicationConfig.Port)
|
||||||
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", tools.GetCurrntTimeStr())
|
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", tools.GetCurrntTimeStr())
|
||||||
// 等待中断信号以优雅地关闭服务器(设置 5 秒的超时时间)
|
// 等待中断信号以优雅地关闭服务器(设置 5 秒的超时时间)
|
||||||
quit := make(chan os.Signal)
|
quit := make(chan os.Signal)
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ import (
|
|||||||
"go-admin/models"
|
"go-admin/models"
|
||||||
"go-admin/models/gorm"
|
"go-admin/models/gorm"
|
||||||
"go-admin/tools"
|
"go-admin/tools"
|
||||||
config2 "go-admin/tools/config"
|
"go-admin/tools/config"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
config string
|
configYml string
|
||||||
mode string
|
mode string
|
||||||
StartCmd = &cobra.Command{
|
StartCmd = &cobra.Command{
|
||||||
Use: "init",
|
Use: "init",
|
||||||
@@ -26,7 +26,7 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
||||||
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
|
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,11 +34,12 @@ func run() {
|
|||||||
usage := `start init`
|
usage := `start init`
|
||||||
fmt.Println(usage)
|
fmt.Println(usage)
|
||||||
//1. 读取配置
|
//1. 读取配置
|
||||||
config2.ConfigSetup(config)
|
config.ConfigSetup(configYml)
|
||||||
//2. 设置日志
|
//2. 设置日志
|
||||||
tools.InitLogger()
|
tools.InitLogger()
|
||||||
//3. 初始化数据库链接
|
//3. 初始化数据库链接
|
||||||
database.Setup()
|
database.Setup(config.DatabaseConfig.Driver)
|
||||||
|
|
||||||
//4. 数据库迁移
|
//4. 数据库迁移
|
||||||
_ = migrateModel()
|
_ = migrateModel()
|
||||||
log.Println("数据库结构初始化成功!")
|
log.Println("数据库结构初始化成功!")
|
||||||
@@ -46,13 +47,12 @@ func run() {
|
|||||||
if err := models.InitDb(); err != nil {
|
if err := models.InitDb(); err != nil {
|
||||||
log.Fatal("数据库基础数据初始化失败!")
|
log.Fatal("数据库基础数据初始化失败!")
|
||||||
}
|
}
|
||||||
|
|
||||||
usage = `数据库基础数据初始化成功`
|
usage = `数据库基础数据初始化成功`
|
||||||
fmt.Println(usage)
|
fmt.Println(usage)
|
||||||
}
|
}
|
||||||
|
|
||||||
func migrateModel() error {
|
func migrateModel() error {
|
||||||
if config2.DatabaseConfig.DbType == "mysql" {
|
if config.DatabaseConfig.Driver == "mysql" {
|
||||||
orm.Eloquent = orm.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")
|
orm.Eloquent = orm.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")
|
||||||
}
|
}
|
||||||
return gorm.AutoMigrate(orm.Eloquent)
|
return gorm.AutoMigrate(orm.Eloquent)
|
||||||
|
|||||||
+5
-7
@@ -18,10 +18,8 @@ settings:
|
|||||||
secret: go-admin
|
secret: go-admin
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
database:
|
database:
|
||||||
dbtype: mysql
|
driver: mysql # mysql,sqlite3, pgsql
|
||||||
sqlite:
|
dbname: dbname
|
||||||
masterconn: ./sqlite3.db
|
source: user:password@/tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
|
||||||
mysql:
|
# source: sqlite3.db
|
||||||
masterconn: user:password@/tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
|
# source: host=myhost port=myport user=gorm dbname=gorm password=mypassword
|
||||||
pgsql:
|
|
||||||
masterconn: host=myhost port=myport user=gorm dbname=gorm password=mypassword
|
|
||||||
@@ -1,10 +1,8 @@
|
|||||||
package database
|
package database
|
||||||
|
|
||||||
import "go-admin/tools/config"
|
|
||||||
|
|
||||||
|
func Setup(driver string) {
|
||||||
func Setup() {
|
dbType := driver
|
||||||
dbType := config.DatabaseConfig.DbType
|
|
||||||
if dbType == "mysql" {
|
if dbType == "mysql" {
|
||||||
var db = new(Mysql)
|
var db = new(Mysql)
|
||||||
db.Setup()
|
db.Setup()
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package database
|
|||||||
import "github.com/jinzhu/gorm"
|
import "github.com/jinzhu/gorm"
|
||||||
|
|
||||||
type Database interface {
|
type Database interface {
|
||||||
|
Setup()
|
||||||
Open(dbType string, conn string) (db *gorm.DB, err error)
|
Open(dbType string, conn string) (db *gorm.DB, err error)
|
||||||
GetConnect() string
|
GetConnect() string
|
||||||
}
|
}
|
||||||
@@ -8,36 +8,33 @@ import (
|
|||||||
"go-admin/tools/config"
|
"go-admin/tools/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (e *Mysql) Setup() {
|
|
||||||
|
|
||||||
var err error
|
|
||||||
var db Database
|
|
||||||
|
|
||||||
db = new(Mysql)
|
|
||||||
orm.MysqlConn = db.GetConnect()
|
|
||||||
log.Info(orm.MysqlConn)
|
|
||||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.MysqlConn)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
|
||||||
} else {
|
|
||||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
|
||||||
}
|
|
||||||
|
|
||||||
if orm.Eloquent.Error != nil {
|
|
||||||
log.Fatalf("database error %v", orm.Eloquent.Error)
|
|
||||||
}
|
|
||||||
|
|
||||||
orm.Eloquent.LogMode(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
type Mysql struct {
|
type Mysql struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *Mysql) Setup() {
|
||||||
|
var err error
|
||||||
|
var db Database
|
||||||
|
db = new(Mysql)
|
||||||
|
orm.Source = db.GetConnect()
|
||||||
|
log.Info(orm.Source)
|
||||||
|
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||||
|
} else {
|
||||||
|
log.Printf("%s connect success!", orm.Driver)
|
||||||
|
}
|
||||||
|
if orm.Eloquent.Error != nil {
|
||||||
|
log.Fatalf("database error %v", orm.Eloquent.Error)
|
||||||
|
}
|
||||||
|
orm.Eloquent.LogMode(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 打开数据库连接
|
||||||
func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||||
return gorm.Open(dbType, conn)
|
return gorm.Open(dbType, conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取数据库连接
|
||||||
func (e *Mysql) GetConnect() string {
|
func (e *Mysql) GetConnect() string {
|
||||||
return config.DatabaseConfig.Mysql.MasterConn
|
return config.DatabaseConfig.Source
|
||||||
}
|
}
|
||||||
@@ -11,30 +11,20 @@ import (
|
|||||||
type PgSql struct {
|
type PgSql struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
|
||||||
eloquent, err := gorm.Open(dbType, conn)
|
|
||||||
return eloquent, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *PgSql) GetConnect() string {
|
|
||||||
|
|
||||||
return config.DatabaseConfig.PgSql.MasterConn
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *PgSql) Setup() {
|
func (e *PgSql) Setup() {
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
var db Database
|
var db Database
|
||||||
|
|
||||||
db = new(PgSql)
|
db = new(PgSql)
|
||||||
orm.PgSqlConn = db.GetConnect()
|
orm.Source = db.GetConnect()
|
||||||
log.Info(orm.PgSqlConn)
|
log.Info(orm.Source)
|
||||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.PgSqlConn)
|
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||||
} else {
|
} else {
|
||||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
log.Printf("%s connect success!", orm.Driver)
|
||||||
}
|
}
|
||||||
|
|
||||||
if orm.Eloquent.Error != nil {
|
if orm.Eloquent.Error != nil {
|
||||||
@@ -43,3 +33,14 @@ func (e *PgSql) Setup() {
|
|||||||
|
|
||||||
orm.Eloquent.LogMode(true)
|
orm.Eloquent.LogMode(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 打开数据库连接
|
||||||
|
func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||||
|
eloquent, err := gorm.Open(dbType, conn)
|
||||||
|
return eloquent, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *PgSql) GetConnect() string {
|
||||||
|
|
||||||
|
return config.DatabaseConfig.Source
|
||||||
|
}
|
||||||
@@ -11,29 +11,20 @@ import (
|
|||||||
type SqLite struct {
|
type SqLite struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
|
||||||
eloquent, err := gorm.Open(dbType, conn)
|
|
||||||
return eloquent, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *SqLite) GetConnect() string {
|
|
||||||
return config.DatabaseConfig.SqLite.MasterConn
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *SqLite) Setup() {
|
func (e *SqLite) Setup() {
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
var db Database
|
var db Database
|
||||||
|
|
||||||
db = new(SqLite)
|
db = new(SqLite)
|
||||||
orm.SqLiteConn = db.GetConnect()
|
orm.Source = db.GetConnect()
|
||||||
log.Info(orm.SqLiteConn)
|
log.Info(orm.Source)
|
||||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.SqLiteConn)
|
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||||
} else {
|
} else {
|
||||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
log.Printf("%s connect success!", orm.Driver)
|
||||||
}
|
}
|
||||||
|
|
||||||
if orm.Eloquent.Error != nil {
|
if orm.Eloquent.Error != nil {
|
||||||
@@ -42,3 +33,13 @@ func (e *SqLite) Setup() {
|
|||||||
|
|
||||||
orm.Eloquent.LogMode(true)
|
orm.Eloquent.LogMode(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 打开数据库连接
|
||||||
|
func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||||
|
eloquent, err := gorm.Open(dbType, conn)
|
||||||
|
return eloquent, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *SqLite) GetConnect() string {
|
||||||
|
return config.DatabaseConfig.Source
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package global
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/jinzhu/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
var GinEngine *gin.Engine
|
||||||
|
|
||||||
|
var Eloquent *gorm.DB
|
||||||
+3
-4
@@ -5,7 +5,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var Eloquent *gorm.DB
|
var Eloquent *gorm.DB
|
||||||
var MysqlConn string
|
var Source string
|
||||||
var SqLiteConn string
|
var Driver string
|
||||||
var PgSqlConn string
|
var DBName string
|
||||||
var DbType string
|
|
||||||
@@ -27,9 +27,9 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro
|
|||||||
var count int
|
var count int
|
||||||
table := new(gorm.DB)
|
table := new(gorm.DB)
|
||||||
|
|
||||||
if config2.DatabaseConfig.DbType == "mysql" {
|
if config2.DatabaseConfig.Driver == "mysql" {
|
||||||
table = orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`")
|
table = orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`")
|
||||||
table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName)
|
table = table.Where("table_schema= ? ", config2.DatabaseConfig.DBName)
|
||||||
|
|
||||||
if e.TableName != "" {
|
if e.TableName != "" {
|
||||||
return nil, 0, errors.New("table name cannot be empty!")
|
return nil, 0, errors.New("table name cannot be empty!")
|
||||||
@@ -51,9 +51,9 @@ func (e *DBColumns) GetList() ([]DBColumns, error) {
|
|||||||
var doc []DBColumns
|
var doc []DBColumns
|
||||||
table := new(gorm.DB)
|
table := new(gorm.DB)
|
||||||
|
|
||||||
if config2.DatabaseConfig.DbType == "mysql" {
|
if config2.DatabaseConfig.Driver == "mysql" {
|
||||||
table = orm.Eloquent.Select("*").Table("information_schema.columns")
|
table = orm.Eloquent.Select("*").Table("information_schema.columns")
|
||||||
table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName)
|
table = table.Where("table_schema= ? ", config2.DatabaseConfig.DBName)
|
||||||
|
|
||||||
if e.TableName == "" {
|
if e.TableName == "" {
|
||||||
return nil, errors.New("table name cannot be empty!")
|
return nil, errors.New("table name cannot be empty!")
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
|
|||||||
table := new(gorm.DB)
|
table := new(gorm.DB)
|
||||||
var count int
|
var count int
|
||||||
|
|
||||||
if config2.DatabaseConfig.DbType == "mysql" {
|
if config2.DatabaseConfig.Driver == "mysql" {
|
||||||
table = orm.Eloquent.Select("*").Table("information_schema.tables")
|
table = orm.Eloquent.Select("*").Table("information_schema.tables")
|
||||||
table = table.Where("TABLE_NAME not in (select table_name from " + config2.DatabaseConfig.Mysql.DBName + ".sys_tables) ")
|
table = table.Where("TABLE_NAME not in (select table_name from " + config2.DatabaseConfig.DBName + ".sys_tables) ")
|
||||||
table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName)
|
table = table.Where("table_schema= ? ", config2.DatabaseConfig.DBName)
|
||||||
|
|
||||||
if e.TableName != "" {
|
if e.TableName != "" {
|
||||||
table = table.Where("TABLE_NAME = ?", e.TableName)
|
table = table.Where("TABLE_NAME = ?", e.TableName)
|
||||||
@@ -33,7 +33,7 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
|
|||||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
} else if config2.DatabaseConfig.DbType == "sqlite3" {
|
} else if config2.DatabaseConfig.Driver == "sqlite3" {
|
||||||
table = orm.Eloquent.Select("name as TABLE_NAME,name as ENGINE,name as TABLE_ROWS,name as TABLE_COLLATION,name as CREATE_TIME,name as UPDATE_TIME,name as TABLE_COMMENT ").Table("sqlite_master")
|
table = orm.Eloquent.Select("name as TABLE_NAME,name as ENGINE,name as TABLE_ROWS,name as TABLE_COLLATION,name as CREATE_TIME,name as UPDATE_TIME,name as TABLE_COMMENT ").Table("sqlite_master")
|
||||||
table = table.Where("type = 'table' ")
|
table = table.Where("type = 'table' ")
|
||||||
|
|
||||||
@@ -52,14 +52,14 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
|
|||||||
func (e *DBTables) Get() (DBTables, error) {
|
func (e *DBTables) Get() (DBTables, error) {
|
||||||
var doc DBTables
|
var doc DBTables
|
||||||
table := new(gorm.DB)
|
table := new(gorm.DB)
|
||||||
if config2.DatabaseConfig.DbType == "mysql" {
|
if config2.DatabaseConfig.Driver == "mysql" {
|
||||||
table = orm.Eloquent.Select("*").Table("information_schema.tables")
|
table = orm.Eloquent.Select("*").Table("information_schema.tables")
|
||||||
table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName)
|
table = table.Where("table_schema= ? ", config2.DatabaseConfig.DBName)
|
||||||
if e.TableName == "" {
|
if e.TableName == "" {
|
||||||
return doc, errors.New("table name cannot be empty!")
|
return doc, errors.New("table name cannot be empty!")
|
||||||
}
|
}
|
||||||
table = table.Where("TABLE_NAME = ?", e.TableName)
|
table = table.Where("TABLE_NAME = ?", e.TableName)
|
||||||
} else if config2.DatabaseConfig.DbType == "sqlite3" {
|
} else if config2.DatabaseConfig.Driver == "sqlite3" {
|
||||||
table = orm.Eloquent.Select("name as TABLE_NAME,name as ENGINE,name as TABLE_ROWS,name as TABLE_COLLATION,name as CREATE_TIME,name as UPDATE_TIME,name as TABLE_COMMENT ").Table("sqlite_master")
|
table = orm.Eloquent.Select("name as TABLE_NAME,name as ENGINE,name as TABLE_ROWS,name as TABLE_COLLATION,name as CREATE_TIME,name as UPDATE_TIME,name as TABLE_COMMENT ").Table("sqlite_master")
|
||||||
table = table.Where("type = 'table' ")
|
table = table.Where("type = 'table' ")
|
||||||
|
|
||||||
|
|||||||
+12
-6
@@ -24,21 +24,27 @@ e = some(where (p.eft == allow))
|
|||||||
m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.act == p.act || p.act == "*")
|
m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.act == p.act || p.act == "*")
|
||||||
`
|
`
|
||||||
|
|
||||||
func Casbin() (*casbin.Enforcer, error) {
|
var CasbinEnforcer *casbin.Enforcer
|
||||||
|
|
||||||
|
func init() {
|
||||||
Apter, err := gormAdapter.NewAdapterByDB(orm.Eloquent)
|
Apter, err := gormAdapter.NewAdapterByDB(orm.Eloquent)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
panic(err)
|
||||||
}
|
}
|
||||||
m, err := model.NewModelFromString(text)
|
m, err := model.NewModelFromString(text)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
panic(err)
|
||||||
}
|
}
|
||||||
e, err := casbin.NewEnforcer(m, Apter)
|
e, err := casbin.NewEnforcer(m, Apter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
panic(err)
|
||||||
}
|
}
|
||||||
if err := e.LoadPolicy(); err == nil {
|
CasbinEnforcer = e
|
||||||
return e, err
|
}
|
||||||
|
|
||||||
|
func Casbin() (*casbin.Enforcer, error) {
|
||||||
|
if err := CasbinEnforcer.LoadPolicy(); err == nil {
|
||||||
|
return CasbinEnforcer, err
|
||||||
} else {
|
} else {
|
||||||
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -3,79 +3,20 @@ package config
|
|||||||
import "github.com/spf13/viper"
|
import "github.com/spf13/viper"
|
||||||
|
|
||||||
type Database struct {
|
type Database struct {
|
||||||
DbType string
|
Driver string
|
||||||
SqLite *SqLite
|
Source string
|
||||||
Mysql *Mysql
|
|
||||||
PgSql *PgSql
|
|
||||||
}
|
|
||||||
|
|
||||||
type SqLite struct {
|
|
||||||
MasterConn string
|
|
||||||
DBName string
|
|
||||||
}
|
|
||||||
|
|
||||||
type Mysql struct {
|
|
||||||
MasterConn string
|
|
||||||
DBName string
|
|
||||||
}
|
|
||||||
|
|
||||||
type PgSql struct {
|
|
||||||
MasterConn string
|
|
||||||
DBName string
|
DBName string
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitDatabase(cfg *viper.Viper) *Database {
|
func InitDatabase(cfg *viper.Viper) *Database {
|
||||||
|
|
||||||
dbType := cfg.GetString("dbType")
|
|
||||||
|
|
||||||
db := &Database{
|
db := &Database{
|
||||||
DbType: cfg.GetString("dbType"),
|
Driver: cfg.GetString("driver"),
|
||||||
|
Source: cfg.GetString("dbname"),
|
||||||
|
DBName: cfg.GetString("dbname"),
|
||||||
}
|
}
|
||||||
|
|
||||||
if dbType == "sqlite3" {
|
|
||||||
sqlit := cfg.Sub("sqlite")
|
|
||||||
if sqlit == nil {
|
|
||||||
panic("config not found settings.database.sqlite")
|
|
||||||
}
|
|
||||||
db.SqLite = InitSqlite(sqlit)
|
|
||||||
} else if dbType == "mysql" {
|
|
||||||
mysql := cfg.Sub("mysql")
|
|
||||||
if mysql == nil {
|
|
||||||
panic("config not found settings.database.mysql")
|
|
||||||
}
|
|
||||||
db.Mysql = InitMysql(mysql)
|
|
||||||
} else if dbType == "pgsql" {
|
|
||||||
pgsql := cfg.Sub("pgsql")
|
|
||||||
if pgsql == nil {
|
|
||||||
panic("config not found settings.database.pgsql")
|
|
||||||
}
|
|
||||||
db.PgSql = InitPgsql(pgsql)
|
|
||||||
} else {
|
|
||||||
panic("unknown dbtype")
|
|
||||||
}
|
|
||||||
|
|
||||||
return db
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
var DatabaseConfig = new(Database)
|
var DatabaseConfig = new(Database)
|
||||||
|
|
||||||
func InitSqlite(cfg *viper.Viper) *SqLite {
|
|
||||||
return &SqLite{
|
|
||||||
MasterConn: cfg.GetString("masterconn"),
|
|
||||||
DBName: cfg.GetString("dbname"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func InitMysql(cfg *viper.Viper) *Mysql {
|
|
||||||
return &Mysql{
|
|
||||||
MasterConn: cfg.GetString("masterconn"),
|
|
||||||
DBName: cfg.GetString("dbname"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func InitPgsql(cfg *viper.Viper) *PgSql {
|
|
||||||
return &PgSql{
|
|
||||||
MasterConn: cfg.GetString("masterconn"),
|
|
||||||
DBName: cfg.GetString("dbname"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user