From 17ce01add8df9c98b9526c14f769dee46de22f7a Mon Sep 17 00:00:00 2001 From: nelson Date: Wed, 29 Sep 2021 22:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/UserController.go | 48 +++++++++ mcontrollers/MBlogController.go | 185 -------------------------------- routers/MBlogRouter.go | 11 -- views/login.html | 26 +---- 4 files changed, 51 insertions(+), 219 deletions(-) delete mode 100644 mcontrollers/MBlogController.go delete mode 100644 routers/MBlogRouter.go diff --git a/controllers/UserController.go b/controllers/UserController.go index 3dacc62..9051e07 100644 --- a/controllers/UserController.go +++ b/controllers/UserController.go @@ -223,6 +223,30 @@ func (this *UserController) Edit() { func (this *UserController) Login() { userService := service.UserService{} + verifycode := this.GetString("captcha") + if len(verifycode) == 0 { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } + captchaid := this.GetString("captchaId") + if len(captchaid) == 0 { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } + has := store.Has(captchaid) + if has == 0 { + this.Data["json"] = models.ReurnError(1, "验证码过期") + this.ServeJSON() + return + } + verify := store.Verify(captchaid, verifycode, true) + if !verify { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } username := this.GetString("username") userpwd := this.GetString("userpwd") if username == "" { @@ -269,6 +293,30 @@ func (this *UserController) Regist() { userService := service.UserService{} username := this.GetString("username") userpwd := this.GetString("userpwd") + verifycode := this.GetString("captcha") + if len(verifycode) == 0 { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } + captchaid := this.GetString("captchaId") + if len(captchaid) == 0 { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } + has := store.Has(captchaid) + if has == 0 { + this.Data["json"] = models.ReurnError(1, "验证码过期") + this.ServeJSON() + return + } + verify := store.Verify(captchaid, verifycode, true) + if !verify { + this.Data["json"] = models.ReurnError(1, "验证码错误") + this.ServeJSON() + return + } username = strings.Replace(username, " ", "", -1) userpwd = strings.Replace(userpwd, " ", "", -1) if username == "" { diff --git a/mcontrollers/MBlogController.go b/mcontrollers/MBlogController.go deleted file mode 100644 index 18bd557..0000000 --- a/mcontrollers/MBlogController.go +++ /dev/null @@ -1,185 +0,0 @@ -package mcontrollers - -import ( - "beeblog/models" - "beeblog/service" - beego "github.com/beego/beego/v2/server/web" - "strconv" - "time" -) - -type MBlogController struct { - beego.Controller -} - -func (this *MBlogController) Get() { - blogService := service.BlogService{} - userService := service.UserService{} - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - blog, err := blogService.GetBlog(id) - if err != nil { - this.Data["json"] = models.ReurnServerError(500) - this.ServeJSON() - return - } - this.Data["json"] = models.ReurnData("", blog) - this.ServeJSON() - userService.CountBrows(blog.UserId) - blogService.EditBlogBrows(id) - return -} - -func (this *MBlogController) BlogsPage() { - blogService := service.BlogService{} - num, _ := this.GetInt("num") - size, _ := this.GetInt("size") - cat, _ := this.GetInt64("cat") - flag, _ := this.GetInt("flag") - if num <= 0 { - num = 1 - } - if size < 15 { - size = 15 - } - if cat <= 0 { - cat = -1 - } - pages, err := blogService.FindBlogs(num, size, cat, flag) - if err != nil { - this.Data["json"] = models.ReurnServerError(500) - this.ServeJSON() - return - } - this.Data["json"] = models.ReurnData("", pages) - this.ServeJSON() - return -} - -func (this *MBlogController) EditPage() { - blogService := service.BlogService{} - uid := this.GetSession("userid") - if uid == nil { - this.Redirect("/login", 302) - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - blog, err := blogService.GetBlog(id) - if err != nil { - this.Redirect("/404", 302) - return - } - if blog.UserId != uid.(int64) { - this.Redirect("/403", 302) - return - } - this.Data["Blog"] = blog - this.TplName = "editblog.html" -} - -func (this *MBlogController) Save() { - blogService := service.BlogService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - title := this.GetString("title") - blogHtml := this.GetString("blogHtml") - catory := this.GetString("catory") - catoryId, _ := strconv.ParseInt(catory, 10, 64) - labels := this.GetStrings("labels[]") - blog := &models.Blog{Title: title, BlogHtml: blogHtml, CategoryId: catoryId, UserId: uid.(int64)} - err := blogService.SaveBlog(blog, labels) - if err == nil { - this.Data["json"] = models.ReurnData("", blog.Id) - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - userService.CountBlog(uid.(int64)) - return -} - -func (this *MBlogController) Edit() { - userService := service.UserService{} - blogService := service.BlogService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - id, _ := this.GetInt64("id") - title := this.GetString("title") - blogHtml := this.GetString("blogHtml") - catory := this.GetString("catory") - catoryId, _ := strconv.ParseInt(catory, 10, 64) - labels := this.GetStrings("labels[]") - blog, err := blogService.GetBlog(id) - if err != nil { - this.Data["json"] = models.ReurnError(500, "保存失败") - this.ServeJSON() - return - } - blog.Title = title - blog.BlogHtml = blogHtml - blog.CategoryId = catoryId - blog.Utime = time.Now() - err = blogService.EditBlog(blog, labels) - if err == nil { - this.Data["json"] = models.ReurnSuccess("") - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - userService.CountBlog(uid.(int64)) - return -} - -func (this *MBlogController) Del() { - blogService := service.BlogService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - blog, err := blogService.GetBlog(id) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - this.ServeJSON() - return - } - if blog.UserId != uid.(int64) { - this.Data["json"] = models.ReurnError(503, "") - this.ServeJSON() - return - } - blog.Delflag = 1 - err = blogService.DelBlog(blog) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - this.ServeJSON() - return - } - this.Data["json"] = models.ReurnSuccess("") - this.ServeJSON() - userService.CountBlog(uid.(int64)) - return -} - -func (this *MBlogController) New() { - uid := this.GetSession("userid") - if uid == nil { - this.Redirect("/login", 302) - return - } - this.TplName = "newblog.html" -} diff --git a/routers/MBlogRouter.go b/routers/MBlogRouter.go deleted file mode 100644 index b58063b..0000000 --- a/routers/MBlogRouter.go +++ /dev/null @@ -1,11 +0,0 @@ -package routers - -import ( - "beeblog/mcontrollers" - beego "github.com/beego/beego/v2/server/web" -) - -func init() { - beego.Router("/api/blogs", &mcontrollers.MBlogController{}, "get:BlogsPage") - beego.Router("/api/blog/:id([0-9]+)", &mcontrollers.MBlogController{}, "get:Get") -} diff --git a/views/login.html b/views/login.html index e2945af..a2eacb3 100644 --- a/views/login.html +++ b/views/login.html @@ -239,26 +239,6 @@ mouseX = event.clientX - windowHalfX // mouseY = event.clientY - windowHalfY }, - login() { - var _this = this - if (this.user.username.trim().length < 4) { - this.$message.warning('用户名最低4位'); - return - } - if (this.user.userpwd.trim().length < 6) { - this.$message.warning('密码最低6位'); - return - } - $.post('/api/login', this.user, - function (data) { - if (data.Status == 1) { - _this.$message.warning(data.Msg); - } else { - _this.$message.success("登录成功"); - window.location.href = "/" - } - }, 'json') - }, loginHandler() { const _this = this this.loading = true @@ -266,10 +246,10 @@ if (valid) { $.post('/api/login', this.loginForm, function (data) { - this.loading = false + _this.loading = false if (data.Status == 1) { _this.getCaptcha() - _this.message.warning(data.Msg); + _this.$message.warning(data.Msg); } else { _this.$message.success("登录成功"); window.location.href = "/" @@ -287,7 +267,7 @@ if (valid) { $.post('/api/regist', this.loginForm, function (data) { - this.loading = false + _this.loading = false _this.getCaptcha() if (data.Status == 1) { _this.$message.warning(data.Msg);