mirror of
https://github.com/beego/bee.git
synced 2024-12-22 20:20:49 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
daaccf8972
@ -542,7 +542,7 @@ func init() {
|
||||
cmdApiapp.Flag.Var(&conn, "conn", "connection string used by the driver to connect to a database instance")
|
||||
}
|
||||
|
||||
func createapi(cmd *Command, args []string) {
|
||||
func createapi(cmd *Command, args []string) int {
|
||||
curpath, _ := os.Getwd()
|
||||
if len(args) > 1 {
|
||||
cmd.Flag.Parse(args[1:])
|
||||
@ -621,6 +621,7 @@ func createapi(cmd *Command, args []string) {
|
||||
writetofile(path.Join(apppath, "main.go"),
|
||||
strings.Replace(apiMaingo, "{{.Appname}}", packpath, -1))
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func checkEnv(appname string) (apppath, packpath string, err error) {
|
||||
|
@ -44,8 +44,9 @@ func init() {
|
||||
cmdRouter.Run = autoRouter
|
||||
}
|
||||
|
||||
func autoRouter(cmd *Command, args []string) {
|
||||
func autoRouter(cmd *Command, args []string) int {
|
||||
fmt.Println("[INFO] Starting auto-generating routers...")
|
||||
return 0
|
||||
}
|
||||
|
||||
// getControllerInfo returns controllers that embeded "beego.controller"
|
||||
|
3
bale.go
3
bale.go
@ -43,7 +43,7 @@ func init() {
|
||||
cmdBale.Run = runBale
|
||||
}
|
||||
|
||||
func runBale(cmd *Command, args []string) {
|
||||
func runBale(cmd *Command, args []string) int {
|
||||
err := loadConfig()
|
||||
if err != nil {
|
||||
ColorLog("[ERRO] Fail to parse bee.json[ %s ]\n", err)
|
||||
@ -82,6 +82,7 @@ func runBale(cmd *Command, args []string) {
|
||||
}
|
||||
|
||||
ColorLog("[SUCC] Baled resources successfully!\n")
|
||||
return 0
|
||||
}
|
||||
|
||||
const (
|
||||
|
13
bee.go
13
bee.go
@ -25,12 +25,12 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
const version = "1.2.0"
|
||||
const version = "1.2.1"
|
||||
|
||||
type Command struct {
|
||||
// Run runs the command.
|
||||
// The args are the arguments after the command name.
|
||||
Run func(cmd *Command, args []string)
|
||||
Run func(cmd *Command, args []string) int
|
||||
|
||||
// UsageLine is the one-line usage message.
|
||||
// The first word in the line is taken to be the command name.
|
||||
@ -77,12 +77,12 @@ var commands = []*Command{
|
||||
cmdRun,
|
||||
cmdPack,
|
||||
cmdApiapp,
|
||||
cmdRouter,
|
||||
cmdTest,
|
||||
//cmdRouter,
|
||||
//cmdTest,
|
||||
cmdBale,
|
||||
cmdVersion,
|
||||
cmdGenerate,
|
||||
cmdRundocs,
|
||||
//cmdRundocs,
|
||||
cmdMigrate,
|
||||
}
|
||||
|
||||
@ -110,8 +110,7 @@ func main() {
|
||||
cmd.Flag.Parse(args[1:])
|
||||
args = cmd.Flag.Args()
|
||||
}
|
||||
cmd.Run(cmd, args)
|
||||
os.Exit(2)
|
||||
os.Exit(cmd.Run(cmd, args))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
27
g.go
27
g.go
@ -22,13 +22,14 @@ var cmdGenerate = &Command{
|
||||
Long: `
|
||||
bee generate scaffold [scaffoldname] [-fields=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
|
||||
The generate scaffold command will do a number of things for you.
|
||||
-fields: a list of database fields.
|
||||
-fields: a list of table fields.
|
||||
-driver: [mysql | postgresql | sqlite], the default is mysql
|
||||
-conn: the connection string used by the driver, the default is root:@tcp(127.0.0.1:3306)/test
|
||||
example: bee generate scaffold post -fields="title:string,body:text"
|
||||
|
||||
bee generate model [modelname] [-fields=""]
|
||||
generate RESTFul model based on fields
|
||||
-fields: a list of table fields.
|
||||
|
||||
bee generate controller [controllerfile]
|
||||
generate RESTFul controllers
|
||||
@ -36,8 +37,9 @@ bee generate controller [controllerfile]
|
||||
bee generate view [viewpath]
|
||||
generate CRUD view in viewpath
|
||||
|
||||
bee generate migration [migrationfile]
|
||||
bee generate migration [migrationfile] [-fields=""]
|
||||
generate migration file for making database schema update
|
||||
-fields: a list of table fields.
|
||||
|
||||
bee generate docs
|
||||
generate swagger doc file
|
||||
@ -69,7 +71,7 @@ func init() {
|
||||
cmdGenerate.Flag.Var(&fields, "fields", "specify the fields want to generate.")
|
||||
}
|
||||
|
||||
func generateCode(cmd *Command, args []string) {
|
||||
func generateCode(cmd *Command, args []string) int {
|
||||
curpath, _ := os.Getwd()
|
||||
if len(args) < 1 {
|
||||
ColorLog("[ERRO] command is missing\n")
|
||||
@ -147,15 +149,21 @@ func generateCode(cmd *Command, args []string) {
|
||||
ColorLog("[INFO] Using '%s' as 'level'\n", level)
|
||||
generateAppcode(driver.String(), conn.String(), level.String(), tables.String(), curpath)
|
||||
case "migration":
|
||||
if len(args) == 2 {
|
||||
mname := args[1]
|
||||
ColorLog("[INFO] Using '%s' as migration name\n", mname)
|
||||
generateMigration(mname, curpath)
|
||||
} else {
|
||||
if len(args) < 2 {
|
||||
ColorLog("[ERRO] Wrong number of arguments\n")
|
||||
ColorLog("[HINT] Usage: bee generate migration [migrationname]\n")
|
||||
ColorLog("[HINT] Usage: bee generate migration [migrationname] [-fields=\"\"]\n")
|
||||
os.Exit(2)
|
||||
}
|
||||
cmd.Flag.Parse(args[2:])
|
||||
mname := args[1]
|
||||
ColorLog("[INFO] Using '%s' as migration name\n", mname)
|
||||
upsql := ""
|
||||
downsql := ""
|
||||
if fields != "" {
|
||||
upsql = `m.Sql("CREATE TABLE ` + mname + "(" + generateSQLFromFields(fields.String()) + `)");`
|
||||
downsql = `m.Sql("DROP TABLE ` + "`" + mname + "`" + `")`
|
||||
}
|
||||
generateMigration(mname, upsql, downsql, curpath)
|
||||
case "controller":
|
||||
if len(args) == 2 {
|
||||
cname := args[1]
|
||||
@ -193,4 +201,5 @@ func generateCode(cmd *Command, args []string) {
|
||||
ColorLog("[ERRO] command is missing\n")
|
||||
}
|
||||
ColorLog("[SUCC] generate successfully created!\n")
|
||||
return 0
|
||||
}
|
||||
|
@ -807,6 +807,14 @@ type {{ctrlName}}Controller struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
func (this *{{ctrlName}}Controller) URLMapping() {
|
||||
this.Mapping("Post", this.Post)
|
||||
this.Mapping("GetOne", this.GetOne)
|
||||
this.Mapping("GetAll", this.GetAll)
|
||||
this.Mapping("Put", this.Put)
|
||||
this.Mapping("Delete", this.Delete)
|
||||
}
|
||||
|
||||
// @Title Post
|
||||
// @Description create {{ctrlName}}
|
||||
// @Param body body models.{{ctrlName}} true "body for {{ctrlName}} content"
|
||||
|
@ -68,6 +68,14 @@ type {{controllerName}}Controller struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
func (this *{{controllerName}}Controller) URLMapping() {
|
||||
this.Mapping("Post", this.Post)
|
||||
this.Mapping("GetOne", this.GetOne)
|
||||
this.Mapping("GetAll", this.GetAll)
|
||||
this.Mapping("Put", this.Put)
|
||||
this.Mapping("Delete", this.Delete)
|
||||
}
|
||||
|
||||
// @Title Post
|
||||
// @Description create {{controllerName}}
|
||||
// @Param body body models.{{controllerName}} true "body for {{controllerName}} content"
|
||||
|
@ -31,7 +31,7 @@ const (
|
||||
// generateMigration generates migration file template for database schema update.
|
||||
// The generated file template consists of an up() method for updating schema and
|
||||
// a down() method for reverting the update.
|
||||
func generateMigration(mname string, curpath string) {
|
||||
func generateMigration(mname, upsql, downsql, curpath string) {
|
||||
migrationFilePath := path.Join(curpath, "database", M_PATH)
|
||||
if _, err := os.Stat(migrationFilePath); os.IsNotExist(err) {
|
||||
// create migrations directory
|
||||
@ -47,6 +47,8 @@ func generateMigration(mname string, curpath string) {
|
||||
defer f.Close()
|
||||
content := strings.Replace(MIGRATION_TPL, "{{StructName}}", camelCase(mname)+"_"+today, -1)
|
||||
content = strings.Replace(content, "{{CurrTime}}", today, -1)
|
||||
content = strings.Replace(content, "{{UpSQL}}", upsql, -1)
|
||||
content = strings.Replace(content, "{{DownSQL}}", downsql, -1)
|
||||
f.WriteString(content)
|
||||
// gofmt generated source code
|
||||
formatSourceCode(fpath)
|
||||
@ -85,10 +87,12 @@ func init() {
|
||||
// Run the migrations
|
||||
func (m *{{StructName}}) Up() {
|
||||
// use m.Sql("CREATE TABLE ...") to make schema update
|
||||
{{UpSQL}}
|
||||
}
|
||||
|
||||
// Reverse the migrations
|
||||
func (m *{{StructName}}) Down() {
|
||||
// use m.Sql("DROP TABLE ...") to reverse schema update
|
||||
{{DownSQL}}
|
||||
}
|
||||
`
|
||||
|
24
g_model.go
24
g_model.go
@ -71,30 +71,6 @@ func getStruct(structname, fields string) (string, error) {
|
||||
return structStr, nil
|
||||
}
|
||||
|
||||
func camelString(s string) string {
|
||||
data := make([]byte, 0, len(s))
|
||||
j := false
|
||||
k := false
|
||||
num := len(s) - 1
|
||||
for i := 0; i <= num; i++ {
|
||||
d := s[i]
|
||||
if k == false && d >= 'A' && d <= 'Z' {
|
||||
k = true
|
||||
}
|
||||
if d >= 'a' && d <= 'z' && (j || k == false) {
|
||||
d = d - 32
|
||||
j = false
|
||||
k = true
|
||||
}
|
||||
if k && d == '_' && num > i && s[i+1] >= 'a' && s[i+1] <= 'z' {
|
||||
j = true
|
||||
continue
|
||||
}
|
||||
data = append(data, d)
|
||||
}
|
||||
return string(data[:len(data)])
|
||||
}
|
||||
|
||||
// fields support type
|
||||
// http://beego.me/docs/mvc/model/models.md#mysql
|
||||
func getType(ktype string) (kt, tag string) {
|
||||
|
@ -1,6 +1,9 @@
|
||||
package main
|
||||
|
||||
import "strings"
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func generateScaffold(sname, fields, crupath, driver, conn string) {
|
||||
// generate model
|
||||
@ -22,7 +25,13 @@ func generateScaffold(sname, fields, crupath, driver, conn string) {
|
||||
// generate migration
|
||||
ColorLog("[INFO] Do you want me to create a %v migration and schema for this resource? [yes|no]] ", sname)
|
||||
if askForConfirmation() {
|
||||
generateMigration(sname, crupath)
|
||||
upsql := ""
|
||||
downsql := ""
|
||||
if fields != "" {
|
||||
upsql = `m.Sql("CREATE TABLE ` + sname + "(" + generateSQLFromFields(fields) + `)");`
|
||||
downsql = `m.Sql("DROP TABLE ` + "`" + sname + "`" + `")`
|
||||
}
|
||||
generateMigration(sname, upsql, downsql, crupath)
|
||||
}
|
||||
// run migration
|
||||
ColorLog("[INFO] Do you want to go ahead and migrate the database? [yes|no]] ")
|
||||
@ -31,3 +40,62 @@ func generateScaffold(sname, fields, crupath, driver, conn string) {
|
||||
}
|
||||
ColorLog("[INFO] All done! Don't forget to add beego.Router(\"/%v\" ,&controllers.%vController{}) to routers/route.go\n", sname, strings.Title(sname))
|
||||
}
|
||||
|
||||
func generateSQLFromFields(fields string) string {
|
||||
sql := ""
|
||||
tags := ""
|
||||
fds := strings.Split(fields, ",")
|
||||
for i, v := range fds {
|
||||
kv := strings.SplitN(v, ":", 2)
|
||||
if len(kv) != 2 {
|
||||
ColorLog("[ERRO] the filds format is wrong. should key:type,key:type " + v)
|
||||
return ""
|
||||
}
|
||||
typ, tag := getSqlType(kv[1])
|
||||
if typ == "" {
|
||||
ColorLog("[ERRO] the filds format is wrong. should key:type,key:type " + v)
|
||||
return ""
|
||||
}
|
||||
if i == 0 && strings.ToLower(kv[0]) != "id" {
|
||||
sql = sql + "`id` int(11) NOT NULL AUTO_INCREMENT,"
|
||||
tags = tags + "PRIMARY KEY (`id`),"
|
||||
}
|
||||
sql = sql + "`" + snakeString(kv[0]) + "` " + typ + ","
|
||||
if tag != "" {
|
||||
tags = tags + fmt.Sprintf(tag, "`"+snakeString(kv[0])+"`") + ","
|
||||
}
|
||||
}
|
||||
sql = strings.TrimRight(sql+tags, ",")
|
||||
return sql
|
||||
}
|
||||
|
||||
func getSqlType(ktype string) (tp, tag string) {
|
||||
kv := strings.SplitN(ktype, ":", 2)
|
||||
switch kv[0] {
|
||||
case "string":
|
||||
if len(kv) == 2 {
|
||||
return "varchar(" + kv[1] + ") NOT NULL", ""
|
||||
} else {
|
||||
return "varchar(128) NOT NULL", ""
|
||||
}
|
||||
case "text":
|
||||
return "longtext NOT NULL", ""
|
||||
case "auto":
|
||||
return "int(11) NOT NULL AUTO_INCREMENT", ""
|
||||
case "pk":
|
||||
return "int(11) NOT NULL", "PRIMARY KEY (%s)"
|
||||
case "datetime":
|
||||
return "datetime NOT NULL", ""
|
||||
case "int", "int8", "int16", "int32", "int64":
|
||||
fallthrough
|
||||
case "uint", "uint8", "uint16", "uint32", "uint64":
|
||||
return "int(11) DEFAULT NULL", ""
|
||||
case "bool":
|
||||
return "tinyint(1) NOT NULL", ""
|
||||
case "float32", "float64":
|
||||
return "float NOT NULL", ""
|
||||
case "float":
|
||||
return "float NOT NULL", ""
|
||||
}
|
||||
return "", ""
|
||||
}
|
||||
|
@ -61,7 +61,7 @@ func init() {
|
||||
}
|
||||
|
||||
// runMigration is the entry point for starting a migration
|
||||
func runMigration(cmd *Command, args []string) {
|
||||
func runMigration(cmd *Command, args []string) int {
|
||||
crupath, _ := os.Getwd()
|
||||
|
||||
gopath := os.Getenv("GOPATH")
|
||||
@ -117,6 +117,7 @@ func runMigration(cmd *Command, args []string) {
|
||||
}
|
||||
}
|
||||
ColorLog("[SUCC] Migration successful!\n")
|
||||
return 0
|
||||
}
|
||||
|
||||
// migrateUpdate does the schema update
|
||||
|
3
new.go
3
new.go
@ -55,7 +55,7 @@ func init() {
|
||||
cmdNew.Run = createApp
|
||||
}
|
||||
|
||||
func createApp(cmd *Command, args []string) {
|
||||
func createApp(cmd *Command, args []string) int {
|
||||
curpath, _ := os.Getwd()
|
||||
if len(args) != 1 {
|
||||
ColorLog("[ERRO] Argument [appname] is missing\n")
|
||||
@ -139,6 +139,7 @@ func createApp(cmd *Command, args []string) {
|
||||
writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
|
||||
|
||||
ColorLog("[SUCC] New application successfully created!\n")
|
||||
return 0
|
||||
}
|
||||
|
||||
var appconf = `appname = {{.Appname}}
|
||||
|
3
pack.go
3
pack.go
@ -469,7 +469,7 @@ func isBeegoProject(thePath string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func packApp(cmd *Command, args []string) {
|
||||
func packApp(cmd *Command, args []string) int {
|
||||
curPath, _ := os.Getwd()
|
||||
thePath := ""
|
||||
|
||||
@ -624,4 +624,5 @@ func packApp(cmd *Command, args []string) {
|
||||
}
|
||||
|
||||
fmt.Printf("file write to `%s`\n", outputP)
|
||||
return 0
|
||||
}
|
||||
|
3
run.go
3
run.go
@ -58,7 +58,7 @@ func init() {
|
||||
|
||||
var appname string
|
||||
|
||||
func runApp(cmd *Command, args []string) {
|
||||
func runApp(cmd *Command, args []string) int {
|
||||
exit := make(chan bool)
|
||||
crupath, _ := os.Getwd()
|
||||
|
||||
@ -119,6 +119,7 @@ func runApp(cmd *Command, args []string) {
|
||||
runtime.Goexit()
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func readAppDirectories(directory string, paths *[]string) {
|
||||
|
@ -57,7 +57,7 @@ func init() {
|
||||
cmdRundocs.Flag.Var(&docport, "docport", "doc server port")
|
||||
}
|
||||
|
||||
func runDocs(cmd *Command, args []string) {
|
||||
func runDocs(cmd *Command, args []string) int {
|
||||
if isDownload == "true" {
|
||||
downloadFromUrl(swaggerlink, "swagger.zip")
|
||||
err := unzipAndDelete("swagger.zip", "swagger")
|
||||
@ -74,6 +74,7 @@ func runDocs(cmd *Command, args []string) {
|
||||
}
|
||||
fmt.Println("start the docs server on: http://127.0.0.1:" + docport)
|
||||
log.Fatal(http.ListenAndServe(":"+string(docport), http.FileServer(http.Dir("swagger"))))
|
||||
return 0
|
||||
}
|
||||
|
||||
func downloadFromUrl(url, fileName string) {
|
||||
|
3
test.go
3
test.go
@ -49,7 +49,7 @@ func pathExists(path string) bool {
|
||||
|
||||
var started = make(chan bool)
|
||||
|
||||
func testApp(cmd *Command, args []string) {
|
||||
func testApp(cmd *Command, args []string) int {
|
||||
if len(args) != 1 {
|
||||
ColorLog("[ERRO] Cannot start running[ %s ]\n",
|
||||
"argument 'appname' is missing")
|
||||
@ -73,6 +73,7 @@ func testApp(cmd *Command, args []string) {
|
||||
runTest()
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func runTest() {
|
||||
|
42
util.go
42
util.go
@ -206,3 +206,45 @@ func containsString(slice []string, element string) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// snake string, XxYy to xx_yy
|
||||
func snakeString(s string) string {
|
||||
data := make([]byte, 0, len(s)*2)
|
||||
j := false
|
||||
num := len(s)
|
||||
for i := 0; i < num; i++ {
|
||||
d := s[i]
|
||||
if i > 0 && d >= 'A' && d <= 'Z' && j {
|
||||
data = append(data, '_')
|
||||
}
|
||||
if d != '_' {
|
||||
j = true
|
||||
}
|
||||
data = append(data, d)
|
||||
}
|
||||
return strings.ToLower(string(data[:len(data)]))
|
||||
}
|
||||
|
||||
func camelString(s string) string {
|
||||
data := make([]byte, 0, len(s))
|
||||
j := false
|
||||
k := false
|
||||
num := len(s) - 1
|
||||
for i := 0; i <= num; i++ {
|
||||
d := s[i]
|
||||
if k == false && d >= 'A' && d <= 'Z' {
|
||||
k = true
|
||||
}
|
||||
if d >= 'a' && d <= 'z' && (j || k == false) {
|
||||
d = d - 32
|
||||
j = false
|
||||
k = true
|
||||
}
|
||||
if k && d == '_' && num > i && s[i+1] >= 'a' && s[i+1] <= 'z' {
|
||||
j = true
|
||||
continue
|
||||
}
|
||||
data = append(data, d)
|
||||
}
|
||||
return string(data[:len(data)])
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ func init() {
|
||||
cmdVersion.Run = versionCmd
|
||||
}
|
||||
|
||||
func versionCmd(cmd *Command, args []string) {
|
||||
func versionCmd(cmd *Command, args []string) int {
|
||||
fmt.Println("bee :" + version)
|
||||
fmt.Println("beego :" + getbeegoVersion())
|
||||
//fmt.Println("Go :" + runtime.Version())
|
||||
@ -36,6 +36,7 @@ func versionCmd(cmd *Command, args []string) {
|
||||
log.Fatal(err)
|
||||
}
|
||||
fmt.Println("Go :" + string(goversion))
|
||||
return 0
|
||||
}
|
||||
|
||||
func getbeegoVersion() string {
|
||||
|
Loading…
Reference in New Issue
Block a user