From 4d8b7b5f160e70d38fae378d9341e61bfa54d349 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 20 Jun 2025 17:41:57 +0800
Subject: [PATCH] test .

---
 .../Holiday/Controller/HolidaysController.cs   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.Basic/Common/Holiday/Controller/HolidaysController.cs b/Src/Dlhis.Basic/Common/Holiday/Controller/HolidaysController.cs
index 26ac48c8..75cd31b0 100644
--- a/Src/Dlhis.Basic/Common/Holiday/Controller/HolidaysController.cs
+++ b/Src/Dlhis.Basic/Common/Holiday/Controller/HolidaysController.cs
@@ -50,10 +50,20 @@ public class HolidaysController : ControllerBase
 
     [AllowAnonymous]
     [HttpGet("remote-ip")]
-    public async Task<string> GetRemoteIp()
+    public string GetRemoteIp()
     {
-        // 获取远程IP地址
-        var remoteIp = HttpContext.Connection.RemoteIpAddress?.ToString();
-        return await Task.FromResult(remoteIp);
+        // 检查是否在Kubernetes环境中
+        var isKubernetes = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("KUBERNETES_SERVICE_HOST"));
+
+        if (isKubernetes)
+        {
+            var forwardedFor = HttpContext.Request.Headers["X-Forwarded-For"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(forwardedFor))
+            {
+                return forwardedFor.Split(',').First().Trim();
+            }
+        }
+
+        return HttpContext.Connection.RemoteIpAddress?.ToString();
     }
 }
\ No newline at end of file