export httpx.GetRemoteAddr

rest/internal/log.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 
 	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/rest/httpx"
 )
 
 const LogContext = "request_logs"
@@ -79,5 +80,5 @@ func formatf(r *http.Request, format string, v ...interface{}) string {
 }
 
 func formatWithReq(r *http.Request, v string) string {
-	return fmt.Sprintf("(%s - %s) %s", r.RequestURI, GetRemoteAddr(r), v)
+	return fmt.Sprintf("(%s - %s) %s", r.RequestURI, httpx.GetRemoteAddr(r), v)
 }

rest/internal/util.go

@@ -1,14 +0,0 @@
-package internal
-
-import "net/http"
-
-const xForwardFor = "X-Forward-For"
-
-// Returns the peer address, supports X-Forward-For
-func GetRemoteAddr(r *http.Request) string {
-	v := r.Header.Get(xForwardFor)
-	if len(v) > 0 {
-		return v
-	}
-	return r.RemoteAddr
-}

rest/internal/util_test.go

@@ -1,19 +0,0 @@
-package internal
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetRemoteAddr(t *testing.T) {
-	host := "8.8.8.8"
-	r, err := http.NewRequest(http.MethodGet, "/", strings.NewReader(""))
-	assert.Nil(t, err)
-
-	r.Header.Set(xForwardFor, host)
-	assert.Equal(t, host, GetRemoteAddr(r))
-}
-