Merge branch 'develop' of git://github.com/superalsrk/gin into superalsrk-develop
Conflicts: Godeps/Godeps.json
This commit is contained in:
commit
171efe228d
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@ -4,7 +4,7 @@
|
|||||||
"Deps": [
|
"Deps": [
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/julienschmidt/httprouter",
|
"ImportPath": "github.com/julienschmidt/httprouter",
|
||||||
"Rev": "aeec11926f7a8fab580383810e1b1bbba99bdaa7"
|
"Rev": "00ce1c6a267162792c367acc43b1681a884e1872"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -134,7 +134,8 @@ func main() {
|
|||||||
c.String(200, message)
|
c.String(200, message)
|
||||||
})
|
})
|
||||||
|
|
||||||
// However, this one will match /user/john and also /user/john/send
|
// However, this one will match /user/john/ and also /user/john/send
|
||||||
|
// If no other routers match /user/john, it will redirect to /user/join/
|
||||||
r.GET("/user/:name/*action", func(c *gin.Context) {
|
r.GET("/user/:name/*action", func(c *gin.Context) {
|
||||||
name := c.Params.ByName("name")
|
name := c.Params.ByName("name")
|
||||||
action := c.Params.ByName("action")
|
action := c.Params.ByName("action")
|
||||||
|
Loading…
Reference in New Issue
Block a user