From 06c957aa7aeaed30450dd0034375d085c47db3b8 Mon Sep 17 00:00:00 2001
From: Halo Dev Bot <87291978+halo-dev-bot@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:49:08 +0800
Subject: [PATCH] [release-2.17] refactor: remove IP address judgment for
 device management (#6279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an automated cherry-pick of #6275

/assign JohnNiang

```release-note
设备管理去除 IP 地址检查以避免频繁登录
```
---
 .../java/run/halo/app/security/device/DeviceServiceImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/src/main/java/run/halo/app/security/device/DeviceServiceImpl.java b/application/src/main/java/run/halo/app/security/device/DeviceServiceImpl.java
index 72e6c77a6..c2ad61f17 100644
--- a/application/src/main/java/run/halo/app/security/device/DeviceServiceImpl.java
+++ b/application/src/main/java/run/halo/app/security/device/DeviceServiceImpl.java
@@ -100,10 +100,7 @@ public class DeviceServiceImpl implements DeviceService {
                     var userAgent =
                         exchange.getRequest().getHeaders().getFirst(HttpHeaders.USER_AGENT);
                     var deviceUa = existingDevice.getSpec().getUserAgent();
-                    var ipAddr = existingDevice.getSpec().getIpAddress();
-                    var clientIp = getClientIp(exchange.getRequest());
-                    if (!StringUtils.equals(deviceUa, userAgent)
-                        || !StringUtils.equals(clientIp, ipAddr)) {
+                    if (!StringUtils.equals(deviceUa, userAgent)) {
                         // User agent changed, create a new device
                         return Mono.empty();
                     }