eureka
tanghc 5 years ago
parent 7f368be0b5
commit ac1469eeeb
  1. 8
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java
  2. 12
      sop-website/sop-website-server/pom.xml
  3. 5
      sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java
  4. 2
      sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java
  5. 2
      sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/NacosServerService.java
  6. 5
      sop-website/sop-website-server/src/main/resources/application-dev.properties
  7. 21
      sop-website/src/main/resources/application-dev.properties

@ -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() {

@ -23,8 +23,8 @@
-->
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-bridge-nacos</artifactId>
<!--<artifactId>sop-bridge-eureka</artifactId>-->
<!-- <artifactId>sop-bridge-nacos</artifactId>-->
<artifactId>sop-bridge-eureka</artifactId>
<version>4.2.0-SNAPSHOT</version>
</dependency>
@ -70,6 +70,13 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>1.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@ -83,7 +90,6 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>

@ -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() {

@ -51,7 +51,7 @@ public class EurekaServerService implements ServerService {
}
List<EurekaInstance> instanceList = eurekaApplication.getInstance();
return instanceList.stream()
.map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.getPort())
.map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.fetchPort())
.collect(Collectors.toList());
}
return Collections.emptyList();

@ -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;

@ -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

@ -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
Loading…
Cancel
Save