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 749bb614..9cb58826 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( - "HK", "MO", "SG", "TW" + "MO", "SG", "TW" ); private static final List BLOCKED_COUNTRY_NAMES = List.of( - "香港", "澳门", "澳門", "台湾", "台灣", "Hong Kong", "Macau", "Macao", "Taiwan", "新加坡", "Singapore" + "澳门", "澳門", "台湾", "台灣", "Macau", "Macao", "Taiwan", "新加坡", "Singapore" ); 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 67acab0e..6c9dd628 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 @@ -70,13 +70,22 @@ public class LoginAccessValidationServiceTest { } @Test - public void blockHongKongRegion() { + public void allowHongKongRegion() { JSONObject data = JSON.parseObject(""" {"country_id":"CN","country":"中国","region":"香港"} """); assertFalse(LoginAccessValidationService.isMainlandChina(data)); - assertTrue(LoginAccessValidationService.isBlockedIpRegion(data)); + assertFalse(LoginAccessValidationService.isBlockedIpRegion(data)); + } + + @Test + public void allowHongKongCountryCode() { + JSONObject data = JSON.parseObject(""" + {"country_id":"HK","country":"Hong Kong","region":"Kwai Tsing District"} + """); + + assertFalse(LoginAccessValidationService.isBlockedIpRegion(data)); } @Test