Merge branch 'master' into revision

polaris1119 · polaris1119 · commit fad81cd6a4ff · 2014-11-08T10:57:34.000+08:00
diff --git a/websites/code/studygolang/src/controller/websocket.go b/websites/code/studygolang/src/controller/websocket.go
@@ -30,8 +30,13 @@ func WsHandler(wsConn *websocket.Conn) {
 	req := wsConn.Request()
 	user, err := strconv.Atoi(req.FormValue("uid"))
 	if err != nil || user == 0 {
-		pos := strings.LastIndex(req.RemoteAddr, ":")
-		ip := req.RemoteAddr[:pos]
+		remoteAddr := req.Header.Get("Remote_addr")
+		if remoteAddr == "" {
+			remoteAddr = req.RemoteAddr
+		}
+		pos := strings.LastIndex(remoteAddr, ":")
+		ip := remoteAddr[:pos]
+		logger.Debugln("user ip:", ip)
 		user = int(util.Ip2long(ip))
 	}
 	userData := service.Book.AddUser(user, serverId)
