今早释放锁

polaris1119 · polaris1119 · commit c10d2127442b · 2016-06-03T23:09:49.000+08:00
diff --git a/websites/code2/studygolang/src/http/controller/search.go b/websites/code2/studygolang/src/http/controller/search.go
@@ -30,7 +30,7 @@ func (SearchController) Search(ctx echo.Context) error {
 		"f":        field,
 	}
 	if err == nil {
-		uri := "/search?q=" + q + "&f=" + field
+		uri := "/search?q=" + q + "&f=" + field + "&"
 		paginator := logic.NewPaginatorWithPerPage(p, rows)
 		data["pageHtml"] = paginator.SetTotal(int64(respBody.NumFound)).GetPageHtml(uri)
 	}
diff --git a/websites/code2/studygolang/src/logic/book.go b/websites/code2/studygolang/src/logic/book.go
@@ -92,8 +92,9 @@ func (this *book) AddUser(user, serverId int) *UserData {
 	var userData *UserData
 	var ok bool
 	this.rwMutex.Lock()
-	defer this.rwMutex.Unlock()
 	if userData, ok = this.users[user]; ok {
+		this.rwMutex.Unlock()
+
 		userData.InitMessageQueue(serverId)
 		userData.onlineDuartion += time.Now().Sub(userData.lastAccessTime)
 		userData.lastAccessTime = time.Now()
@@ -103,12 +104,15 @@ func (this *book) AddUser(user, serverId int) *UserData {
 			lastAccessTime: time.Now(),
 		}
 		this.users[user] = userData
+		length := len(this.users)
+
+		this.rwMutex.Unlock()
 
-		onlineInfo := map[string]int{"online": len(this.users)}
+		onlineInfo := map[string]int{"online": length}
 		// 在线人数超过历史最高
-		if len(this.users) > MaxOnlineNum() {
+		if length > MaxOnlineNum() {
 			maxRwMu.Lock()
-			maxOnlineNum = len(this.users)
+			maxOnlineNum = length
 			onlineInfo["maxonline"] = maxOnlineNum
 			maxRwMu.Unlock()
 			saveMaxOnlineNum()

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (SearchController) Search(ctx echo.Context) error {`
`30`	`30`	`"f": field,`
`31`	`31`	`}`
`32`	`32`	`if err == nil {`
`33`		`- uri := "/search?q=" + q + "&f=" + field`
	`33`	`+ uri := "/search?q=" + q + "&f=" + field + "&"`
`34`	`34`	`paginator := logic.NewPaginatorWithPerPage(p, rows)`
`35`	`35`	`data["pageHtml"] = paginator.SetTotal(int64(respBody.NumFound)).GetPageHtml(uri)`
`36`	`36`	`}`