Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #963] to support registering instance with host name #1079

Merged
merged 4 commits into from
Apr 23, 2019
Merged

[ISSUE #963] to support registering instance with host name #1079

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cb3878
to support registering instance with host name
Albert-Hugo Apr 19, 2019
e6f82a9
remove useless validate code
Albert-Hugo Apr 20, 2019
c896e37
Merge remote-tracking branch 'upstream/develop' into feature_host_nam…
Albert-Hugo Apr 20, 2019
b67956f
add only digit and dot char for ip validation
Albert-Hugo Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions naming/src/main/java/com/alibaba/nacos/naming/core/Instance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,11 @@ public String generateInstanceId() {

public boolean validate() {

Matcher matcher = IP_PATTERN.matcher(getIp() + ":" + getPort());
if (!matcher.matches()) {
return false;
if (getIp().contains(UtilsAndCommons.IP_PORT_SPLITER)) {
Albert-Hugo marked this conversation as resolved.
Show resolved Hide resolved
Matcher matcher = IP_PATTERN.matcher(getIp() + ":" + getPort());
if (!matcher.matches()) {
return false;
}
}

if (getWeight() > MAX_WEIGHT_VALUE || getWeight() < MIN_WEIGHT_VALUE) {
Expand Down