From a6970e9c674c98b39c0a8d5c86b26ae4b0d85d2e Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Fri, 3 Jul 2020 00:34:54 +0800 Subject: [PATCH] feat: Database type support --- apis/tools/dbtables.go | 11 ++- cmd/migrate/server.go | 2 +- config/db.sql | 3 - config/rbac_model.conf | 11 --- config/settings.yml | 11 +-- database/initialize.go | 9 +- database/mysql.go | 39 +-------- database/pgsql.go | 11 +-- database/sqlite3.go | 10 +-- global/orm/gorm.go | 1 + go.mod | 1 - models/initdb.go | 9 +- models/tools/dbcolumns.go | 35 ++++---- models/tools/dbtables.go | 55 ++++++++---- pkg/casbin/mycasbin.go | 29 +++++-- service/sysuser.go | 170 -------------------------------------- sqlite.db | Bin 4096 -> 163840 bytes sqlite3.db | Bin 163840 -> 163840 bytes tools/config/database.go | 82 +++++++++++++++--- tools/env.go | 2 +- 20 files changed, 190 insertions(+), 301 deletions(-) delete mode 100644 config/rbac_model.conf delete mode 100644 service/sysuser.go diff --git a/apis/tools/dbtables.go b/apis/tools/dbtables.go index 0b6f258..9491afc 100644 --- a/apis/tools/dbtables.go +++ b/apis/tools/dbtables.go @@ -5,7 +5,6 @@ import ( "go-admin/models/tools" tools2 "go-admin/tools" "go-admin/tools/app" - config2 "go-admin/tools/config" "net/http" ) @@ -23,11 +22,11 @@ func GetDBTableList(c *gin.Context) { var err error var pageSize = 10 var pageIndex = 1 - if config2.DatabaseConfig.Dbtype=="sqlite3"{ - res.Msg="对不起,sqlite3 暂不支持代码生成!" - c.JSON(http.StatusOK, res.ReturnError(500)) - return - } + //if config2.DatabaseConfig.DbType=="sqlite3"{ + // res.Msg="对不起,sqlite3 暂不支持代码生成!" + // c.JSON(http.StatusOK, res.ReturnError(500)) + // return + //} if size := c.Request.FormValue("pageSize"); size != "" { pageSize = tools2.StrToInt(err, size) diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index 8cae163..4d012eb 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -52,7 +52,7 @@ func run() { } func migrateModel() error { - if config2.DatabaseConfig.Dbtype == "mysql" { + if config2.DatabaseConfig.DbType == "mysql" { orm.Eloquent = orm.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") } return gorm.AutoMigrate(orm.Eloquent) diff --git a/config/db.sql b/config/db.sql index b96d52b..d13c0a7 100644 --- a/config/db.sql +++ b/config/db.sql @@ -1,6 +1,4 @@ -- 开始初始化数据 ; -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; BEGIN; INSERT INTO `casbin_rule` VALUES ('p', 'Tester', '/api/v1/calendar', 'GET', NULL, NULL, NULL); @@ -661,5 +659,4 @@ INSERT INTO `sys_user` VALUES (3, '李四', '13838385438', 2, '', '', '0', 'qq@q INSERT INTO `sys_user` VALUES (4, '王五', '13535353535', 3, '', '', '2', 'qq@qq.com', 8, 2, '1', '1', '', 0, '2020-04-12 14:06:49', '2020-04-12 14:07:09', NULL, 'wangwu', '$2a$10$3.RT6rpXANXvvlibX6PzU.FGA2CvfDxd1UmJ2H5zTzF4sYocbvsTO'); COMMIT; -SET FOREIGN_KEY_CHECKS = 1; -- 数据完成 ; \ No newline at end of file diff --git a/config/rbac_model.conf b/config/rbac_model.conf deleted file mode 100644 index 32781ee..0000000 --- a/config/rbac_model.conf +++ /dev/null @@ -1,11 +0,0 @@ -[request_definition] -r = sub, obj, act - -[policy_definition] -p = sub, obj, act - -[policy_effect] -e = some(where (p.eft == allow)) - -[matchers] -m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.act == p.act || p.act == "*") \ No newline at end of file diff --git a/config/settings.yml b/config/settings.yml index dc6ade5..1bb78a0 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -18,9 +18,10 @@ settings: secret: go-admin timeout: 3600 database: - name: goadmindb dbtype: mysql - host: 127.0.0.1 - password: 123456 - port: 3306 - username: root + 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 diff --git a/database/initialize.go b/database/initialize.go index 443b521..9d5290f 100644 --- a/database/initialize.go +++ b/database/initialize.go @@ -4,14 +4,19 @@ import "go-admin/tools/config" func Setup() { - dbType := config.DatabaseConfig.Dbtype + dbType := config.DatabaseConfig.DbType if dbType == "mysql" { var db = new(Mysql) db.Setup() } - if dbType == "sqlite" { + if dbType == "sqlite3" { var db = new(SqLite) db.Setup() } + + if dbType == "pgsql" { + var db = new(PgSql) + db.Setup() + } } diff --git a/database/mysql.go b/database/mysql.go index 28856c8..832ec90 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -1,22 +1,11 @@ package database import ( - "bytes" _ "github.com/go-sql-driver/mysql" //加载mysql "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" "go-admin/global/orm" "go-admin/tools/config" - "strconv" -) - -var ( - DbType string - Host string - Port int - Name string - Username string - Password string ) func (e *Mysql) Setup() { @@ -27,12 +16,12 @@ func (e *Mysql) Setup() { db = new(Mysql) orm.MysqlConn = db.GetConnect() log.Info(orm.MysqlConn) - orm.Eloquent, err = db.Open(DbType, orm.MysqlConn) + orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.MysqlConn) if err != nil { - log.Fatalf("%s connect error %v", DbType, err) + log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err) } else { - log.Printf("%s connect success!", DbType) + log.Printf("%s connect success!", config.DatabaseConfig.DbType) } if orm.Eloquent.Error != nil { @@ -50,25 +39,5 @@ func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) { } func (e *Mysql) GetConnect() string { - - DbType = config.DatabaseConfig.Dbtype - Host = config.DatabaseConfig.Host - Port = config.DatabaseConfig.Port - Name = config.DatabaseConfig.Name - Username = config.DatabaseConfig.Username - Password = config.DatabaseConfig.Password - - var conn bytes.Buffer - conn.WriteString(Username) - conn.WriteString(":") - conn.WriteString(Password) - conn.WriteString("@tcp(") - conn.WriteString(Host) - conn.WriteString(":") - conn.WriteString(strconv.Itoa(Port)) - conn.WriteString(")") - conn.WriteString("/") - conn.WriteString(Name) - conn.WriteString("?charset=utf8&parseTime=True&loc=Local&timeout=1000ms") - return conn.String() + return config.DatabaseConfig.Mysql.MasterConn } diff --git a/database/pgsql.go b/database/pgsql.go index 3c6d4e1..896dd3f 100644 --- a/database/pgsql.go +++ b/database/pgsql.go @@ -5,6 +5,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" log "github.com/sirupsen/logrus" "go-admin/global/orm" + "go-admin/tools/config" ) type PgSql struct { @@ -17,7 +18,7 @@ func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) { func (e *PgSql) GetConnect() string { - return "" + return config.DatabaseConfig.PgSql.MasterConn } func (e *PgSql) Setup() { @@ -28,12 +29,12 @@ func (e *PgSql) Setup() { db = new(PgSql) orm.PgSqlConn = db.GetConnect() log.Info(orm.PgSqlConn) - orm.Eloquent, err = db.Open(DbType, orm.PgSqlConn) + orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.PgSqlConn) if err != nil { - log.Fatalf("%s connect error %v", DbType, err) + log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err) } else { - log.Printf("%s connect success!", DbType) + log.Printf("%s connect success!", config.DatabaseConfig.DbType) } if orm.Eloquent.Error != nil { @@ -41,4 +42,4 @@ func (e *PgSql) Setup() { } orm.Eloquent.LogMode(true) -} \ No newline at end of file +} diff --git a/database/sqlite3.go b/database/sqlite3.go index bc3781e..afe99f7 100644 --- a/database/sqlite3.go +++ b/database/sqlite3.go @@ -5,6 +5,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" log "github.com/sirupsen/logrus" "go-admin/global/orm" + "go-admin/tools/config" ) type SqLite struct { @@ -16,8 +17,7 @@ func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) { } func (e *SqLite) GetConnect() string { - - return "" + return config.DatabaseConfig.SqLite.MasterConn } func (e *SqLite) Setup() { @@ -28,12 +28,12 @@ func (e *SqLite) Setup() { db = new(SqLite) orm.SqLiteConn = db.GetConnect() log.Info(orm.SqLiteConn) - orm.Eloquent, err = db.Open(DbType, orm.SqLiteConn) + orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.SqLiteConn) if err != nil { - log.Fatalf("%s connect error %v", DbType, err) + log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err) } else { - log.Printf("%s connect success!", DbType) + log.Printf("%s connect success!", config.DatabaseConfig.DbType) } if orm.Eloquent.Error != nil { diff --git a/global/orm/gorm.go b/global/orm/gorm.go index 2428a65..c81db37 100644 --- a/global/orm/gorm.go +++ b/global/orm/gorm.go @@ -8,3 +8,4 @@ var Eloquent *gorm.DB var MysqlConn string var SqLiteConn string var PgSqlConn string +var DbType string diff --git a/go.mod b/go.mod index 2dc7224..0772f62 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/casbin/gorm-adapter/v2 v2.0.3 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.4.0 - github.com/go-kit/kit v0.8.0 github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-openapi/spec v0.19.7 // indirect github.com/go-openapi/swag v0.19.8 // indirect diff --git a/models/initdb.go b/models/initdb.go index 88d403c..07ad02a 100644 --- a/models/initdb.go +++ b/models/initdb.go @@ -3,17 +3,16 @@ package models import ( "fmt" "go-admin/global/orm" - config2 "go-admin/tools/config" "io/ioutil" "strings" ) func InitDb() error { filePath := "config/db.sql" - if config2.DatabaseConfig.Dbtype == "sqlite3" { - fmt.Println("sqlite3数据库无需初始化!") - return nil - } + //if config2.DatabaseConfig.DbType == "sqlite" { + // fmt.Println("sqlite3数据库无需初始化!") + // return nil + //} sql, err := Ioutil(filePath) if err != nil { fmt.Println("数据库基础数据初始化脚本读取失败!原因:", err.Error()) diff --git a/models/tools/dbcolumns.go b/models/tools/dbcolumns.go index de95e46..a088267 100644 --- a/models/tools/dbcolumns.go +++ b/models/tools/dbcolumns.go @@ -2,6 +2,7 @@ package tools import ( "errors" + "github.com/jinzhu/gorm" "go-admin/global/orm" config2 "go-admin/tools/config" ) @@ -23,37 +24,43 @@ type DBColumns struct { func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) { var doc []DBColumns + var count int + table := new(gorm.DB) - table := orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`") - table = table.Where("table_schema= ? ", config2.DatabaseConfig.Name) + if config2.DatabaseConfig.DbType == "mysql" { + table = orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`") + table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName) - if e.TableName != "" { - return nil, 0, errors.New("table name cannot be empty!") + if e.TableName != "" { + return nil, 0, errors.New("table name cannot be empty!") + } + + table = table.Where("TABLE_NAME = ?", e.TableName) } - table = table.Where("TABLE_NAME = ?", e.TableName) - - var count int if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } table.Count(&count) return doc, count, nil + } func (e *DBColumns) GetList() ([]DBColumns, error) { var doc []DBColumns + table := new(gorm.DB) - table := orm.Eloquent.Select("*").Table("information_schema.columns") - table = table.Where("table_schema= ? ", config2.DatabaseConfig.Name) + if config2.DatabaseConfig.DbType == "mysql" { + table = orm.Eloquent.Select("*").Table("information_schema.columns") + table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.DBName) - if e.TableName == "" { - return nil, errors.New("table name cannot be empty!") + if e.TableName == "" { + return nil, errors.New("table name cannot be empty!") + } + + table = table.Where("TABLE_NAME = ?", e.TableName) } - - table = table.Where("TABLE_NAME = ?", e.TableName) - if err := table.Find(&doc).Error; err != nil { return doc, err } diff --git a/models/tools/dbtables.go b/models/tools/dbtables.go index aaf7cee..94bf4bc 100644 --- a/models/tools/dbtables.go +++ b/models/tools/dbtables.go @@ -2,6 +2,7 @@ package tools import ( "errors" + "github.com/jinzhu/gorm" "go-admin/global/orm" config2 "go-admin/tools/config" ) @@ -18,34 +19,54 @@ type DBTables struct { func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) { var doc []DBTables - - table := orm.Eloquent.Select("*").Table("information_schema.tables") - table = table.Where("TABLE_NAME not in (select table_name from "+config2.DatabaseConfig.Name+".sys_tables) ") - table = table.Where("table_schema= ? ", config2.DatabaseConfig.Name) - - if e.TableName != "" { - table = table.Where("TABLE_NAME = ?", e.TableName) - } - + table := new(gorm.DB) var count int - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { - return nil, 0, err + if config2.DatabaseConfig.DbType == "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) + + if e.TableName != "" { + table = table.Where("TABLE_NAME = ?", e.TableName) + } + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + return nil, 0, err + } + } else if config2.DatabaseConfig.DbType == "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' ") + + if e.TableName != "" { + table = table.Where("name = ?", e.TableName) + } + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + return nil, 0, err + } } + table.Count(&count) return doc, count, nil } func (e *DBTables) Get() (DBTables, error) { var doc DBTables + table := new(gorm.DB) + if config2.DatabaseConfig.DbType == "mysql" { + table = orm.Eloquent.Select("*").Table("information_schema.tables") + table = table.Where("table_schema= ? ", config2.DatabaseConfig.Mysql.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" { + 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 := orm.Eloquent.Select("*").Table("information_schema.tables") - table = table.Where("table_schema= ? ", config2.DatabaseConfig.Name) - if e.TableName == "" { - return doc, errors.New("table name cannot be empty!") + if e.TableName != "" { + table = table.Where("name = ?", e.TableName) + } } - table = table.Where("TABLE_NAME = ?", e.TableName) - if err := table.First(&doc).Error; err != nil { return doc, err } diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go index 9db87b5..21e5070 100644 --- a/pkg/casbin/mycasbin.go +++ b/pkg/casbin/mycasbin.go @@ -2,23 +2,38 @@ package mycasbin import ( "github.com/casbin/casbin/v2" - gormadapter "github.com/casbin/gorm-adapter/v2" - "github.com/go-kit/kit/endpoint" + "github.com/casbin/casbin/v2/model" + gormAdapter "github.com/casbin/gorm-adapter/v2" _ "github.com/go-sql-driver/mysql" log "github.com/sirupsen/logrus" "go-admin/global/orm" - "go-admin/tools/config" ) -var Em endpoint.Middleware +// Initialize the model from a string. +var text = ` +[request_definition] +r = sub, obj, act + +[policy_definition] +p = sub, obj, act + +[policy_effect] +e = some(where (p.eft == allow)) + +[matchers] +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) { - conn := orm.MysqlConn - Apter, err := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true) + Apter, err := gormAdapter.NewAdapterByDB(orm.Eloquent) if err != nil { return nil, err } - e, err := casbin.NewEnforcer("config/rbac_model.conf", Apter) + m, err := model.NewModelFromString(text) + if err != nil { + return nil, err + } + e, err := casbin.NewEnforcer(m, Apter) if err != nil { return nil, err } diff --git a/service/sysuser.go b/service/sysuser.go deleted file mode 100644 index 1740c93..0000000 --- a/service/sysuser.go +++ /dev/null @@ -1,170 +0,0 @@ -package service - -import ( - "errors" - log "github.com/sirupsen/logrus" - "go-admin/global/orm" - . "go-admin/models" - "go-admin/tools" - "golang.org/x/crypto/bcrypt" - "strings" -) - - -// 获取用户数据 -func (e *SysUser) Get() (SysUserView SysUserView, err error) { - - table := orm.Eloquent.Table(e.TableName()).Select([]string{"sys_user.*", "sys_role.role_name"}) - table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") - if e.UserId != 0 { - table = table.Where("user_id = ?", e.UserId) - } - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - - if e.Password != "" { - table = table.Where("password = ?", e.Password) - } - - if e.RoleId != 0 { - table = table.Where("role_id = ?", e.RoleId) - } - - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - - if err = table.First(&SysUserView).Error; err != nil { - return - } - SysUserView.Password = "" - return -} - -func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) { - var doc []SysUserPage - table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName()) - table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id") - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - if e.Status != "" { - table = table.Where("sys_user.status = ?", e.Status) - } - - if e.Phone != "" { - table = table.Where("sys_user.phone = ?", e.Phone) - } - - if e.DeptId != 0 { - table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+tools.IntToString(e.DeptId)+"%") - } - - // 数据权限控制 - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - table, err := dataPermission.GetDataScope("sys_user", table) - if err != nil { - return nil, 0, err - } - var count int - - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { - return nil, 0, err - } - table.Where("sys_user.deleted_at IS NULL").Count(&count) - return doc, count, nil -} - -//加密 -func (e *SysUser) Encrypt() (err error) { - if e.Password == "" { - return - } - - var hash []byte - if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil { - return - } else { - e.Password = string(hash) - return - } -} - -//添加 -func (e SysUser) Insert() (id int, err error) { - if err = e.Encrypt(); err != nil { - return - } - - // check 用户名 - var count int - orm.Eloquent.Table(e.TableName()).Where("username = ?", e.Username).Count(&count) - if count > 0 { - err = errors.New("账户已存在!") - return - } - - //添加数据 - if err = orm.Eloquent.Table(e.TableName()).Create(&e).Error; err != nil { - return - } - id = e.UserId - return -} - -//修改 -func (e *SysUser) Update(id int) (update SysUser, err error) { - if e.Password!="" { - if err = e.Encrypt(); err != nil { - return - } - } - if err = orm.Eloquent.Table(e.TableName()).First(&update, id).Error; err != nil { - return - } - if e.RoleId == 0 { - e.RoleId = update.RoleId - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - return -} - -func (e *SysUser) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("user_id in (?)", id).Delete(&SysUser{}).Error; err != nil { - return - } - Result = true - return -} - -func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) { - user, err := e.Get() - if err != nil { - tools.HasError(err, "获取用户数据失败(代码202)", 500) - } - _, err = tools.CompareHashAndPassword(user.Password, pwd.OldPassword) - if err != nil { - if strings.Contains(err.Error(), "hashedPassword is not the hash of the given password") { - tools.HasError(err, "密码错误(代码202)", 500) - } - log.Print(err) - return - } - e.Password = pwd.NewPassword - _, err = e.Update(e.UserId) - tools.HasError(err, "更新密码失败(代码202)", 500) - return -} diff --git a/sqlite.db b/sqlite.db index 52d3a438d075b3182d0997bed1387b5ce2e91d49..994fe62149b7fdff6bb5676932c8ee9fda5bdea4 100644 GIT binary patch literal 163840 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 delta 29 jcmZo@;A&8qAkE6iz`(#b(LjIV0s$af&-&vgg*p5HXif)f diff --git a/sqlite3.db b/sqlite3.db index e94506a5d9a399f051f216866badc22f86965869..029ba3bfbfd2f734385eeaaebfe204f3cbe930ec 100644 GIT binary patch literal 163840 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 Y1V8`;KmY_l00ck)1V8`;{!a+}H^$>lrvLx| delta 286 zcmZo@;A&{#njkHx&A`B*0mO_E&0#Iisv1H_y_%mKs-Kr9W! zQa~&U#3De<3dGDnECj^DK+F%s0zfPd#9}}!3B(dWEC|GWK+FxqDnJaf6Xbby28OL| HOjY#&fkQTf diff --git a/tools/config/database.go b/tools/config/database.go index 87f341d..491dfe9 100644 --- a/tools/config/database.go +++ b/tools/config/database.go @@ -3,23 +3,79 @@ package config import "github.com/spf13/viper" type Database struct { - Dbtype string - Host string - Port int - Name string - Username string - Password string + 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 } func InitDatabase(cfg *viper.Viper) *Database { - return &Database{ - Port: cfg.GetInt("port"), - Dbtype: cfg.GetString("dbType"), - Host: cfg.GetString("host"), - Name: cfg.GetString("name"), - Username: cfg.GetString("username"), - Password: cfg.GetString("password"), + + dbType := cfg.GetString("dbType") + + db := &Database{ + DbType: cfg.GetString("dbType"), } + + 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"), + } +} diff --git a/tools/env.go b/tools/env.go index 9cb337b..def4f64 100644 --- a/tools/env.go +++ b/tools/env.go @@ -9,5 +9,5 @@ const ( ModeTest Mode = "test" //测试模式 ModeProd Mode = "prod" //生产模式 Mysql = "mysql" //mysql数据库标识 - Sqlite = "sqlite" //sqlite + Sqlite = "sqlite3" //sqlite )