Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e640a85

Browse files
polaris1119polaris1119
committed
支持echo2.0正式版
1 parent 4e64abe commit e640a85

36 files changed

+274
-199
lines changed

‎websites/code2/studygolang/getpkg.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ if [ ! -f getpkg.sh ]; then
77
exit 1
88
fi
99

10+
if ! type gvt >/dev/null 2>&1; then
11+
echo >&2 "This script requires the gvt tool."
12+
echo >&2 "You may obtain it with the following command:"
13+
echo >&2 "go get github.com/polaris1119/gvt"
14+
exit 1
15+
fi
16+
1017
OLDGOPATH="$GOPATH"
1118
export GOPATH=`pwd`
1219

‎websites/code2/studygolang/src/http/controller/account.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ import (
3030
type AccountController struct{}
3131

3232
// 注册路由
33-
func (self AccountController) RegisterRoute(e *echo.Group) {
34-
e.Any("/account/register", echo.HandlerFunc(self.Register))
35-
e.Post("/account/send_activate_email", echo.HandlerFunc(self.SendActivateEmail))
36-
e.Get("/account/activate", echo.HandlerFunc(self.Activate))
37-
e.Any("/account/login", echo.HandlerFunc(self.Login))
38-
e.Any("/account/edit", echo.HandlerFunc(self.Edit), middleware.NeedLogin())
39-
e.Post("/account/change_avatar", echo.HandlerFunc(self.ChangeAvatar), middleware.NeedLogin())
40-
e.Post("/account/changepwd", echo.HandlerFunc(self.ChangePwd), middleware.NeedLogin())
41-
e.Any("/account/forgetpwd", echo.HandlerFunc(self.ForgetPasswd))
42-
e.Any("/account/resetpwd", echo.HandlerFunc(self.ResetPasswd))
43-
e.Get("/account/logout", echo.HandlerFunc(self.Logout), middleware.NeedLogin())
33+
func (self AccountController) RegisterRoute(g *echo.Group) {
34+
g.Any("/account/register", self.Register)
35+
g.Post("/account/send_activate_email", self.SendActivateEmail)
36+
g.Get("/account/activate", self.Activate)
37+
g.Any("/account/login", self.Login)
38+
g.Any("/account/edit", self.Edit, middleware.NeedLogin())
39+
g.Post("/account/change_avatar", self.ChangeAvatar, middleware.NeedLogin())
40+
g.Post("/account/changepwd", self.ChangePwd, middleware.NeedLogin())
41+
g.Any("/account/forgetpwd", self.ForgetPasswd)
42+
g.Any("/account/resetpwd", self.ResetPasswd)
43+
g.Get("/account/logout", self.Logout, middleware.NeedLogin())
4444
}
4545

4646
// 保存uuid和email的对应关系（TODO:重启如何处理，有效期问题）
@@ -208,7 +208,7 @@ func (AccountController) Login(ctx echo.Context) error {
208208
data := make(map[string]interface{})
209209

210210
username := ctx.FormValue("username")
211-
if username == "" || Request(ctx).Method != "POST" {
211+
if username == "" || ctx.Request().Method() != "POST" {
212212
data["redirect_uri"] = uri
213213
return render(ctx, contentTpl, data)
214214
}
@@ -307,7 +307,7 @@ func (AccountController) ForgetPasswd(ctx echo.Context) error {
307307
data := map[string]interface{}{"activeUsers": "active"}
308308

309309
email := ctx.FormValue("email")
310-
if email == "" || Request(ctx).Method != "POST" {
310+
if email == "" || ctx.Request().Method() != "POST" {
311311
return render(ctx, contentTpl, data)
312312
}
313313

@@ -352,7 +352,7 @@ func (AccountController) ResetPasswd(ctx echo.Context) error {
352352
contentTpl := "user/reset_pwd.html"
353353
data := map[string]interface{}{"activeUsers": "active"}
354354

355-
method := Request(ctx).Method
355+
method := ctx.Request().Method()
356356

357357
passwd := ctx.FormValue("passwd")
358358
email, ok := resetPwdMap[uuid]

‎websites/code2/studygolang/src/http/controller/admin/article.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@ import (
1212
"net/http"
1313
"strings"
1414

15-
. "http"
16-
1715
"github.com/labstack/echo"
1816
)
1917

2018
type ArticleController struct{}
2119

2220
// 注册路由
2321
func (self ArticleController) RegisterRoute(g *echo.Group) {
24-
g.Get("/crawl/article/list", echo.HandlerFunc(self.ArticleList))
25-
g.Post("/crawl/article/query.html", echo.HandlerFunc(self.ArticleQuery))
26-
g.Match([]string{"GET", "POST"}, "/crawl/article/new", echo.HandlerFunc(self.CrawlArticle))
27-
g.Match([]string{"GET", "POST"}, "/crawl/article/modify", echo.HandlerFunc(self.Modify))
22+
g.GET("/crawl/article/list", self.ArticleList)
23+
g.POST("/crawl/article/query.html", self.ArticleQuery)
24+
g.Match([]string{"GET", "POST"}, "/crawl/article/new", self.CrawlArticle)
25+
g.Match([]string{"GET", "POST"}, "/crawl/article/modify", self.Modify)
2826
}
2927

3028
// ArticleList 所有文章（分页）
@@ -100,7 +98,7 @@ func (self ArticleController) Modify(ctx echo.Context) error {
10098

10199
if ctx.FormValue("submit") == "1" {
102100
user := ctx.Get("user").(*model.Me)
103-
errMsg, err := logic.DefaultArticle.Modify(ctx, user, Request(ctx).Form)
101+
errMsg, err := logic.DefaultArticle.Modify(ctx, user, ctx.FormParams())
104102
if err != nil {
105103
return fail(ctx, 1, errMsg)
106104
}

‎websites/code2/studygolang/src/http/controller/admin/authority.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ type AuthorityController struct{}
1717

1818
// 注册路由
1919
func (self AuthorityController) RegisterRoute(g *echo.Group) {
20-
g.Get("/user/auth/list", echo.HandlerFunc(self.AuthList))
21-
g.Post("/user/auth/query.html", echo.HandlerFunc(self.AuthQuery))
20+
g.GET("/user/auth/list", self.AuthList)
21+
g.POST("/user/auth/query.html", self.AuthQuery)
2222
}
2323

2424
// AuthList 所有权限（分页）

‎websites/code2/studygolang/src/http/controller/admin/reading.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"model"
1212
"net/http"
1313

14-
. "http"
15-
1614
"github.com/labstack/echo"
1715
"github.com/polaris1119/goutils"
1816
)
@@ -21,9 +19,9 @@ type ReadingController struct{}
2119

2220
// 注册路由
2321
func (self ReadingController) RegisterRoute(g *echo.Group) {
24-
g.Get("/reading/list", echo.HandlerFunc(self.ReadingList))
25-
g.Post("/reading/query.html", echo.HandlerFunc(self.ReadingQuery))
26-
g.Match([]string{"GET", "POST"}, "/reading/publish", echo.HandlerFunc(self.Publish))
22+
g.GET("/reading/list", self.ReadingList)
23+
g.POST("/reading/query.html", self.ReadingQuery)
24+
g.Match([]string{"GET", "POST"}, "/reading/publish", self.Publish)
2725
}
2826

2927
// ReadingList 所有晨读（分页）
@@ -73,7 +71,7 @@ func (ReadingController) Publish(ctx echo.Context) error {
7371

7472
if ctx.FormValue("submit") == "1" {
7573
user := ctx.Get("user").(*model.Me)
76-
errMsg, err := logic.DefaultReading.SaveReading(ctx, Request(ctx).Form, user.Username)
74+
errMsg, err := logic.DefaultReading.SaveReading(ctx, ctx.FormParams(), user.Username)
7775
if err != nil {
7876
return fail(ctx, 1, errMsg)
7977
}

‎websites/code2/studygolang/src/http/controller/admin/rule.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,18 @@ import (
1111
"model"
1212
"net/http"
1313

14-
. "http"
15-
1614
"github.com/labstack/echo"
1715
)
1816

1917
type RuleController struct{}
2018

2119
// 注册路由
2220
func (self RuleController) RegisterRoute(g *echo.Group) {
23-
g.Get("/crawl/rule/list", echo.HandlerFunc(self.RuleList))
24-
g.Post("/crawl/rule/query.html", echo.HandlerFunc(self.Query))
25-
g.Match([]string{"GET", "POST"}, "/crawl/rule/new", echo.HandlerFunc(self.New))
26-
g.Match([]string{"GET", "POST"}, "/crawl/rule/modify", echo.HandlerFunc(self.Modify))
27-
g.Post("/crawl/rule/del", echo.HandlerFunc(self.Del))
21+
g.GET("/crawl/rule/list", self.RuleList)
22+
g.POST("/crawl/rule/query.html", self.Query)
23+
g.Match([]string{"GET", "POST"}, "/crawl/rule/new", self.New)
24+
g.Match([]string{"GET", "POST"}, "/crawl/rule/modify", self.Modify)
25+
g.POST("/crawl/rule/del", self.Del)
2826
}
2927

3028
// RuleList 所有规则（分页）
@@ -76,7 +74,7 @@ func (RuleController) New(ctx echo.Context) error {
7674
if ctx.FormValue("submit") == "1" {
7775
user := ctx.Get("user").(*model.Me)
7876

79-
errMsg, err := logic.DefaultRule.Save(ctx, Request(ctx).Form, user.Username)
77+
errMsg, err := logic.DefaultRule.Save(ctx, ctx.FormParams(), user.Username)
8078
if err != nil {
8179
return fail(ctx, 1, errMsg)
8280
}
@@ -93,7 +91,7 @@ func (self RuleController) Modify(ctx echo.Context) error {
9391
if ctx.FormValue("submit") == "1" {
9492
user := ctx.Get("user").(*model.Me)
9593

96-
errMsg, err := logic.DefaultRule.Save(ctx, Request(ctx).Form, user.Username)
94+
errMsg, err := logic.DefaultRule.Save(ctx, ctx.FormParams(), user.Username)
9795
if err != nil {
9896
return fail(ctx, 1, errMsg)
9997
}

‎websites/code2/studygolang/src/http/controller/admin/tool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type ToolController struct{}
1616

1717
// 注册路由
1818
func (self ToolController) RegisterRoute(g *echo.Group) {
19-
g.Get("/tool/sitemap", echo.HandlerFunc(self.GenSitemap))
19+
g.GET("/tool/sitemap", self.GenSitemap)
2020
}
2121

2222
// GenSitemap

‎websites/code2/studygolang/src/http/controller/article.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ func init() {
2828
type ArticleController struct{}
2929

3030
// 注册路由
31-
func (this *ArticleController) RegisterRoute(e *echo.Group) {
32-
e.Get("/articles", echo.HandlerFunc(this.ReadList))
33-
e.Get("/articles/:id", echo.HandlerFunc(this.Detail))
31+
func (this *ArticleController) RegisterRoute(g *echo.Group) {
32+
g.Get("/articles", this.ReadList)
33+
g.Get("/articles/:id", this.Detail)
3434
}
3535

3636
// ReadList 网友文章列表页

‎websites/code2/studygolang/src/http/controller/captcha.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var captchaHandler = captcha.Server(100, 40)
1818
// 验证码
1919
type CaptchaController struct{}
2020

21-
func (self CaptchaController) RegisterRoute(e *echo.Group) {
22-
e.Get("/captcha/*", echo.HandlerFunc(self.Server))
21+
func (self CaptchaController) RegisterRoute(g *echo.Group) {
22+
g.Get("/captcha/*", self.Server)
2323
}
2424

2525
func (CaptchaController) Server(ctx echo.Context) error {

‎websites/code2/studygolang/src/http/controller/comment.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@ import (
1313
"net/http"
1414
"strconv"
1515

16-
. "http"
17-
1816
"github.com/labstack/echo"
1917
"github.com/polaris1119/goutils"
2018
"github.com/polaris1119/slices"
2119
)
2220

2321
type CommentController struct{}
2422

25-
func (self CommentController) RegisterRoute(e *echo.Group) {
26-
e.Get("/at/users", echo.HandlerFunc(self.AtUsers))
27-
e.Post("/comment/:objid", echo.HandlerFunc(self.Create), middleware.NeedLogin(), middleware.Sensivite(), middleware.PublishNotice())
28-
e.Get("/object/comments", echo.HandlerFunc(self.CommentList))
23+
func (self CommentController) RegisterRoute(g *echo.Group) {
24+
g.Get("/at/users", self.AtUsers)
25+
g.Post("/comment/:objid", self.Create, middleware.NeedLogin(), middleware.Sensivite(), middleware.PublishNotice())
26+
g.Get("/object/comments", self.CommentList)
2927
}
3028

3129
// AtUsers 评论或回复 @ 某人 suggest
@@ -41,7 +39,7 @@ func (CommentController) Create(ctx echo.Context) error {
4139

4240
// 入库
4341
objid := goutils.MustInt(ctx.Param("objid"))
44-
comment, err := logic.DefaultComment.Publish(ctx, user.Uid, objid, Request(ctx).Form)
42+
comment, err := logic.DefaultComment.Publish(ctx, user.Uid, objid, ctx.FormParams())
4543
if err != nil {
4644
return fail(ctx, 1, "服务器内部错误")
4745
}

‎websites/code2/studygolang/src/http/controller/favorite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
type FavoriteController struct{}
2222

2323
// 注册路由
24-
func (self FavoriteController) RegisterRoute(e *echo.Group) {
25-
e.Post("/favorite/:objid", echo.HandlerFunc(self.Create), middleware.NeedLogin())
26-
e.Get("/favorites/:username", echo.HandlerFunc(self.ReadList))
24+
func (self FavoriteController) RegisterRoute(g *echo.Group) {
25+
g.Post("/favorite/:objid", self.Create, middleware.NeedLogin())
26+
g.Get("/favorites/:username", self.ReadList)
2727
}
2828

2929
// Create 收藏(取消收藏)

‎websites/code2/studygolang/src/http/controller/image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
// 图片处理
2222
type ImageController struct{}
2323

24-
func (self ImageController) RegisterRoute(e *echo.Group) {
25-
e.Post("/image/upload", echo.HandlerFunc(self.Upload))
26-
e.Any("/image/transfer", echo.HandlerFunc(self.Transfer))
24+
func (self ImageController) RegisterRoute(g *echo.Group) {
25+
g.POST("/image/upload", self.Upload)
26+
g.Match([]string{"GET", "POST"}, "/image/transfer", self.Transfer)
2727
}
2828

2929
// Upload 上传图片

‎websites/code2/studygolang/src/http/controller/index.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
type IndexController struct{}
2222

2323
// 注册路由
24-
func (self IndexController) RegisterRoute(e *echo.Group) {
25-
e.Get("/", echo.HandlerFunc(self.Index))
26-
e.Get("/wr", echo.HandlerFunc(self.WrapUrl))
27-
e.Get("/pkgdoc", echo.HandlerFunc(self.Pkgdoc))
24+
func (self IndexController) RegisterRoute(g *echo.Group) {
25+
g.GET("/", self.Index)
26+
g.GET("/wr", self.WrapUrl)
27+
g.GET("/pkgdoc", self.Pkgdoc)
2828
}
2929

3030
// Index 首页

‎websites/code2/studygolang/src/http/controller/install.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ type InstallController struct{}
2222

2323
// 注册路由
2424
func (self InstallController) RegisterRoute(g *echo.Group) {
25-
g.Get("/install", echo.HandlerFunc(self.SetupConfig))
26-
g.Match([]string{"GET", "POST"}, "/install/setup-config", echo.HandlerFunc(self.SetupConfig))
27-
g.Match([]string{"GET", "POST"}, "/install/do", echo.HandlerFunc(self.DoInstall))
28-
g.Match([]string{"GET", "POST"}, "/install/options", echo.HandlerFunc(self.SetupOptions))
25+
g.GET("/install", self.SetupConfig)
26+
g.Match([]string{"GET", "POST"}, "/install/setup-config", self.SetupConfig)
27+
g.Match([]string{"GET", "POST"}, "/install/do", self.DoInstall)
28+
g.Match([]string{"GET", "POST"}, "/install/options", self.SetupOptions)
2929
}
3030

3131
func (self InstallController) SetupConfig(ctx echo.Context) error {

‎websites/code2/studygolang/src/http/controller/like.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ package controller
99
// 喜欢系统
1010

1111
import (
12-
. "http"
13-
1412
"http/middleware"
1513
"logic"
1614
"model"
@@ -23,13 +21,13 @@ import (
2321
type LikeController struct{}
2422

2523
// 注册路由
26-
func (self LikeController) RegisterRoute(e *echo.Group) {
27-
e.Post("/like/:objid", echo.HandlerFunc(self.Like), middleware.NeedLogin())
24+
func (self LikeController) RegisterRoute(g *echo.Group) {
25+
g.POST("/like/:objid", self.Like, middleware.NeedLogin())
2826
}
2927

3028
// Like 喜欢（或取消喜欢）
3129
func (LikeController) Like(ctx echo.Context) error {
32-
form := Request(ctx).Form
30+
form := ctx.FormParams()
3331
if !util.CheckInt(form, "objtype") || !util.CheckInt(form, "flag") {
3432
return fail(ctx, 1, "参数错误")
3533
}

‎websites/code2/studygolang/src/http/controller/message.go

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"html/template"
1212
"net/http"
1313

14-
. "http"
1514
"http/middleware"
1615
"logic"
1716
"model"
@@ -23,18 +22,25 @@ import (
2322
type MessageController struct{}
2423

2524
// 注册路由
26-
func (self MessageController) RegisterRoute(e *echo.Group) {
27-
e.Get("/message/:msgtype", echo.HandlerFunc(self.ReadList), middleware.NeedLogin())
28-
e.Get("/message/system", echo.HandlerFunc(self.ReadList), middleware.NeedLogin())
29-
e.Match([]string{"GET", "POST"}, "/message/send", echo.HandlerFunc(self.Send), middleware.NeedLogin())
30-
e.Post("/message/delete", echo.HandlerFunc(self.Delete), middleware.NeedLogin())
25+
func (self MessageController) RegisterRoute(g *echo.Group) {
26+
messageG := g.Group("/message/", middleware.NeedLogin())
27+
28+
messageG.GET(":msgtype", self.ReadList)
29+
messageG.GET("system", self.ReadList)
30+
messageG.Match([]string{"GET", "POST"}, "/message/send", self.Send)
31+
messageG.POST("delete", self.Delete)
32+
33+
// g.GET("/message/:msgtype", self.ReadList, middleware.NeedLogin())
34+
// g.GET("/message/system", self.ReadList, middleware.NeedLogin())
35+
// g.Match([]string{"GET", "POST"}, "/message/send", self.Send, middleware.NeedLogin())
36+
// g.POST("/message/delete", self.Delete, middleware.NeedLogin())
3137
}
3238

3339
// Send 发短消息
3440
func (MessageController) Send(ctx echo.Context) error {
3541
content := ctx.FormValue("content")
3642
// 请求发送消息页面
37-
if content == "" || Request(ctx).Method != "POST" {
43+
if content == "" || ctx.Request().Method() != "POST" {
3844
username := ctx.FormValue("username")
3945
if username == "" {
4046
return ctx.Redirect(http.StatusSeeOther, "/")

0 commit comments

Comments
 (0)