Commit 3ffe0b78 by Nepxion

重构类结构

parent d15dc3a3
...@@ -51,29 +51,29 @@ public class RegisterStrategy { ...@@ -51,29 +51,29 @@ public class RegisterStrategy {
Map<String, String> filterMap = registerEntity.getFilterMap(); Map<String, String> filterMap = registerEntity.getFilterMap();
String filterValue = filterMap.get(serviceId); String filterValue = filterMap.get(serviceId);
String allFilterValue = ""; String allFilterIpAddress = "";
if (StringUtils.isNotEmpty(globalFilterValue)) { if (StringUtils.isNotEmpty(globalFilterValue)) {
allFilterValue += globalFilterValue; allFilterIpAddress += globalFilterValue;
} }
if (StringUtils.isNotEmpty(filterValue)) { if (StringUtils.isNotEmpty(filterValue)) {
allFilterValue += StringUtils.isEmpty(allFilterValue) ? filterValue : PluginConstant.SEPARATE + filterValue; allFilterIpAddress += StringUtils.isEmpty(allFilterIpAddress) ? filterValue : PluginConstant.SEPARATE + filterValue;
} }
switch (filterType) { switch (filterType) {
case BLACKLIST: case BLACKLIST:
validateBlacklist(allFilterValue, ipAddress); validateBlacklist(allFilterIpAddress, ipAddress);
break; break;
case WHITELIST: case WHITELIST:
validateWhitelist(allFilterValue, ipAddress); validateWhitelist(allFilterIpAddress, ipAddress);
break; break;
} }
} }
private void validateBlacklist(String filterValue, String ipAddress) { private void validateBlacklist(String filterIpAddress, String ipAddress) {
LOG.info("********** IP address blacklist={}, current ip address={} **********", filterValue, ipAddress); LOG.info("********** IP address blacklist={}, current ip address={} **********", filterIpAddress, ipAddress);
String[] filterArray = StringUtils.split(filterValue, PluginConstant.SEPARATE); String[] filterArray = StringUtils.split(filterIpAddress, PluginConstant.SEPARATE);
for (String filter : filterArray) { for (String filter : filterArray) {
if (ipAddress.startsWith(filter)) { if (ipAddress.startsWith(filter)) {
throw new PluginException(ipAddress + " isn't allowed to register to Eureka server, because it is in blacklist"); throw new PluginException(ipAddress + " isn't allowed to register to Eureka server, because it is in blacklist");
...@@ -81,11 +81,11 @@ public class RegisterStrategy { ...@@ -81,11 +81,11 @@ public class RegisterStrategy {
} }
} }
private void validateWhitelist(String filterValue, String ipAddress) { private void validateWhitelist(String filterIpAddress, String ipAddress) {
LOG.info("********** IP address whitelist={}, current ip address={} **********", filterValue, ipAddress); LOG.info("********** IP address whitelist={}, current ip address={} **********", filterIpAddress, ipAddress);
boolean valid = false; boolean valid = false;
String[] filterArray = StringUtils.split(filterValue, PluginConstant.SEPARATE); String[] filterArray = StringUtils.split(filterIpAddress, PluginConstant.SEPARATE);
for (String filter : filterArray) { for (String filter : filterArray) {
if (ipAddress.startsWith(filter)) { if (ipAddress.startsWith(filter)) {
valid = true; valid = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment