Commit0b96d1c

authored

Merge pull requestglennliao#18 from glennliao/dev

## 0.2.0-beta2

2 parentsc11c6b3 +e8d753e commit0b96d1cCopy full SHA for 0b96d1c

File tree

+13

-11

lines changed

+13

-11

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ func (gf GF) Bind(group ghttp.RouterGroup, mode ...Mode) {`
`45`	`45`	`iflen(mode)==0 {`
`46`	`46`	`mode= []Mode{InDataMode}`
`47`	`47`	`}`
`48`		`-group.POST("/get",gf.commonResponse(gf.Get,mode[0]))`
`49`		`-group.POST("/post",gf.commonResponse(gf.Post,mode[0]))`
`50`		`-group.POST("/head",gf.commonResponse(gf.Head,mode[0]))`
`51`		`-group.POST("/put",gf.commonResponse(gf.Put,mode[0]))`
`52`		`-group.POST("/delete",gf.commonResponse(gf.Delete,mode[0]))`
	`48`	`+group.POST("/get",gf.CommonResponse(gf.Get,mode[0]))`
	`49`	`+group.POST("/post",gf.CommonResponse(gf.Post,mode[0]))`
	`50`	`+group.POST("/head",gf.CommonResponse(gf.Head,mode[0]))`
	`51`	`+group.POST("/put",gf.CommonResponse(gf.Put,mode[0]))`
	`52`	`+group.POST("/delete",gf.CommonResponse(gf.Delete,mode[0]))`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func (gf*GF)Get(ctx context.Context,req model.Map) (res model.Map,errerror) {`
`@@ -76,7 +76,7 @@ func (gf *GF) Delete(ctx context.Context, req model.Map) (res model.Map, err err`
`76`	`76`	`returnact.Result()`
`77`	`77`	`}`
`78`	`78`
`79`		`-func (gfGF)commonResponse(handlerfunc(ctx context.Context,req model.Map) (res model.Map,errerror),modeMode)func(reqghttp.Request) {`
	`79`	`+func (gfGF)CommonResponse(handlerfunc(ctx context.Context,req model.Map) (res model.Map,errerror),modeMode)func(reqghttp.Request) {`
`80`	`80`	`returnfunc(req*ghttp.Request) {`
`81`	`81`	`metaRes:=&gmap.ListMap{}`
`82`	`82`	`code:=200`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (q *queryNode) parse() {`
`94`	`94`	`return`
`95`	`95`	`}`
`96`	`96`
`97`		`-n.primaryTableKey=n.Key`
	`97`	`+n.primaryTableKey=filepath.Base(n.Path)`
`98`	`98`
`99`	`99`	`iflen(refKeyMap)>0 {// 需要引用别处`
`100`	`100`	`n.refKeyMap=make(map[string]NodeRef)`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"github.com/glennliao/apijson-go/consts"`
`5`	`5`	`"github.com/glennliao/apijson-go/model"`
`6`	`6`	`"github.com/gogf/gf/v2/errors/gerror"`
	`7`	`+"path/filepath"`
`7`	`8`	`"strings"`
`8`	`9`	`)`
`9`	`10`
`@@ -18,6 +19,10 @@ func newStructNode(n Node) structNode {`
`18`	`19`	`func (h*structNode)parse() {`
`19`	`20`	`n:=h.node`
`20`	`21`
	`22`	`+for_,childNode:=rangen.children {`
	`23`	`+childNode.parse()`
	`24`	`+}`
	`25`	`+`
`21`	`26`	`ifn.isList {// []节点`
`22`	`27`
`23`	`28`	`hasPrimary:=false// 是否存在主查询表`
`@@ -35,7 +40,7 @@ func (h *structNode) parse() {`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`hasPrimary=true`
`38`		`-n.primaryTableKey=child.Key`
	`43`	`+n.primaryTableKey=filepath.Base(child.Key)`
`39`	`44`	`child.page=n.page`
`40`	`45`
`41`	`46`	`}`
`@@ -46,9 +51,6 @@ func (h *structNode) parse() {`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`
`49`		`-for_,childNode:=rangen.children {`
`50`		`-childNode.parse()`
`51`		`-}`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`func (h*structNode)fetch() {`

Comments

(0)