添加 sqlite3的支持
This commit is contained in:
1 parent
e6662a84e6
commit
c9312a6ee6
4 files changed
+29
-7
No files matched your search
@@ -2,6 +2,7 @@ package tools
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"go-admin/config"
|
||||||
"go-admin/models"
|
"go-admin/models"
|
||||||
"go-admin/models/tools"
|
"go-admin/models/tools"
|
||||||
"go-admin/pkg"
|
"go-admin/pkg"
|
||||||
@@ -17,10 +18,16 @@ import (
|
|||||||
// @Success 200 {object} models.Response "{"code": 200, "data": [...]}"
|
// @Success 200 {object} models.Response "{"code": 200, "data": [...]}"
|
||||||
// @Router /api/v1/db/tables/page [get]
|
// @Router /api/v1/db/tables/page [get]
|
||||||
func GetDBTableList(c *gin.Context) {
|
func GetDBTableList(c *gin.Context) {
|
||||||
|
var res models.Response
|
||||||
var data tools.DBTables
|
var data tools.DBTables
|
||||||
var err error
|
var err error
|
||||||
var pageSize = 10
|
var pageSize = 10
|
||||||
var pageIndex = 1
|
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 != "" {
|
if size := c.Request.FormValue("pageSize"); size != "" {
|
||||||
pageSize = pkg.StrToInt(err, size)
|
pageSize = pkg.StrToInt(err, size)
|
||||||
@@ -40,7 +47,7 @@ func GetDBTableList(c *gin.Context) {
|
|||||||
mp["pageIndex"] = pageIndex
|
mp["pageIndex"] = pageIndex
|
||||||
mp["pageSize"] = pageSize
|
mp["pageSize"] = pageSize
|
||||||
|
|
||||||
var res models.Response
|
|
||||||
res.Data = mp
|
res.Data = mp
|
||||||
|
|
||||||
c.JSON(http.StatusOK, res.ReturnOK())
|
c.JSON(http.StatusOK, res.ReturnOK())
|
||||||
|
|||||||
+10
-5
@@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||||
"github.com/jinzhu/gorm"
|
"github.com/jinzhu/gorm"
|
||||||
|
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||||
config2 "go-admin/config"
|
config2 "go-admin/config"
|
||||||
"log"
|
"log"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -21,7 +22,7 @@ func init() {
|
|||||||
username := config2.DatabaseConfig.Username
|
username := config2.DatabaseConfig.Username
|
||||||
password := config2.DatabaseConfig.Password
|
password := config2.DatabaseConfig.Password
|
||||||
|
|
||||||
if dbType != "mysql" {
|
if dbType != "mysql" && dbType != "sqlite3" {
|
||||||
fmt.Println("db type unknow")
|
fmt.Println("db type unknow")
|
||||||
}
|
}
|
||||||
var err error
|
var err error
|
||||||
@@ -44,17 +45,21 @@ func init() {
|
|||||||
var db Database
|
var db Database
|
||||||
if dbType == "mysql" {
|
if dbType == "mysql" {
|
||||||
db = new(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 {
|
} else {
|
||||||
panic("db type unknow")
|
panic("db type unknow")
|
||||||
}
|
}
|
||||||
|
|
||||||
Eloquent, err = db.Open(dbType, conn.String())
|
|
||||||
Eloquent.LogMode(true)
|
Eloquent.LogMode(true)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln("mysql connect error %v", err)
|
log.Fatalln("%s connect error %v",dbType, err)
|
||||||
} else {
|
} else {
|
||||||
log.Println("mysql connect success!")
|
log.Println("%s connect success!",dbType)
|
||||||
}
|
}
|
||||||
|
|
||||||
if Eloquent.Error != nil {
|
if Eloquent.Error != nil {
|
||||||
|
|||||||
+7
-1
@@ -2,13 +2,19 @@ package models
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"go-admin/config"
|
||||||
orm "go-admin/database"
|
orm "go-admin/database"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
func InitDb() error {
|
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 {
|
if err != nil {
|
||||||
fmt.Println("数据库初始化脚本读取失败!原因:", err.Error())
|
fmt.Println("数据库初始化脚本读取失败!原因:", err.Error())
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -28,7 +28,11 @@ func init() {
|
|||||||
|
|
||||||
func Casbin() (*casbin.Enforcer, error) {
|
func Casbin() (*casbin.Enforcer, error) {
|
||||||
conn := config.DatabaseConfig.Username + ":" + config.DatabaseConfig.Password + "@tcp(" + config.DatabaseConfig.Host + ":" + utils.IntToString(config.DatabaseConfig.Port) + ")/" + config.DatabaseConfig.Database
|
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)
|
Apter, _ := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true)
|
||||||
|
|
||||||
e, _ := casbin.NewEnforcer("config/rbac_model.conf", Apter)
|
e, _ := casbin.NewEnforcer("config/rbac_model.conf", Apter)
|
||||||
|
|
||||||
if err := e.LoadPolicy(); err == nil {
|
if err := e.LoadPolicy(); err == nil {
|
||||||
|
|||||||
Reference in new issue
Block a user