fixed cli bug

Author: cg33

admincli/Makefile

@@ -1,14 +1,20 @@
 GOCMD=go
 GOBUILD=$(GOCMD) build
 BINARY_NAME=admincli
-VERSION=v0.2.4
+LASTVERSION=v0.2.4
+VERSION=v0.2.5
 
 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
+	rm -rf build/linux/armel/admincli_linux_armel_$(LASTVERSION).zip
+	rm -rf build/linux/x86_64/admincli_linux_x86_64_$(LASTVERSION).zip
+	rm -rf build/windows/x86_64/admincli_windows_x86_64_$(LASTVERSION).zip
+	rm -rf build/windows/i386/admincli_windows_i386_$(LASTVERSION).zip
+	rm -rf build/mac/admincli_darwin_x86_64_$(LASTVERSION).zip
 	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

admincli/cli.go

@@ -405,6 +405,7 @@ func generateFile(table string, conn db.Connection, fieldField, typeField, packa
 	content := `package ` + packageName + `
 
 import (
+	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/table"
 	"github.com/chenhg5/go-admin/template/types"	
 	"github.com/chenhg5/go-admin/template/types/form"
@@ -501,7 +502,7 @@ var Generators = map[string]table.Generator{` + tableStr + `
 }
 
 func getType(typeName string) string {
-	r, _ := regexp.Compile(`\\(.*\\)`)
+	r, _ := regexp.Compile(`\(.*?\)`)
 	typeName = r.ReplaceAllString(typeName, "")
 	return strings.Title(strings.Replace(typeName, " unsigned", "", -1))
 }

admincli/cli_test.go

@@ -13,3 +13,7 @@ func TestGetLatestVersion(t *testing.T) {
 func TestCompareVersion(t *testing.T) {
 	fmt.Println(isRequireUpdate(system.Version, getLatestVersion()))
 }
+
+func TestGetType(t *testing.T) {
+	fmt.Println(getType("int(3434)"))
+}

modules/menu/menu.go

@@ -39,7 +39,7 @@ func (menu *Menu) AddMaxOrder() {
 
 func (menu *Menu) SetActiveClass(path string) *Menu {
 
-	reg, _ := regexp.Compile(`\\\?(.*)`)
+	reg, _ := regexp.Compile(`\?(.*)`)
 	path = reg.ReplaceAllString(path, "")
 
 	for i := 0; i < len(menu.List); i++ {

modules/system/version.go

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

plugins/admin/controller/handler.go

@@ -96,9 +96,9 @@ func setFormWithReturnErrMessage(ctx *context.Context, errMsg string, kind strin
 			SetTitle(template2.HTML(strings.Title(kind))).
 			SetPrimaryKey(panel.GetPrimaryKey().Name).
 			SetPrefix(config.PrefixFixSlash()).
-			SetUrl(config.Url("/" + kind + "/" + prefix)).
+			SetUrl(config.Url("/"+kind+"/"+prefix)).
 			SetToken(auth.TokenHelper.AddToken()).
-			SetInfoUrl(config.Url("/info/" + prefix + queryParam)).
+			SetInfoUrl(config.Url("/info/"+prefix+queryParam)).
 			GetContent(),
 		Description: description,
 		Title:       title,