update cli

Author: cg33

.gitignore

@@ -12,4 +12,5 @@ vendor/**
 !vendor/vendor.json
 logs
 go.sum
-modules/db/go.sum
+modules/db/go.sum
+admincli/build

admincli/Makefile

@@ -0,0 +1,16 @@
+GOCMD=go
+GOBUILD=$(GOCMD) build
+BINARY_NAME=admincli
+VERSION=v0.2.4
+
+all:
+	GO111MODULE=on $(GOBUILD) -o ./build/mac/$(BINARY_NAME)
+	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -o ./build/linux/x86_64/$(BINARY_NAME)
+	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm $(GOBUILD) -o ./build/linux/armel/$(BINARY_NAME)
+	GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GOBUILD) -o ./build/windows/x86_64/$(BINARY_NAME).exe
+	GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GOBUILD) -o ./build/windows/i386/$(BINARY_NAME).exe
+	zip -q build/linux/armel/admincli_linux_armel_$(VERSION).zip build/linux/armel/admincli
+	zip -q build/linux/x86_64/admincli_linux_x86_64_$(VERSION).zip build/linux/x86_64/admincli
+	zip -q build/windows/x86_64/admincli_windows_x86_64_$(VERSION).zip build/windows/x86_64/admincli.exe
+	zip -q build/windows/i386/admincli_windows_i386_$(VERSION).zip build/windows/i386/admincli.exe
+	zip -q build/mac/admincli_darwin_x86_64_$(VERSION).zip build/mac/admincli

admincli/cli.go

@@ -7,6 +7,7 @@ package main
 import (
 	"fmt"
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/AlecAivazis/survey/v2/core"
 	"github.com/chenhg5/go-admin/modules/config"
 	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -113,15 +114,15 @@ func generating() {
 
 	err := survey.Ask(qs, &result)
 	checkError(err)
-	driver := result["driver"].(string)
+	driver := result["driver"].(core.OptionAnswer)
 
 	var (
 		cfg  map[string]config.Database
 		name string
-		conn = db.GetConnectionByDriver(driver)
+		conn = db.GetConnectionByDriver(driver.Value)
 	)
 
-	if driver != "sqlite" {
+	if driver.Value != "sqlite" {
 		host := promptWithDefault("sql address", "127.0.0.1")
 		port := promptWithDefault("sql port", "3306")
 		user := promptWithDefault("sql username", "root")
@@ -142,7 +143,7 @@ func generating() {
 				Name:       name,
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     driver,
+				Driver:     driver.Value,
 				File:       "",
 			},
 		}
@@ -157,7 +158,7 @@ func generating() {
 		}
 		cfg = map[string]config.Database{
 			"default": {
-				Driver: driver,
+				Driver: driver.Value,
 				File:   file,
 			},
 		}
@@ -169,7 +170,7 @@ func generating() {
 	// step 2. show tables
 	tableModels, _ := db.WithDriver(conn.GetName()).ShowTables()
 
-	tables := getTablesFromSqlResult(tableModels, driver, name)
+	tables := getTablesFromSqlResult(tableModels, driver.Value, name)
 	if len(tables) == 0 {
 		exitWithError(`no tables, you should build a table of your own business first.
 
@@ -191,7 +192,7 @@ see: http://www.go-admin.cn/en/docs/#/plugins/admin`)
 
 	fieldField := "Field"
 	typeField := "Type"
-	if driver == "postgresql" {
+	if driver.Value == "postgresql" {
 		fieldField = "column_name"
 		typeField = "udt_name"
 	}
@@ -200,7 +201,7 @@ see: http://www.go-admin.cn/en/docs/#/plugins/admin`)
 	for i := 0; i < len(chooseTables); i++ {
 		_ = bar.Add(1)
 		time.Sleep(10 * time.Millisecond)
-		generateFile(chooseTables[i], conn, fieldField, typeField, packageName, driver, outputPath)
+		generateFile(chooseTables[i], conn, fieldField, typeField, packageName, driver.Value, outputPath)
 	}
 	generateTables(outputPath, chooseTables, packageName)
 

go.mod

@@ -5,14 +5,14 @@ go 1.12
 require (
 	cloud.google.com/go v0.37.4 // indirect
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
-	github.com/AlecAivazis/survey/v2 v2.0.4 // indirect
+	github.com/AlecAivazis/survey/v2 v2.0.4
 	github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e
 	github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b // indirect
 	github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f
-	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
+	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect
-	github.com/jawher/mow.cli v1.1.0 // indirect
+	github.com/jawher/mow.cli v1.1.0
 	github.com/juju/loggo v0.0.0-20190212223446-d976af380377 // indirect
 	github.com/juju/testing v0.0.0-20190418112600-6570bd8f8541 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
@@ -22,7 +22,7 @@ require (
 	github.com/lib/pq v1.2.0
 	github.com/mattn/go-sqlite3 v1.11.0
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
-	github.com/schollz/progressbar v1.0.0 // indirect
+	github.com/schollz/progressbar v1.0.0
 	github.com/schollz/progressbar/v2 v2.13.0 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect

modules/system/version.go

@@ -1,3 +1,3 @@
 package system
 
-const Version = "v0.2.3"
+const Version = "v0.2.4"