feat:Extract global configuration

This commit is contained in:
zhangwenjian committed 2020-07-06 07:53:34 +08:00
1 parent a6970e9c67
commit bfbc5081ea
15 files changed
+155 -207

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ func GetDBTableList(c *gin.Context) {
var err error
var pageSize = 10
var pageIndex = 1
//if config2.DatabaseConfig.DbType=="sqlite3"{
//if config2.DatabaseConfig.Driver=="sqlite3"{
// res.Msg="对不起,sqlite3 暂不支持代码生成!"
// c.JSON(http.StatusOK, res.ReturnError(500))
// return
+43 -47
View File
@@ -11,57 +11,56 @@ import (
"go-admin/global/orm"
"go-admin/router"
"go-admin/tools"
config2 "go-admin/tools/config"
"go-admin/tools/config"
"io/ioutil"
"net/http"
"os"
"os/signal"
"time"
)
)
var (
config string
port string
mode string
StartCmd = &cobra.Command{
Use: "server",
Short: "Start API server",
Example: "go-admin server config/settings.yml",
PreRun: func(cmd *cobra.Command, args []string) {
usage()
setup()
},
RunE: func(cmd *cobra.Command, args []string) error {
return run()
},
var (
configYml string
port string
mode string
StartCmd = &cobra.Command{
Use: "server",
Short: "Start API server",
Example: "go-admin server config/settings.yml",
PreRun: func(cmd *cobra.Command, args []string) {
usage()
setup()
},
RunE: func(cmd *cobra.Command, args []string) error {
return run()
},
}
)
func init() {
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(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
}
)
func init() {
StartCmd.PersistentFlags().StringVarP(&config, "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(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
}
func usage() {
usageStr := `starting api server`
log.Printf("%s\n", usageStr)
}
func usage() {
usageStr := `starting api server`
log.Printf("%s\n", usageStr)
}
func setup() {
//1. 读取配置
config2.ConfigSetup(config)
//2. 设置日志
tools.InitLogger()
//3. 初始化数据库链接
database.Setup()
func setup() {
//1. 读取配置
config.ConfigSetup(configYml)
//2. 设置日志
tools.InitLogger()
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
}
func run() error {
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) {
gin.SetMode(gin.ReleaseMode)
@@ -70,31 +69,28 @@ func run() error {
r := router.InitRouter()
defer orm.Eloquent.Close()
if port != "" {
config2.SetConfig(config, "settings.application.port", port)
}
srv := &http.Server{
Addr: config2.ApplicationConfig.Host + ":" + config2.ApplicationConfig.Port,
Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port,
Handler: r,
}
go func() {
// 服务连接
if config2.ApplicationConfig.IsHttps {
if err := srv.ListenAndServeTLS(config2.SslConfig.Pem, config2.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
if config.ApplicationConfig.IsHttps {
if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s \r\n", err)
}
} else {
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")
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 Swagger URL http://127.0.0.1:%s/swagger/index.html \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://%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())
// 等待中断信号以优雅地关闭服务器(设置 5 秒的超时时间)
quit := make(chan os.Signal)
+9 -9
View File
@@ -8,15 +8,15 @@ import (
"go-admin/models"
"go-admin/models/gorm"
"go-admin/tools"
config2 "go-admin/tools/config"
"go-admin/tools/config"
"github.com/spf13/cobra"
)
var (
config string
mode string
StartCmd = &cobra.Command{
configYml string
mode string
StartCmd = &cobra.Command{
Use: "init",
Short: "initialize the database",
Run: func(cmd *cobra.Command, args []string) {
@@ -26,7 +26,7 @@ var (
)
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")
}
@@ -34,11 +34,12 @@ func run() {
usage := `start init`
fmt.Println(usage)
//1. 读取配置
config2.ConfigSetup(config)
config.ConfigSetup(configYml)
//2. 设置日志
tools.InitLogger()
//3. 初始化数据库链接
database.Setup()
database.Setup(config.DatabaseConfig.Driver)
//4. 数据库迁移
_ = migrateModel()
log.Println("数据库结构初始化成功!")
@@ -46,13 +47,12 @@ func run() {
if err := models.InitDb(); err != nil {
log.Fatal("数据库基础数据初始化失败!")
}
usage = `数据库基础数据初始化成功`
fmt.Println(usage)
}
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")
}
return gorm.AutoMigrate(orm.Eloquent)
+5 -7
View File
@@ -18,10 +18,8 @@ settings:
secret: go-admin
timeout: 3600
database:
dbtype: mysql
sqlite:
masterconn: ./sqlite3.db
mysql:
masterconn: user:password@/tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
pgsql:
masterconn: host=myhost port=myport user=gorm dbname=gorm password=mypassword
driver: mysql # mysql,sqlite3, pgsql
dbname: dbname
source: user:password@/tcp(127.0.0.1:3306)/dbname?charset=utf8&parseTime=True&loc=Local
# source: sqlite3.db
# source: host=myhost port=myport user=gorm dbname=gorm password=mypassword
+2 -4
View File
@@ -1,10 +1,8 @@
package database
import "go-admin/tools/config"
func Setup() {
dbType := config.DatabaseConfig.DbType
func Setup(driver string) {
dbType := driver
if dbType == "mysql" {
var db = new(Mysql)
db.Setup()
+1
View File
@@ -3,6 +3,7 @@ package database
import "github.com/jinzhu/gorm"
type Database interface {
Setup()
Open(dbType string, conn string) (db *gorm.DB, err error)
GetConnect() string
}
+21 -24
View File
@@ -8,36 +8,33 @@ import (
"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 {
}
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) {
return gorm.Open(dbType, conn)
}
// 获取数据库连接
func (e *Mysql) GetConnect() string {
return config.DatabaseConfig.Mysql.MasterConn
return config.DatabaseConfig.Source
}
+16 -15
View File
@@ -11,30 +11,20 @@ import (
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() {
var err error
var db Database
db = new(PgSql)
orm.PgSqlConn = db.GetConnect()
log.Info(orm.PgSqlConn)
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.PgSqlConn)
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", config.DatabaseConfig.DbType, err)
log.Fatalf("%s connect error %v", orm.Driver, err)
} else {
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
log.Printf("%s connect success!", orm.Driver)
}
if orm.Eloquent.Error != nil {
@@ -43,3 +33,14 @@ func (e *PgSql) Setup() {
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 {
}
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() {
var err error
var db Database
db = new(SqLite)
orm.SqLiteConn = db.GetConnect()
log.Info(orm.SqLiteConn)
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.SqLiteConn)
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", config.DatabaseConfig.DbType, err)
log.Fatalf("%s connect error %v", orm.Driver, err)
} else {
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
log.Printf("%s connect success!", orm.Driver)
}
if orm.Eloquent.Error != nil {
@@ -41,4 +32,14 @@ func (e *SqLite) Setup() {
}
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
}
+10
View File
@@ -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
View File
@@ -5,7 +5,6 @@ import (
)
var Eloquent *gorm.DB
var MysqlConn string
var SqLiteConn string
var PgSqlConn string
var DbType string
var Source string
var Driver string
var DBName string
+4 -4
View File
@@ -27,9 +27,9 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro
var count int
table := new(gorm.DB)
if config2.DatabaseConfig.DbType == "mysql" {
if config2.DatabaseConfig.Driver == "mysql" {
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 != "" {
return nil, 0, errors.New("table name cannot be empty!")
@@ -51,9 +51,9 @@ func (e *DBColumns) GetList() ([]DBColumns, error) {
var doc []DBColumns
table := new(gorm.DB)
if config2.DatabaseConfig.DbType == "mysql" {
if config2.DatabaseConfig.Driver == "mysql" {
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 == "" {
return nil, errors.New("table name cannot be empty!")
+7 -7
View File
@@ -22,10 +22,10 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
table := new(gorm.DB)
var count int
if config2.DatabaseConfig.DbType == "mysql" {
if config2.DatabaseConfig.Driver == "mysql" {
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_schema= ? ", config2.DatabaseConfig.Mysql.DBName)
table = table.Where("TABLE_NAME not in (select table_name from " + config2.DatabaseConfig.DBName + ".sys_tables) ")
table = table.Where("table_schema= ? ", config2.DatabaseConfig.DBName)
if 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 {
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 = 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) {
var doc DBTables
table := new(gorm.DB)
if config2.DatabaseConfig.DbType == "mysql" {
if config2.DatabaseConfig.Driver == "mysql" {
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 == "" {
return doc, errors.New("table name cannot be empty!")
}
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 = table.Where("type = 'table' ")
+12 -6
View File
@@ -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 == "*")
`
func Casbin() (*casbin.Enforcer, error) {
var CasbinEnforcer *casbin.Enforcer
func init() {
Apter, err := gormAdapter.NewAdapterByDB(orm.Eloquent)
if err != nil {
return nil, err
panic(err)
}
m, err := model.NewModelFromString(text)
if err != nil {
return nil, err
panic(err)
}
e, err := casbin.NewEnforcer(m, Apter)
if err != nil {
return nil, err
panic(err)
}
if err := e.LoadPolicy(); err == nil {
return e, err
CasbinEnforcer = e
}
func Casbin() (*casbin.Enforcer, error) {
if err := CasbinEnforcer.LoadPolicy(); err == nil {
return CasbinEnforcer, err
} else {
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
return nil, err
+6 -65
View File
@@ -3,79 +3,20 @@ package config
import "github.com/spf13/viper"
type Database struct {
DbType string
SqLite *SqLite
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
Driver string
Source string
DBName string
}
func InitDatabase(cfg *viper.Viper) *Database {
dbType := cfg.GetString("dbType")
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
}
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"),
}
}