This commit is contained in:
Daniel 2024-03-25 10:23:29 +08:00
parent ffd6459540
commit fa49681cd9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 7 additions and 8 deletions

View file

@ -27,7 +27,6 @@ import (
"github.com/88250/lute/ast"
"github.com/gin-gonic/gin"
"github.com/imroc/req/v3"
"github.com/olahol/melody"
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
)
@ -125,15 +124,15 @@ func isOnline(checkURL string, skipTlsVerify bool) (ret bool) {
return
}
func GetRemoteAddr(session *melody.Session) string {
ret := session.Request.Header.Get("X-forwarded-for")
func GetRemoteAddr(req *http.Request) string {
ret := req.Header.Get("X-forwarded-for")
ret = strings.TrimSpace(ret)
if "" == ret {
ret = session.Request.Header.Get("X-Real-IP")
ret = req.Header.Get("X-Real-IP")
}
ret = strings.TrimSpace(ret)
if "" == ret {
return session.Request.RemoteAddr
return req.RemoteAddr
}
return strings.Split(ret, ",")[0]
}