Merge pull request #1 from zouchangfu/update_license

chmore: Update license

Author: qicz

README.md

@@ -5,7 +5,7 @@
 使用命令安装：
 
 ```
-go get github.com/xfali/gobatis-cmd/cmd/gobatis-cmd
+go get github.com/acmestack/gobatis-cmd/cmd/gobatis-cmd
 ```
 
 ## 使用
@@ -20,7 +20,7 @@ gobatis-cmd -f configs/gobatis-conf.json
   "package": "test",
   "namespace": "test",
   "modelFile": "test_model.go",
-  "tagName": "xfield",
+  "tagName": "column",
   "mapperFile": "xml",
   "plugin": "",
   "keyword": false,
@@ -48,15 +48,15 @@ gobatis-cmd -driver=mysql -host=localhost -port=3306 -user=test -pw=test -db=tes
   -path string
         保存生成文件的路径
   -pkg string
-        生成文件的包名 (default "xfali/gobatis/default")
+        生成文件的包名 (default "acmestack/gobatis/default")
   -port int
         数据库的端口号  (default 3306)
   -pw string
         数据库的密码
   -table string
         指定生成的table名称
   -tag string
-        生成Model的tag名称,多tag用逗号分隔，如"json,xml" (default "xfield")
+        生成Model的tag名称,多tag用逗号分隔，如"json,xml" (default "column")
   -user string
         数据库的用户名
   -mapper string
@@ -82,16 +82,16 @@ gobatis-cmd -driver=mysql -host=localhost -port=3306 -user=test -pw=test -db=tes
 package test
 
 import (
-	"github.com/xfali/gobatis"
+	"github.com/acmestack/gobatis"
 	"time"
 )
 
 type TestTable struct {
-	//TableName gobatis.ModelName `test_table`
-	Id         int       `xfield:"id"`
-	Username   string    `xfield:"username"`
-	Password   string    `xfield:"password"`
-	Createtime time.Time `xfield:"createtime"`
+	//TableName gobatis.TableName `test_table`
+	Id         int       `column:"id"`
+	Username   string    `column:"username"`
+	Password   string    `column:"password"`
+	Createtime time.Time `column:"createtime"`
 }
 
 func (m *TestTable) Select(sess *gobatis.Session) ([]TestTable, error) {
@@ -204,7 +204,7 @@ func (m *TestTable) Delete(sess *gobatis.Session) (int64, error) {
 package test
 
 import (
-    "github.com/xfali/gobatis"
+    "github.com/acmestack/gobatis"
 )
 
 func init() {
@@ -326,7 +326,7 @@ fmt.Println(ret)
 ```
 事务:
 
-使用gobatis的session.Tx() 参考[gobatis](https://github.com/xfali/gobatis)
+使用gobatis的session.Tx() 参考[gobatis](https://github.com/acmestack/gobatis)
 
 ## 其他
 

api/README.md

@@ -1,122 +1,131 @@
-/**
- * Copyright (C) 2019, Xiongfa Li.
- * All right reserved.
- * @author xiongfa.li
- * @version V1.0
- * Description:
+/*
+ * Copyright (c) 2022, AcmeStack
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package main
 
 import (
-    "encoding/json"
-    "flag"
-    "fmt"
-    "github.com/xfali/gobatis-cmd/pkg/config"
-    "github.com/xfali/gobatis-cmd/pkg/db"
-    "github.com/xfali/gobatis-cmd/pkg/generator"
-    "github.com/xfali/gobatis-cmd/pkg/io"
-    "io/ioutil"
-    "log"
-    "os"
-    "strings"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"github.com/acmestack/gobatis-cmd/pkg/config"
+	"github.com/acmestack/gobatis-cmd/pkg/db"
+	"github.com/acmestack/gobatis-cmd/pkg/generator"
+	"github.com/acmestack/gobatis-cmd/pkg/io"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
 )
 
 func main() {
-    driver := flag.String("driver", "mysql", "driver of db")
-    packageName := flag.String("pkg", "xfali.gobatis.default", "Set the package name of .go file")
-    dbName := flag.String("db", "", "the name of db instance used in model files")
-    tableName := flag.String("table", "", "the name of table to be generated")
-    host := flag.String("host", "localhost", "host of db")
-    port := flag.Int("port", 3306, "port of db ")
-    username := flag.String("user", "", "user name of db")
-    pw := flag.String("pw", "", "password of db")
-    path := flag.String("path", "", "root path to save files")
-    modelfile := flag.String("model", "", "the name of model file")
-    tagName := flag.String("tag", "xfield", "the name of field tag,eg: xfield,json  xfield,json,yaml")
-    mapper := flag.String("mapper", "xml", "generate mapper file: xml | template | go")
-    plugin := flag.String("plugin", "", "path of plugin")
-    keyword := flag.Bool("keyword", false, "with Keyword escape")
-    namespace := flag.String("namespace", "", "namespace")
-    confFile := flag.String("f", "", "config file")
-    register := flag.Bool("register", false, "add register code")
-    flag.Parse()
+	driver := flag.String("driver", "mysql", "driver of db")
+	packageName := flag.String("pkg", "acmestack.gobatis.default", "Set the package name of .go file")
+	dbName := flag.String("db", "", "the name of db instance used in model files")
+	tableName := flag.String("table", "", "the name of table to be generated")
+	host := flag.String("host", "localhost", "host of db")
+	port := flag.Int("port", 3306, "port of db ")
+	username := flag.String("user", "", "user name of db")
+	pw := flag.String("pw", "", "password of db")
+	path := flag.String("path", "", "root path to save files")
+	modelfile := flag.String("model", "", "the name of model file")
+	tagName := flag.String("tag", "column", "the name of field tag,eg: column,json  column,json,yaml")
+	mapper := flag.String("mapper", "xml", "generate mapper file: xml | template | go")
+	plugin := flag.String("plugin", "", "path of plugin")
+	keyword := flag.Bool("keyword", false, "with Keyword escape")
+	namespace := flag.String("namespace", "", "namespace")
+	confFile := flag.String("f", "", "config file")
+	register := flag.Bool("register", false, "add register code")
+	flag.Parse()
 
-    conf := config.FileConfig{}
-    if *confFile != "" {
-        err := loadFromFile(&conf, *confFile)
-        if err != nil {
-            fmt.Println(err)
-            os.Exit(1)
-        }
-        conf.Path = formatPath(conf.Path)
-    } else {
-        conf.Driver = *driver
-        conf.Path = formatPath(*path)
-        conf.PackageName = *packageName
-        conf.Namespace = *namespace
-        conf.ModelFile = *modelfile
-        conf.TagName = *tagName
-        conf.MapperFile = *mapper
-        conf.Plugin = *plugin
-        conf.Keyword = *keyword
-        conf.Register = *register
-        conf.TableName = *tableName
-        conf.DBName = *dbName
-        conf.Host = *host
-        conf.Port = *port
-        conf.User = *username
-        conf.Password = *pw
-    }
+	conf := config.FileConfig{}
+	if *confFile != "" {
+		err := loadFromFile(&conf, *confFile)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		conf.Path = formatPath(conf.Path)
+	} else {
+		conf.Driver = *driver
+		conf.Path = formatPath(*path)
+		conf.PackageName = *packageName
+		conf.Namespace = *namespace
+		conf.ModelFile = *modelfile
+		conf.TagName = *tagName
+		conf.MapperFile = *mapper
+		conf.Plugin = *plugin
+		conf.Keyword = *keyword
+		conf.Register = *register
+		conf.TableName = *tableName
+		conf.DBName = *dbName
+		conf.Host = *host
+		conf.Port = *port
+		conf.User = *username
+		conf.Password = *pw
+	}
 
-    dbDriver := db.GetDriver(conf.Driver)
-    if dbDriver == nil {
-        log.Print("not support driver: ", conf.Driver)
-        os.Exit(-1)
-    }
+	dbDriver := db.GetDriver(conf.Driver)
+	if dbDriver == nil {
+		log.Print("not support driver: ", conf.Driver)
+		os.Exit(-1)
+	}
 
-    err := dbDriver.Open(conf.Driver, db.GenDBInfo(conf.Driver, conf.DBName, conf.User, conf.Password, conf.Host, conf.Port))
-    if err != nil {
-        log.Print(err)
-        os.Exit(-1)
-    }
-    defer dbDriver.Close()
+	err := dbDriver.Open(conf.Driver, db.GenDBInfo(conf.Driver, conf.DBName, conf.User, conf.Password, conf.Host, conf.Port))
+	if err != nil {
+		log.Print(err)
+		os.Exit(-1)
+	}
+	defer dbDriver.Close()
 
-    if conf.TableName == "" {
-        tables, err2 := dbDriver.QueryTableNames(conf.DBName)
-        if err2 != nil {
-            log.Print(err2)
-            os.Exit(-2)
-        }
-        for _, v := range tables {
-            generator.GenOneTable(conf.Config, dbDriver, conf.DBName, v)
-        }
-    } else {
-        generator.GenOneTable(conf.Config, dbDriver, conf.DBName, conf.TableName)
-    }
-    os.Exit(0)
+	if conf.TableName == "" {
+		tables, err2 := dbDriver.QueryTableNames(conf.DBName)
+		if err2 != nil {
+			log.Print(err2)
+			os.Exit(-2)
+		}
+		for _, v := range tables {
+			generator.GenOneTable(conf.Config, dbDriver, conf.DBName, v)
+		}
+	} else {
+		generator.GenOneTable(conf.Config, dbDriver, conf.DBName, conf.TableName)
+	}
+	os.Exit(0)
 }
 
 func loadFromFile(conf *config.FileConfig, path string) error {
-    b, err := ioutil.ReadFile(path)
-    if err != nil {
-        return err
-    }
-    fmt.Printf("config file: %s\n", string(b))
-    return json.Unmarshal(b, conf)
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("config file: %s\n", string(b))
+	return json.Unmarshal(b, conf)
 }
 
 func formatPath(path string) string {
-    root := strings.TrimSpace(path)
-    if root == "" {
-        root = "./"
-    } else {
-        if !io.IsPathExists(path) {
-            io.Mkdir(path)
-        }
-        if root[len(root)-1:] != "/" {
-            root = root + "/"
-        }
-    }
-    return root
+	root := strings.TrimSpace(path)
+	if root == "" {
+		root = "./"
+	} else {
+		if !io.IsPathExists(path) {
+			io.Mkdir(path)
+		}
+		if root[len(root)-1:] != "/" {
+			root = root + "/"
+		}
+	}
+	return root
 }

assets/README.md

@@ -4,7 +4,7 @@
   "package": "test",
   "namespace": "test",
   "modelFile": "test_model.go",
-  "tagName": "xfield",
+  "tagName": "column",
   "mapperFile": "xml",
   "plugin": "",
   "keyword": false,