diff --git a/examples/mirc/auto/api/v1/site.go b/examples/mirc/auto/api/v1/site.go index c7cf91b..63675e5 100644 --- a/examples/mirc/auto/api/v1/site.go +++ b/examples/mirc/auto/api/v1/site.go @@ -46,9 +46,9 @@ func RegisterSiteServant(e *gin.Engine, s Site, r SiteRender) { r.RenderArticles(c, s.Articles()) } - router.Handle("GET", "/articles/:category/", h) router.Handle("HEAD", "/articles/:category/", h) router.Handle("POST", "/articles/:category/", h) + router.Handle("GET", "/articles/:category/", h) } router.Handle("GET", "/index/", func(c *gin.Context) { diff --git a/examples/mirc/routes/site.go b/examples/mirc/routes/site.go index f9f6998..c7345bc 100644 --- a/examples/mirc/routes/site.go +++ b/examples/mirc/routes/site.go @@ -59,7 +59,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/examples/mirc/routes/v1/site.go b/examples/mirc/routes/v1/site.go index a3beb08..3ba645c 100644 --- a/examples/mirc/routes/v1/site.go +++ b/examples/mirc/routes/v1/site.go @@ -15,8 +15,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/examples/mirc/routes/v2/site.go b/examples/mirc/routes/v2/site.go index bb5b0a3..9726cfb 100644 --- a/examples/mirc/routes/v2/site.go +++ b/examples/mirc/routes/v2/site.go @@ -54,7 +54,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/chi/mirc/routes/site.go.tmpl b/mirc/templates/chi/mirc/routes/site.go.tmpl index 711ff63..3215f40 100644 --- a/mirc/templates/chi/mirc/routes/site.go.tmpl +++ b/mirc/templates/chi/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/{category}/{id:[0-9]+}"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/chi/mirc/routes/v1/site.go.tmpl b/mirc/templates/chi/mirc/routes/v1/site.go.tmpl index 61ea076..3ab1702 100644 --- a/mirc/templates/chi/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/chi/mirc/routes/v1/site.go.tmpl @@ -11,7 +11,7 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Group Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` diff --git a/mirc/templates/echo/mirc/routes/site.go.tmpl b/mirc/templates/echo/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/echo/mirc/routes/site.go.tmpl +++ b/mirc/templates/echo/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/echo/mirc/routes/v1/site.go.tmpl b/mirc/templates/echo/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/echo/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/echo/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/echo/mirc/routes/v2/site.go.tmpl b/mirc/templates/echo/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/echo/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/echo/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/fiber-v2/mirc/routes/site.go.tmpl b/mirc/templates/fiber-v2/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/fiber-v2/mirc/routes/site.go.tmpl +++ b/mirc/templates/fiber-v2/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/fiber-v2/mirc/routes/v1/site.go.tmpl b/mirc/templates/fiber-v2/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/fiber-v2/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/fiber-v2/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/fiber-v2/mirc/routes/v2/site.go.tmpl b/mirc/templates/fiber-v2/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/fiber-v2/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/fiber-v2/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/fiber/mirc/routes/site.go.tmpl b/mirc/templates/fiber/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/fiber/mirc/routes/site.go.tmpl +++ b/mirc/templates/fiber/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/fiber/mirc/routes/v1/site.go.tmpl b/mirc/templates/fiber/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/fiber/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/fiber/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/fiber/mirc/routes/v2/site.go.tmpl b/mirc/templates/fiber/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/fiber/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/fiber/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/gin/go.mod.tmpl b/mirc/templates/gin/go.mod.tmpl index f74374f..5622a25 100644 --- a/mirc/templates/gin/go.mod.tmpl +++ b/mirc/templates/gin/go.mod.tmpl @@ -4,28 +4,33 @@ go 1.18 require ( github.com/alimy/mir/v3 v3.1.1 - github.com/gin-gonic/gin v1.8.2 + github.com/gin-gonic/gin v1.9.0 ) require ( + github.com/bytedance/sonic v1.8.0 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-playground/locales v0.14.0 // indirect - github.com/go-playground/universal-translator v0.18.0 // indirect - github.com/go-playground/validator/v10 v10.11.1 // indirect - github.com/goccy/go-json v0.9.11 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.11.2 // indirect + github.com/goccy/go-json v0.10.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/leodido/go-urn v1.2.1 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/ugorji/go/codec v1.2.7 // indirect - golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect - golang.org/x/net v0.4.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.9 // indirect + golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect + golang.org/x/crypto v0.5.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) {{if notEmptyStr .MirPkgName }} replace ( diff --git a/mirc/templates/gin/go.sum.tmpl b/mirc/templates/gin/go.sum.tmpl index 14893fa..3cbe215 100644 --- a/mirc/templates/gin/go.sum.tmpl +++ b/mirc/templates/gin/go.sum.tmpl @@ -1,53 +1,50 @@ github.com/alimy/mir/v3 v3.1.1 h1:3tz7uGOwuA1IKU0BysyBvGbyqKtEVMuhPBD/APk1ANw= github.com/alimy/mir/v3 v3.1.1/go.mod h1:ybhT2ijOiDn0lLwWzIY6vXdv+uzZrctS7VFfczcXBWU= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.2 h1:UzKToD9/PoFj/V4rvlKqTRKnQYyz8Sc1MJlv4JHPtvY= -github.com/gin-gonic/gin v1.8.2/go.mod h1:qw5AYuDrzRTnhvusDsrov+fDIxp9Dleuu12h8nfB398= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= -github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -58,40 +55,29 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/mirc/templates/gin/mirc/routes/site.go.tmpl b/mirc/templates/gin/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/gin/mirc/routes/site.go.tmpl +++ b/mirc/templates/gin/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/gin/mirc/routes/v1/site.go.tmpl b/mirc/templates/gin/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/gin/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/gin/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/gin/mirc/routes/v2/site.go.tmpl b/mirc/templates/gin/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/gin/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/gin/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/hertz/mirc/routes/site.go.tmpl b/mirc/templates/hertz/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/hertz/mirc/routes/site.go.tmpl +++ b/mirc/templates/hertz/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/hertz/mirc/routes/v1/site.go.tmpl b/mirc/templates/hertz/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/hertz/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/hertz/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/hertz/mirc/routes/v2/site.go.tmpl b/mirc/templates/hertz/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/hertz/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/hertz/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/httprouter/mirc/routes/site.go.tmpl b/mirc/templates/httprouter/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/httprouter/mirc/routes/site.go.tmpl +++ b/mirc/templates/httprouter/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/httprouter/mirc/routes/v1/site.go.tmpl b/mirc/templates/httprouter/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/httprouter/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/httprouter/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/httprouter/mirc/routes/v2/site.go.tmpl b/mirc/templates/httprouter/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/httprouter/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/httprouter/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/iris/mirc/routes/site.go.tmpl b/mirc/templates/iris/mirc/routes/site.go.tmpl index 41dfe4b..a98d647 100644 --- a/mirc/templates/iris/mirc/routes/site.go.tmpl +++ b/mirc/templates/iris/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/{category:string}"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/iris/mirc/routes/v1/site.go.tmpl b/mirc/templates/iris/mirc/routes/v1/site.go.tmpl index a7e992b..c52d8c1 100644 --- a/mirc/templates/iris/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/iris/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/{category:string}"` } diff --git a/mirc/templates/iris/mirc/routes/v2/site.go.tmpl b/mirc/templates/iris/mirc/routes/v2/site.go.tmpl index f36ef2e..10bd2fe 100644 --- a/mirc/templates/iris/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/iris/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/{category:string}"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/macaron/mirc/routes/site.go.tmpl b/mirc/templates/macaron/mirc/routes/site.go.tmpl index 2709138..d33e06e 100644 --- a/mirc/templates/macaron/mirc/routes/site.go.tmpl +++ b/mirc/templates/macaron/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/macaron/mirc/routes/v1/site.go.tmpl b/mirc/templates/macaron/mirc/routes/v1/site.go.tmpl index 451c8bf..239acc1 100644 --- a/mirc/templates/macaron/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/macaron/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"/articles/:category/"` } diff --git a/mirc/templates/macaron/mirc/routes/v2/site.go.tmpl b/mirc/templates/macaron/mirc/routes/v2/site.go.tmpl index 502aeb5..b455141 100644 --- a/mirc/templates/macaron/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/macaron/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"/articles/:category/"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/mux/mirc/routes/site.go.tmpl b/mirc/templates/mux/mirc/routes/site.go.tmpl index 72107ba..addf555 100644 --- a/mirc/templates/mux/mirc/routes/site.go.tmpl +++ b/mirc/templates/mux/mirc/routes/site.go.tmpl @@ -55,7 +55,7 @@ type Tweet struct { // Site site interface info type Site struct { - Chain Chain `mir:"-"` + Chain `mir:"-"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"//{subdomain}.example.com/articles/{category}/{id:[0-9]+}?filter={filter}&foo=bar&id={id:[0-9]+}"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/templates/mux/mirc/routes/v1/site.go.tmpl b/mirc/templates/mux/mirc/routes/v1/site.go.tmpl index 14c3aea..3c7811a 100644 --- a/mirc/templates/mux/mirc/routes/v1/site.go.tmpl +++ b/mirc/templates/mux/mirc/routes/v1/site.go.tmpl @@ -11,8 +11,8 @@ func init() { // Site site v1 interface info type Site struct { - Chain Chain `mir:"-"` - Group Group `mir:"v1"` + Chain `mir:"-"` + Group `mir:"/v1"` Index func(Get) `mir:"/index/"` Articles func(Head, Get, Post) `mir:"//{subdomain}.example.com/articles/{category}/{id:[0-9]+}?filter={filter}&foo=bar&id={id:[0-9]+}"` } diff --git a/mirc/templates/mux/mirc/routes/v2/site.go.tmpl b/mirc/templates/mux/mirc/routes/v2/site.go.tmpl index 36425d5..13ed246 100644 --- a/mirc/templates/mux/mirc/routes/v2/site.go.tmpl +++ b/mirc/templates/mux/mirc/routes/v2/site.go.tmpl @@ -50,7 +50,7 @@ type Tweet struct { // Site site v2 interface info type Site struct { - Group Group `mir:"v2"` + Group `mir:"/v2"` Index func(Get) `mir:"/index/"` Articles func(Get) `mir:"//{subdomain}.example.com/articles/{category}/{id:[0-9]+}?filter={filter}&foo=bar&id={id:[0-9]+}"` NextTweets func(Any, TweetsReq) TweetsResp `mir:"/tweets/next"` diff --git a/mirc/version/version.go b/mirc/version/version.go index f43c7b9..30d3283 100644 --- a/mirc/version/version.go +++ b/mirc/version/version.go @@ -18,7 +18,7 @@ var ( BuildTime = "" // AppVer version of Mirc - AppVer = semver.MustParse("v3.1.1") + AppVer = semver.MustParse("v3.1.2") ) func ShowInfo() string {