From c9312a6ee6c729b07a973c0e6e49e1e549d71623 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 6 Apr 2020 14:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20sqlite3=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/tools/dbtables.go | 9 ++++++++- database/mysql.go | 15 ++++++++++----- models/initdb.go | 8 +++++++- pkg/casbin/mycasbin.go | 4 ++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/apis/tools/dbtables.go b/apis/tools/dbtables.go index 5a6976a..dd0bcd4 100644 --- a/apis/tools/dbtables.go +++ b/apis/tools/dbtables.go @@ -2,6 +2,7 @@ package tools import ( "github.com/gin-gonic/gin" + "go-admin/config" "go-admin/models" "go-admin/models/tools" "go-admin/pkg" @@ -17,10 +18,16 @@ import ( // @Success 200 {object} models.Response "{"code": 200, "data": [...]}" // @Router /api/v1/db/tables/page [get] func GetDBTableList(c *gin.Context) { + var res models.Response var data tools.DBTables var err error var pageSize = 10 var pageIndex = 1 + if config.DatabaseConfig.Dbtype=="sqlite3"{ + res.Msg="对不起,sqlite3 暂不支持代码生成!" + c.JSON(http.StatusOK, res.ReturnError(500)) + return + } if size := c.Request.FormValue("pageSize"); size != "" { pageSize = pkg.StrToInt(err, size) @@ -40,7 +47,7 @@ func GetDBTableList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) diff --git a/database/mysql.go b/database/mysql.go index 11880b1..3309b5d 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -5,6 +5,7 @@ import ( "fmt" _ "github.com/go-sql-driver/mysql" //加载mysql "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/sqlite" config2 "go-admin/config" "log" "strconv" @@ -21,7 +22,7 @@ func init() { username := config2.DatabaseConfig.Username password := config2.DatabaseConfig.Password - if dbType != "mysql" { + if dbType != "mysql" && dbType != "sqlite3" { fmt.Println("db type unknow") } var err error @@ -44,17 +45,21 @@ func init() { var db Database if dbType == "mysql" { db = new(Mysql) + Eloquent, err = db.Open(dbType, conn.String()) + + } else if dbType == "sqlite3" { + db = new(SqlLite) + Eloquent, err = db.Open(dbType, host) + } else { panic("db type unknow") } - Eloquent, err = db.Open(dbType, conn.String()) Eloquent.LogMode(true) - if err != nil { - log.Fatalln("mysql connect error %v", err) + log.Fatalln("%s connect error %v",dbType, err) } else { - log.Println("mysql connect success!") + log.Println("%s connect success!",dbType) } if Eloquent.Error != nil { diff --git a/models/initdb.go b/models/initdb.go index d2cea6c..ade0277 100644 --- a/models/initdb.go +++ b/models/initdb.go @@ -2,13 +2,19 @@ package models import ( "fmt" + "go-admin/config" orm "go-admin/database" "io/ioutil" "strings" ) func InitDb() error { - sql, err := Ioutil("config/db.sql") + filePath := "config/db.sql" + if config.DatabaseConfig.Dbtype == "sqlite3" { + fmt.Println("sqlite3数据库无需初始化!") + return nil + } + sql, err := Ioutil(filePath) if err != nil { fmt.Println("数据库初始化脚本读取失败!原因:", err.Error()) return err diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go index c405970..59ab2b7 100644 --- a/pkg/casbin/mycasbin.go +++ b/pkg/casbin/mycasbin.go @@ -28,7 +28,11 @@ func init() { func Casbin() (*casbin.Enforcer, error) { conn := config.DatabaseConfig.Username + ":" + config.DatabaseConfig.Password + "@tcp(" + config.DatabaseConfig.Host + ":" + utils.IntToString(config.DatabaseConfig.Port) + ")/" + config.DatabaseConfig.Database + if config.DatabaseConfig.Dbtype == "sqlite3" { + conn = config.DatabaseConfig.Host + } Apter, _ := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true) + e, _ := casbin.NewEnforcer("config/rbac_model.conf", Apter) if err := e.LoadPolicy(); err == nil {