完善 IP 获取

polaris1119 · polaris1119 · commit 8278a63e5d3f · 2014-11-08T11:52:14.000+08:00
diff --git a/websites/code/studygolang/src/controller/websocket.go b/websites/code/studygolang/src/controller/websocket.go
@@ -7,13 +7,13 @@
 package controller
 
 import (
-	"go.net/websocket"
-	"logger"
-	"service"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
+
+	"go.net/websocket"
+	"logger"
+	"service"
 	"util"
 )
 
@@ -30,12 +30,7 @@ func WsHandler(wsConn *websocket.Conn) {
 	req := wsConn.Request()
 	user, err := strconv.Atoi(req.FormValue("uid"))
 	if err != nil || user == 0 {
-		remoteAddr := req.Header.Get("Remote_addr")
-		if remoteAddr == "" {
-			remoteAddr = req.RemoteAddr
-		}
-		pos := strings.LastIndex(remoteAddr, ":")
-		ip := remoteAddr[:pos]
+		ip := util.Ip(req)
 		logger.Debugln("user ip:", ip)
 		user = int(util.Ip2long(ip))
 	}
diff --git a/websites/code/studygolang/src/util/tool.go b/websites/code/studygolang/src/util/tool.go
@@ -7,8 +7,6 @@
 package util
 
 import (
-	"encoding/binary"
-	"net"
 	"strconv"
 	"strings"
 )
@@ -30,12 +28,3 @@ func Join(ins []int, sep string) string {
 	}
 	return strings.Join(strSlice, sep)
 }
-
-func Ip2long(ipstr string) uint32 {
-	ip := net.ParseIP(ipstr)
-	if ip == nil {
-		return 0
-	}
-	ip = ip.To4()
-	return binary.BigEndian.Uint32(ip)
-}
