diff --git a/.gitignore b/.gitignore index 22e09bae..70797504 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ temp/ !temp vendor config/settings.dev.yml +go-admin diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..95290124 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +PROJECT:=go-admin + +.PHONY: build +build: + CGO_ENABLED=0 go build -o go-admin main.go +build-sqlite: + go build -tags sqlite3 -o go-admin main.go +#.PHONY: test +#test: +# go test -v ./... -cover + +#.PHONY: docker +#docker: +# docker build . -t go-admin:latest diff --git a/database/mysql.go b/database/mysql.go index 24394d40..7026fb8d 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -5,7 +5,6 @@ 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" @@ -58,9 +57,9 @@ func init() { Eloquent.LogMode(true) if err != nil { - log.Fatalln("%s connect error %v",dbType, err) + log.Fatalln("%s connect error %v", dbType, err) } else { - log.Println("%s connect success!",dbType) + log.Println("%s connect success!", dbType) } if Eloquent.Error != nil { diff --git a/database/sqlite3.go b/database/sqlite3.go new file mode 100644 index 00000000..16835513 --- /dev/null +++ b/database/sqlite3.go @@ -0,0 +1,7 @@ +// +build sqlite3 + +package database + +import ( + _ "github.com/jinzhu/gorm/dialects/sqlite" +)