增加代理ip解析

server/src/main/java/com/fanjiao/captcha/server/CaptchaController.java

@@ -36,17 +36,7 @@ public class CaptchaController {
             @RequestBody(required = false) GenerateCaptchaData data
     ) {
         var type = getRandomType();
-        var ip = request.getRemoteAddr();
-
-        var proxyIp = request.getHeader("x-forwarded-for");
-        if (proxyIp != null && !proxyIp.isEmpty()) {
-            ip = proxyIp.split(",")[0].trim();
-        } else {
-            proxyIp = request.getHeader("x-real-ip");
-            if (proxyIp != null && !proxyIp.isEmpty()) {
-                ip = proxyIp;
-            }
-        }
+        var ip = getIpFromRequest(request);
 
         Map<String, Object> extra = null;
         if (data != null) {
@@ -94,7 +84,7 @@ public class CaptchaController {
             HttpServletRequest request,
             @RequestBody CheckCaptchaData data
     ) {
-        String ip = request.getRemoteAddr();
+        String ip = getIpFromRequest(request);
         //校验验证码
         var result = imageCaptchaApplication.matching(
                 data.getKey(),
@@ -155,4 +145,17 @@ public class CaptchaController {
             return Response.success(info);
         }
     }
+
+    protected static String getIpFromRequest(HttpServletRequest request) {
+        var proxyIp = request.getHeader("x-forwarded-for");
+        if (proxyIp != null && !proxyIp.isEmpty()) {
+            return proxyIp.split(",")[0].trim();
+        }
+
+        proxyIp = request.getHeader("x-real-ip");
+        if (proxyIp != null && !proxyIp.isEmpty()) {
+            return proxyIp;
+        }
+        return request.getRemoteAddr();
+    }
 }