TomLiu-GitHub
diff --git a/‎src/db/conn.go
Lines changed: 6 additions & 3 deletions b/‎src/db/conn.go
Lines changed: 6 additions & 3 deletions
diff --git a/‎src/global/app.go
Lines changed: 1 addition & 1 deletion b/‎src/global/app.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/http/http.go
Lines changed: 20 additions & 0 deletions b/‎src/http/http.go
Lines changed: 20 additions & 0 deletions
diff --git a/‎src/logic/comment.go
Lines changed: 1 addition & 1 deletion b/‎src/logic/comment.go
Lines changed: 1 addition & 1 deletion
@@ -35,6 +35,11 @@ func init() {
 	if err = initEngine(); err != nil {
 		panic(err)
 	}
+
+	// 测试数据库连接是否 OK
+	if err = MasterDB.Ping(); err != nil {
+		panic(err)
+	}
 }
 
 var (
@@ -83,9 +88,7 @@ func TestDB() error {
 	}
 
 	// 初始化 MasterDB
-	Init()
-
-	return nil
+	return Init()
 }
 
 func Init() error {
 
@@ -36,7 +36,7 @@ import (
 )
 
 const (
-	DefaultCDNHttp  = "http://studygolang.qiniudn.com/"
+	DefaultCDNHttp  = "http://test.static.studygolang.com/"
 	DefaultCDNHttps = "https://static.studygolang.com/"
 )
 
 
@@ -12,6 +12,7 @@ import (
 	"global"
 	"html/template"
 	"logic"
+	"math"
 	"math/rand"
 	"model"
 	"net/http"
@@ -128,6 +129,9 @@ var funcMap = template.FuncMap{
 
 		return num1 % num2
 	},
+	"divide": func(num1, num2 int) int {
+		return int(math.Ceil(float64(num1) / float64(num2)))
+	},
 	"explode": func(s, sep string) []string {
 		return strings.Split(s, sep)
 	},
@@ -175,6 +179,19 @@ var funcMap = template.FuncMap{
 
 		return uri
 	},
+	"genList": func(n int, steps ...int) []int {
+		step := 1
+		if len(steps) > 0 {
+			step = steps[0]
+		}
+		num := int(math.Ceil(float64(n) / float64(step)))
+		nums := make([]int, num)
+		for i := 0; i < num; i++ {
+			nums[i] = i + 1
+		}
+
+		return nums
+	},
 }
 
 func tplInclude(file string, dot map[string]interface{}) template.HTML {
@@ -380,6 +397,9 @@ func executeTpl(ctx echo.Context, tpl *template.Template, data map[string]interf
 
 	data["setting"] = logic.WebsiteSetting
 
+	// 评论每页显示多少个
+	data["cmt_per_num"] = logic.CommentPerNum
+
 	// 记录处理时间
 	data["resp_time"] = time.Since(ctx.Get("req_start_time").(time.Time))
 
 
@@ -64,7 +64,7 @@ func (self CommentLogic) FindObjComments(ctx context.Context, objid, objtype int
 	return
 }
 
-const CommentPerNum = 5
+const CommentPerNum = 50
 
 // FindObjectComments 获得某个对象的所有评论（新版）
 func (self CommentLogic) FindObjectComments(ctx context.Context, objid, objtype, p int) (commentList []*model.Comment, replyComments []*model.Comment, pageNum int, err error) {
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ func init() {`
`35`	`35`	`if err = initEngine(); err != nil {`
`36`	`36`	`panic(err)`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ // 测试数据库连接是否 OK`
	`40`	`+ if err = MasterDB.Ping(); err != nil {`
	`41`	`+ panic(err)`
	`42`	`+ }`
`38`	`43`	`}`
`39`	`44`
`40`	`45`	`var (`
`@@ -83,9 +88,7 @@ func TestDB() error {`
`83`	`88`	`}`
`84`	`89`
`85`	`90`	`// 初始化 MasterDB`
`86`		`- Init()`
`87`		`-`
`88`		`- return nil`
	`91`	`+ return Init()`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`func Init() error {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`const (`
`39`		`- DefaultCDNHttp = "http://studygolang.qiniudn.com/"`
	`39`	`+ DefaultCDNHttp = "http://test.static.studygolang.com/"`
`40`	`40`	`DefaultCDNHttps = "https://static.studygolang.com/"`
`41`	`41`	`)`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (self CommentLogic) FindObjComments(ctx context.Context, objid, objtype int`
`64`	`64`	`return`
`65`	`65`	`}`
`66`	`66`
`67`		`-const CommentPerNum = 5`
	`67`	`+const CommentPerNum = 50`
`68`	`68`
`69`	`69`	`// FindObjectComments 获得某个对象的所有评论（新版）`
`70`	`70`	`func (self CommentLogic) FindObjectComments(ctx context.Context, objid, objtype, p int) (commentList []model.Comment, replyComments []model.Comment, pageNum int, err error) {`