Merge branch 'develop' into feature/docker-support

This commit is contained in:
rikugun
2020-04-13 14:37:27 +08:00
committed by GitHub
4 changed files with 24 additions and 20 deletions
+20 -16
View File
@@ -1,19 +1,23 @@
package initialize
import (
"fmt"
"gin-vue-admin/global"
"github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/sqlite"
)
// sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
//初始化数据库并产生数据库全局变量
func Sqlite() {
admin := global.GVA_CONFIG.Sqlite
if db, err := gorm.Open("sqlite3", fmt.Sprintf("%s?%s", admin.Path,admin.Config)); err != nil {
global.GVA_LOG.Error("DEFAULT DB数据库启动异常", err)
} else {
global.GVA_DB = db
global.GVA_DB.LogMode(admin.LogMode)
}
}
// 感谢 sqlitet提供者 [rikugun] 作者github: https://github.com/rikugun
//import (
// "fmt"
// "gin-vue-admin/global"
// "github.com/jinzhu/gorm"
// _ "github.com/jinzhu/gorm/dialects/sqlite"
//)
//
////初始化数据库并产生数据库全局变量
//func Sqlite() {
// admin := global.GVA_CONFIG.Sqlite
// if db, err := gorm.Open("sqlite3", fmt.Sprintf("%s?%s", admin.Path,admin.Config)); err != nil {
// global.GVA_LOG.Error("DEFAULTDB数据库启动异常", err)
// } else {
// global.GVA_DB = db
// global.GVA_DB.LogMode(admin.LogMode)
// }
//}
+2 -2
View File
@@ -11,8 +11,8 @@ func main() {
switch global.GVA_CONFIG.System.DbType {
case "mysql":
initialize.Mysql()
case "sqlite":
initialize.Sqlite()
//case "sqlite":
// initialize.Sqlite() // sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
default:
initialize.Mysql()
}