upgrade github.com/alimy/mir/v3 => v3.0.0-alpha.6

pull/196/head
Michael Li 2 years ago
parent 4d379e278a
commit 2397eff99d
No known key found for this signature in database

@ -6,7 +6,7 @@ require (
github.com/Masterminds/semver/v3 v3.1.1 github.com/Masterminds/semver/v3 v3.1.1
github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868
github.com/alimy/cfg v0.1.0 github.com/alimy/cfg v0.1.0
github.com/alimy/mir/v3 v3.0.0-alpha.5 github.com/alimy/mir/v3 v3.0.0-alpha.6
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible
github.com/allegro/bigcache/v3 v3.0.2 github.com/allegro/bigcache/v3 v3.0.2
github.com/bytedance/sonic v1.5.0 github.com/bytedance/sonic v1.5.0

@ -144,8 +144,8 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C
github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
github.com/alimy/cfg v0.1.0 h1:J7KDLEoVIjEBMGlQJb2ljad/d49gJ4Tsl2ogZ9XNhaY= github.com/alimy/cfg v0.1.0 h1:J7KDLEoVIjEBMGlQJb2ljad/d49gJ4Tsl2ogZ9XNhaY=
github.com/alimy/cfg v0.1.0/go.mod h1:rOxbasTH2srl6StAjNF5Vyi8bfrdkl3fLGmOYtSw81c= github.com/alimy/cfg v0.1.0/go.mod h1:rOxbasTH2srl6StAjNF5Vyi8bfrdkl3fLGmOYtSw81c=
github.com/alimy/mir/v3 v3.0.0-alpha.5 h1:KFv8ulmC1hDPDezh/dQ+ZwZwmmwrcWUV4TZJrMBZB8I= github.com/alimy/mir/v3 v3.0.0-alpha.6 h1:4xcyE12MgzTbcIcYtnt3ILrVrxFjI71qhqh0JL2gB58=
github.com/alimy/mir/v3 v3.0.0-alpha.5/go.mod h1:ybhT2ijOiDn0lLwWzIY6vXdv+uzZrctS7VFfczcXBWU= github.com/alimy/mir/v3 v3.0.0-alpha.6/go.mod h1:ybhT2ijOiDn0lLwWzIY6vXdv+uzZrctS7VFfczcXBWU=
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM= github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM=
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=

@ -66,13 +66,26 @@ func RegisterUserServant(e *gin.Engine, s User, b UserBinding, r UserRender) {
// register routes info to router // register routes info to router
router.Handle("POST", "/user/logout/", func(c *gin.Context) { router.Handle("POST", "/user/logout/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderLogout(c, s.Logout()) r.RenderLogout(c, s.Logout())
}) })
router.Handle("POST", "/user/login/", func(c *gin.Context) { router.Handle("POST", "/user/login/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
req, err := b.BindLogin(c) req, err := b.BindLogin(c)
if err != nil { if err != nil {
r.RenderLogin(c, nil, err) r.RenderLogin(c, nil, err)
return
} }
resp, err := s.Login(req) resp, err := s.Login(req)
r.RenderLogin(c, resp, err) r.RenderLogin(c, resp, err)

@ -66,13 +66,26 @@ func RegisterUserServant(e *gin.Engine, s User, b UserBinding, r UserRender) {
// register routes info to router // register routes info to router
router.Handle("POST", "/user/logout/", func(c *gin.Context) { router.Handle("POST", "/user/logout/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderLogout(c, s.Logout()) r.RenderLogout(c, s.Logout())
}) })
router.Handle("POST", "/user/login/", func(c *gin.Context) { router.Handle("POST", "/user/login/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
req, err := b.BindLogin(c) req, err := b.BindLogin(c)
if err != nil { if err != nil {
r.RenderLogin(c, nil, err) r.RenderLogin(c, nil, err)
return
} }
resp, err := s.Login(req) resp, err := s.Login(req)
r.RenderLogin(c, resp, err) r.RenderLogin(c, resp, err)

@ -62,19 +62,38 @@ func RegisterUserServant(e *gin.Engine, s User, b UserBinding, r UserRender) {
// register routes info to router // register routes info to router
router.Handle("POST", "/user/logout/", func(c *gin.Context) { router.Handle("POST", "/user/logout/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderLogout(c, s.Logout()) r.RenderLogout(c, s.Logout())
}) })
router.Handle("POST", "/user/login/", func(c *gin.Context) { router.Handle("POST", "/user/login/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
req, err := b.BindLogin(c) req, err := b.BindLogin(c)
if err != nil { if err != nil {
r.RenderLogin(c, nil, err) r.RenderLogin(c, nil, err)
return
} }
resp, err := s.Login(req) resp, err := s.Login(req)
r.RenderLogin(c, resp, err) r.RenderLogin(c, resp, err)
}) })
router.Handle("GET", "/index/", func(c *gin.Context) { router.Handle("GET", "/index/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderIndex(c, s.Index()) r.RenderIndex(c, s.Index())
}) })

@ -70,13 +70,26 @@ func RegisterWebCoreServant(e *gin.Engine, s WebCore, b WebCoreBinding, r WebCor
// register routes info to router // register routes info to router
router.Handle("POST", "/user/logout/", func(c *gin.Context) { router.Handle("POST", "/user/logout/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderLogout(c, s.Logout()) r.RenderLogout(c, s.Logout())
}) })
router.Handle("POST", "/user/login/", func(c *gin.Context) { router.Handle("POST", "/user/login/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
req, err := b.BindLogin(c) req, err := b.BindLogin(c)
if err != nil { if err != nil {
r.RenderLogin(c, nil, err) r.RenderLogin(c, nil, err)
return
} }
resp, err := s.Login(req) resp, err := s.Login(req)
r.RenderLogin(c, resp, err) r.RenderLogin(c, resp, err)
@ -84,6 +97,12 @@ func RegisterWebCoreServant(e *gin.Engine, s WebCore, b WebCoreBinding, r WebCor
{ {
h := func(c *gin.Context) { h := func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderArticles(c, s.Articles()) r.RenderArticles(c, s.Articles())
} }
router.Handle("HEAD", "/articles/:category/", h) router.Handle("HEAD", "/articles/:category/", h)
@ -91,6 +110,12 @@ func RegisterWebCoreServant(e *gin.Engine, s WebCore, b WebCoreBinding, r WebCor
} }
router.Handle("GET", "/index/", func(c *gin.Context) { router.Handle("GET", "/index/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderIndex(c, s.Index()) r.RenderIndex(c, s.Index())
}) })

@ -66,13 +66,26 @@ func RegisterUserServant(e *gin.Engine, s User, b UserBinding, r UserRender) {
// register routes info to router // register routes info to router
router.Handle("POST", "/user/logout/", func(c *gin.Context) { router.Handle("POST", "/user/logout/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
r.RenderLogout(c, s.Logout()) r.RenderLogout(c, s.Logout())
}) })
router.Handle("POST", "/user/login/", func(c *gin.Context) { router.Handle("POST", "/user/login/", func(c *gin.Context) {
select {
case <-c.Request.Context().Done():
return
default:
}
req, err := b.BindLogin(c) req, err := b.BindLogin(c)
if err != nil { if err != nil {
r.RenderLogin(c, nil, err) r.RenderLogin(c, nil, err)
return
} }
resp, err := s.Login(req) resp, err := s.Login(req)
r.RenderLogin(c, resp, err) r.RenderLogin(c, resp, err)

Loading…
Cancel
Save