diff --git a/.gitignore b/.gitignore index 22e09ba..7079750 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 0000000..9529012 --- /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 23f31a2..cfed606 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -4,8 +4,8 @@ import ( "bytes" _ "github.com/go-sql-driver/mysql" //加载mysql "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/sqlite" - "go-admin/tools/config" + config2 "go-admin/config" + "log" "strconv" ) @@ -52,7 +52,9 @@ func Setup() { panic("db type unknow") } 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) diff --git a/database/sqlite3.go b/database/sqlite3.go new file mode 100644 index 0000000..1683551 --- /dev/null +++ b/database/sqlite3.go @@ -0,0 +1,7 @@ +// +build sqlite3 + +package database + +import ( + _ "github.com/jinzhu/gorm/dialects/sqlite" +)