diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java index a3a20805..2eee72ef 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java @@ -4,6 +4,7 @@ import okhttp3.MediaType; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.internal.http.HttpMethod; +import org.springframework.util.StringUtils; /** * https://github.com/Netflix/eureka/wiki/Eureka-REST-operations @@ -60,16 +61,13 @@ public enum EurekaUri { } public Request getRequest(String url, String... args) { - if (url.endsWith("/")) { - url = url.substring(0, url.length() - 1); - } + url = StringUtils.trimTrailingCharacter(url, '/'); String requestUrl = url + getUri(args); - Request request = this.getBuilder() + return this.getBuilder() .url(requestUrl) .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); - return request; } public Request.Builder getBuilder() { diff --git a/sop-website/sop-website-server/pom.xml b/sop-website/sop-website-server/pom.xml index 403b3532..985a9f69 100644 --- a/sop-website/sop-website-server/pom.xml +++ b/sop-website/sop-website-server/pom.xml @@ -23,8 +23,8 @@ --> com.gitee.sop - sop-bridge-nacos - + + sop-bridge-eureka 4.2.0-SNAPSHOT @@ -70,6 +70,13 @@ mysql-connector-java + + com.alibaba.nacos + nacos-api + 1.3.3 + compile + + org.projectlombok lombok @@ -83,7 +90,6 @@ test - diff --git a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java index 8f4b2d1b..14beaab9 100644 --- a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java +++ b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java @@ -5,6 +5,7 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.internal.http.HttpMethod; import org.apache.commons.lang.ArrayUtils; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMethod; /** @@ -49,13 +50,13 @@ public enum EurekaUri { } public Request getRequest(String url, String... args) { + url = StringUtils.trimTrailingCharacter(url, '/'); String requestUrl = url + getUri(args); - Request request = this.getBuilder() + return this.getBuilder() .url(requestUrl) .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); - return request; } public Request.Builder getBuilder() { diff --git a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java index 03a67d2a..acde7efa 100644 --- a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java +++ b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java @@ -51,7 +51,7 @@ public class EurekaServerService implements ServerService { } List instanceList = eurekaApplication.getInstance(); return instanceList.stream() - .map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.getPort()) + .map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.fetchPort()) .collect(Collectors.toList()); } return Collections.emptyList(); diff --git a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/NacosServerService.java b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/NacosServerService.java index c2a8c8ce..6d1bd69f 100644 --- a/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/NacosServerService.java +++ b/sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/NacosServerService.java @@ -1,6 +1,5 @@ package com.gitee.sop.websiteserver.service.impl; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingFactory; @@ -9,7 +8,6 @@ import com.alibaba.nacos.api.naming.pojo.Instance; import com.gitee.sop.websiteserver.service.ServerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import javax.annotation.PostConstruct; diff --git a/sop-website/sop-website-server/src/main/resources/application-dev.properties b/sop-website/sop-website-server/src/main/resources/application-dev.properties index 1b15a8d4..77d9cfa2 100644 --- a/sop-website/sop-website-server/src/main/resources/application-dev.properties +++ b/sop-website/sop-website-server/src/main/resources/application-dev.properties @@ -8,7 +8,7 @@ mysql.host=localhost:3306 mysql.username=root mysql.password=root # 注册中心地址 -register.url=127.0.0.1:8848 +register.url=http://localhost:1111/eureka/ # 网关内网地址 # !!沙箱环境是提供给外部的测试环境,不能把正式环境当做沙箱环境来使用。 @@ -17,8 +17,7 @@ gateway.url=http://localhost:8081 logging.level.com.gitee=debug # ------- 需要改的配置end ------- -## nacos cloud配置 -spring.cloud.nacos.discovery.server-addr=${register.url} +eureka.client.serviceUrl.defaultZone=${register.url} # 页面上显示的测试环境地址 api.url-test=http://open-test.yourdomain.com diff --git a/sop-website/src/main/resources/application-dev.properties b/sop-website/src/main/resources/application-dev.properties deleted file mode 100644 index 192acaa4..00000000 --- a/sop-website/src/main/resources/application-dev.properties +++ /dev/null @@ -1,21 +0,0 @@ -server.port=8083 -spring.application.name=sop-website - -# ------- 需要改的配置 ------- -# 注册中心地址 -register.url=http://localhost:1111/eureka/ - -# 网关内网地址 -# !!沙箱环境是提供给外部的测试环境,不能把正式环境当做沙箱环境来使用。 -gateway.url=http://localhost:8081 -# ------- 需要改的配置end ------- - -eureka.client.serviceUrl.defaultZone=${register.url} - -# 页面上显示的测试环境地址 -api.url-test=http://open-test.yourdomain.com -# 沙箱环境 -api.url-sandbox=${gateway.url} -# 页面上显示的正式环境地址 -api.url-prod=http://open.yourdomain.com -api.pwd=doc#123