diff --git a/rc-auth/src/main/java/com/red/circle/auth/common/LoginAccessValidationService.java b/rc-auth/src/main/java/com/red/circle/auth/common/LoginAccessValidationService.java index 747ec451..6d3ec76b 100644 --- a/rc-auth/src/main/java/com/red/circle/auth/common/LoginAccessValidationService.java +++ b/rc-auth/src/main/java/com/red/circle/auth/common/LoginAccessValidationService.java @@ -39,10 +39,10 @@ public class LoginAccessValidationService { "香港", "澳门", "澳門", "台湾", "台灣", "Hong Kong", "Macau", "Macao", "Taiwan" ); private static final List BLOCKED_COUNTRY_CODES = List.of( - "MO", "SG" + "MO" ); private static final List BLOCKED_COUNTRY_NAMES = List.of( - "澳门", "澳門", "Macau", "Macao", "新加坡", "Singapore" + "澳门", "澳門", "Macau", "Macao" ); private static final List IP_GEO_PROVIDERS = List.of( new IpGeoProvider("ip.sb", "https://api.ip.sb/geoip/%s"), diff --git a/rc-auth/src/test/java/com/red/circle/auth/common/LoginAccessValidationServiceTest.java b/rc-auth/src/test/java/com/red/circle/auth/common/LoginAccessValidationServiceTest.java index 36991a35..af46b42f 100644 --- a/rc-auth/src/test/java/com/red/circle/auth/common/LoginAccessValidationServiceTest.java +++ b/rc-auth/src/test/java/com/red/circle/auth/common/LoginAccessValidationServiceTest.java @@ -98,12 +98,12 @@ public class LoginAccessValidationServiceTest { } @Test - public void blockSingaporeCountryCode() { + public void allowSingaporeCountryCode() { JSONObject data = JSON.parseObject(""" {"country_id":"SG","country":"Singapore","region":""} """); - assertTrue(LoginAccessValidationService.isBlockedIpRegion(data)); + assertFalse(LoginAccessValidationService.isBlockedIpRegion(data)); } @Test diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/utils/IpCountryUtils.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/utils/IpCountryUtils.java index 9374c750..fbc408e3 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/utils/IpCountryUtils.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/utils/IpCountryUtils.java @@ -32,10 +32,10 @@ public class IpCountryUtils { "香港", "澳门", "澳門", "台湾", "台灣", "Hong Kong", "Macau", "Macao", "Taiwan" ); private static final List BLOCKED_COUNTRY_CODES = List.of( - "MO", "SG" + "MO" ); private static final List BLOCKED_COUNTRY_NAMES = List.of( - "澳门", "澳門", "Macau", "Macao", "新加坡", "Singapore" + "澳门", "澳門", "Macau", "Macao" ); private static final List IP_GEO_PROVIDERS = List.of( new IpGeoProvider("ip.sb", "https://api.ip.sb/geoip/%s"), diff --git a/rc-service/rc-service-other/other-infrastructure/src/test/java/com/red/circle/other/infra/utils/IpCountryUtilsTest.java b/rc-service/rc-service-other/other-infrastructure/src/test/java/com/red/circle/other/infra/utils/IpCountryUtilsTest.java index 3af523ee..98b3a47a 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/test/java/com/red/circle/other/infra/utils/IpCountryUtilsTest.java +++ b/rc-service/rc-service-other/other-infrastructure/src/test/java/com/red/circle/other/infra/utils/IpCountryUtilsTest.java @@ -92,10 +92,10 @@ public class IpCountryUtilsTest { } @Test - public void blockSingaporeCountryCode() { + public void allowSingaporeCountryCode() { IpCountryUtils.IpGeoData data = new IpCountryUtils.IpGeoData("SG", "Singapore", "", "test"); - assertTrue(IpCountryUtils.isBlockedIpRegion(data)); + assertFalse(IpCountryUtils.isBlockedIpRegion(data)); } @Test