lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-26 21:51:30 +00:00
Code Issues Releases Activity

Merge pull request #2 from kyle-wang/master

Browse Source 
Update develop
This commit is contained in:
kyle 2016-01-07 11:43:23 +08:00
commit f0cd17dbb1
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
g_appcode.go
View File

@ -985,6 +985,12 @@ func getPackagePath(curpath string) (packpath string) {
ColorLog("[ERRO] Can't generate application code outside of GOPATH '%s'\n", gopath) ColorLog("[ERRO] Can't generate application code outside of GOPATH '%s'\n", gopath)
os.Exit(2) os.Exit(2)
} }
if curpath == appsrcpath {
ColorLog("[ERRO] Can't generate application code outside of application PATH \n")
os.Exit(2)
}
packpath = strings.Join(strings.Split(curpath[len(appsrcpath)+1:], string(filepath.Separator)), "/") packpath = strings.Join(strings.Split(curpath[len(appsrcpath)+1:], string(filepath.Separator)), "/")
return return
} }
@ -1167,14 +1173,18 @@ func (c *{{ctrlName}}Controller) URLMapping() {
// @Title Post // @Title Post
// @Description create {{ctrlName}} // @Description create {{ctrlName}}
// @Param body body models.{{ctrlName}} true "body for {{ctrlName}} content" // @Param body body models.{{ctrlName}} true "body for {{ctrlName}} content"
// @Success 200 {int} models.{{ctrlName}}.Id // @Success 201 {int} models.{{ctrlName}}
// @Failure 403 body is empty // @Failure 403 body is empty
// @router / [post] // @router / [post]
func (c *{{ctrlName}}Controller) Post() { func (c *{{ctrlName}}Controller) Post() {
var v models.{{ctrlName}} var v models.{{ctrlName}}
json.Unmarshal(c.Ctx.Input.RequestBody, &v) if err := json.Unmarshal(c.Ctx.Input.RequestBody, &v); err == nil {
if id, err := models.Add{{ctrlName}}(&v); err == nil { if _, err := models.Add{{ctrlName}}(&v); err == nil {
c.Data["json"] = map[string]int64{"id": id} c.Ctx.Output.SetStatus(201)
c.Data["json"] = v
} else {
c.Data["json"] = err.Error()
}
} else { } else {
c.Data["json"] = err.Error() c.Data["json"] = err.Error()
} }
@ -1272,9 +1282,12 @@ func (c *{{ctrlName}}Controller) Put() {
idStr := c.Ctx.Input.Params[":id"] idStr := c.Ctx.Input.Params[":id"]
id, _ := strconv.Atoi(idStr) id, _ := strconv.Atoi(idStr)
v := models.{{ctrlName}}{Id: id} v := models.{{ctrlName}}{Id: id}
json.Unmarshal(c.Ctx.Input.RequestBody, &v) if err := json.Unmarshal(c.Ctx.Input.RequestBody, &v); err == nil {
if err := models.Update{{ctrlName}}ById(&v); err == nil { if err := models.Update{{ctrlName}}ById(&v); err == nil {
c.Data["json"] = "OK" c.Data["json"] = "OK"
} else {
c.Data["json"] = err.Error()
}
} else { } else {
c.Data["json"] = err.Error() c.Data["json"] = err.Error()
} }

9
g_controllers.go
View File

@ -88,7 +88,7 @@ func (c *{{controllerName}}Controller) URLMapping() {
// @Title Post // @Title Post
// @Description create {{controllerName}} // @Description create {{controllerName}}
// @Param body body models.{{controllerName}} true "body for {{controllerName}} content" // @Param body body models.{{controllerName}} true "body for {{controllerName}} content"
// @Success 200 {int} models.{{controllerName}}.Id // @Success 201 {object} models.{{controllerName}}
// @Failure 403 body is empty // @Failure 403 body is empty
// @router / [post] // @router / [post]
func (c *{{controllerName}}Controller) Post() { func (c *{{controllerName}}Controller) Post() {
@ -170,14 +170,15 @@ func (c *{{controllerName}}Controller) URLMapping() {
// @Title Post // @Title Post
// @Description create {{controllerName}} // @Description create {{controllerName}}
// @Param body body models.{{controllerName}} true "body for {{controllerName}} content" // @Param body body models.{{controllerName}} true "body for {{controllerName}} content"
// @Success 200 {int} models.{{controllerName}}.Id // @Success 201 {int} models.{{controllerName}}
// @Failure 403 body is empty // @Failure 403 body is empty
// @router / [post] // @router / [post]
func (c *{{controllerName}}Controller) Post() { func (c *{{controllerName}}Controller) Post() {
var v models.{{controllerName}} var v models.{{controllerName}}
json.Unmarshal(c.Ctx.Input.RequestBody, &v) json.Unmarshal(c.Ctx.Input.RequestBody, &v)
if id, err := models.Add{{controllerName}}(&v); err == nil { if _, err := models.Add{{controllerName}}(&v); err == nil {
c.Data["json"] = map[string]int64{"id": id} c.Ctx.Output.SetStatus(201)
c.Data["json"] = v
} else { } else {
c.Data["json"] = err.Error() c.Data["json"] = err.Error()
} }

2
pack.go
View File

@ -455,7 +455,7 @@ func packDirectory(excludePrefix []string, excludeSuffix []string,
func isBeegoProject(thePath string) bool { func isBeegoProject(thePath string) bool {
fh, _ := os.Open(thePath) fh, _ := os.Open(thePath)
fis, _ := fh.Readdir(-1) fis, _ := fh.Readdir(-1)
regex := regexp.MustCompile(`(?s)package main.*?import.*?\(.*?"github.com/astaxie/beego".*?\).*func main()`) regex := regexp.MustCompile(`(?s)package main.*?import.*?\(.*?github.com/astaxie/beego".*?\).*func main()`)
for _, fi := range fis { for _, fi := range fis {
if fi.IsDir() == false && strings.HasSuffix(fi.Name(), ".go") { if fi.IsDir() == false && strings.HasSuffix(fi.Name(), ".go") {
data, err := ioutil.ReadFile(path.Join(thePath, fi.Name())) data, err := ioutil.ReadFile(path.Join(thePath, fi.Name()))