升级到beego 1.6

lisijie · Jan 21, 2016 · f5deccc · f5deccc
1 parent b5b13c2
commit f5deccc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/app/controllers/base.go b/app/controllers/base.go
@@ -57,7 +57,7 @@ func (this *BaseController) auth() {
 
 	if this.userId == 0 && (this.controllerName != "main" ||
 		(this.controllerName == "main" && this.actionName != "logout" && this.actionName != "login")) {
-		this.redirect(beego.UrlFor("MainController.Login"))
+		this.redirect(beego.URLFor("MainController.Login"))
 	}
 }
 
@@ -70,7 +70,7 @@ func (this *BaseController) display(tpl ...string) {
 		tplname = this.controllerName + "/" + this.actionName + ".html"
 	}
 	this.Layout = "layout/layout.html"
-	this.TplNames = tplname
+	this.TplName = tplname
 }
 
 // 重定向
@@ -102,7 +102,7 @@ func (this *BaseController) showMsg(args ...string) {
 // 输出json
 func (this *BaseController) jsonResult(out interface{}) {
 	this.Data["json"] = out
-	this.ServeJson()
+	this.ServeJSON()
 	this.StopRun()
 }
 

diff --git a/app/controllers/group.go b/app/controllers/group.go
@@ -22,7 +22,7 @@ func (this *GroupController) List() {
 
 	this.Data["pageTitle"] = "分组列表"
 	this.Data["list"] = list
-	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.UrlFor("GroupController.List"), true).ToString()
+	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.URLFor("GroupController.List"), true).ToString()
 	this.display()
 }
 

diff --git a/app/controllers/main.go b/app/controllers/main.go
@@ -94,11 +94,11 @@ func (this *MainController) Profile() {
 			if len(password1) < 6 {
 				flash.Error("密码长度必须大于6位")
 				flash.Store(&this.Controller)
-				this.redirect(beego.UrlFor(".Profile"))
+				this.redirect(beego.URLFor(".Profile"))
 			} else if password2 != password1 {
 				flash.Error("两次输入的密码不一致")
 				flash.Store(&this.Controller)
-				this.redirect(beego.UrlFor(".Profile"))
+				this.redirect(beego.URLFor(".Profile"))
 			} else {
 				user.Salt = string(utils.RandomCreateBytes(10))
 				user.Password = libs.Md5([]byte(password1 + user.Salt))
@@ -107,7 +107,7 @@ func (this *MainController) Profile() {
 		}
 		flash.Success("修改成功！")
 		flash.Store(&this.Controller)
-		this.redirect(beego.UrlFor(".Profile"))
+		this.redirect(beego.URLFor(".Profile"))
 	}
 
 	this.Data["pageTitle"] = "个人信息"
@@ -146,21 +146,21 @@ func (this *MainController) Login() {
 					this.Ctx.SetCookie("auth", strconv.Itoa(user.Id)+"|"+authkey)
 				}
 
-				this.redirect(beego.UrlFor("TaskController.List"))
+				this.redirect(beego.URLFor("TaskController.List"))
 			}
 			flash.Error(errorMsg)
 			flash.Store(&this.Controller)
-			this.redirect(beego.UrlFor("MainController.Login"))
+			this.redirect(beego.URLFor("MainController.Login"))
 		}
 	}
 
-	this.TplNames = "main/login.html"
+	this.TplName = "main/login.html"
 }
 
 // 退出登录
 func (this *MainController) Logout() {
 	this.Ctx.SetCookie("auth", "")
-	this.redirect(beego.UrlFor("MainController.Login"))
+	this.redirect(beego.URLFor("MainController.Login"))
 }
 
 // 获取系统时间

diff --git a/app/controllers/task.go b/app/controllers/task.go
@@ -66,7 +66,7 @@ func (this *TaskController) List() {
 	this.Data["list"] = list
 	this.Data["groups"] = groups
 	this.Data["groupid"] = groupId
-	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.UrlFor("TaskController.List", "groupid", groupId), true).ToString()
+	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.URLFor("TaskController.List", "groupid", groupId), true).ToString()
 	this.display()
 }
 
@@ -202,7 +202,7 @@ func (this *TaskController) Logs() {
 	this.Data["pageTitle"] = "任务执行日志"
 	this.Data["list"] = list
 	this.Data["task"] = task
-	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.UrlFor("TaskController.Logs", "id", taskId), true).ToString()
+	this.Data["pageBar"] = libs.NewPager(page, int(count), this.pageSize, beego.URLFor("TaskController.Logs", "id", taskId), true).ToString()
 	this.display()
 }
 
@@ -316,7 +316,7 @@ func (this *TaskController) Start() {
 
 	refer := this.Ctx.Request.Referer()
 	if refer == "" {
-		refer = beego.UrlFor("TaskController.List")
+		refer = beego.URLFor("TaskController.List")
 	}
 	this.redirect(refer)
 }
@@ -336,7 +336,7 @@ func (this *TaskController) Pause() {
 
 	refer := this.Ctx.Request.Referer()
 	if refer == "" {
-		refer = beego.UrlFor("TaskController.List")
+		refer = beego.URLFor("TaskController.List")
 	}
 	this.redirect(refer)
 }
diff --git a/main.go b/main.go
@@ -17,8 +17,8 @@ func main() {
 	jobs.InitJobs()
 
 	// 设置默认404页面
-	beego.Errorhandler("404", func(rw http.ResponseWriter, r *http.Request) {
-		t, _ := template.New("404.html").ParseFiles(beego.ViewsPath + "/error/404.html")
+	beego.ErrorHandler("404", func(rw http.ResponseWriter, r *http.Request) {
+		t, _ := template.New("404.html").ParseFiles(beego.BConfig.WebConfig.ViewsPath + "/error/404.html")
 		data := make(map[string]interface{})
 		data["content"] = "page not found"
 		t.Execute(rw, data)
@@ -40,6 +40,6 @@ func main() {
 	beego.AutoRouter(&controllers.TaskController{})
 	beego.AutoRouter(&controllers.GroupController{})
 
-	beego.SessionOn = true
+	beego.BConfig.WebConfig.Session.SessionOn = true
 	beego.Run()
 }