Merge remote-tracking branch 'origin/TSF3' into TSF3

# Conflicts:
#	spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java
pull/1350/head
fuyuwei01 1 year ago
commit 3293f8ac79

@ -140,7 +140,7 @@ public class LosslessRegistryAspectTest {
assertThatCode(() -> {
assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse();
}).doesNotThrowAnyException();
// delay register after 10s
// delay register after 5s
Thread.sleep(10000);
PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class);
PolarisRegistration registration = context.getBean(PolarisRegistration.class);

@ -23,7 +23,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>

@ -23,7 +23,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>

@ -11,7 +11,7 @@ feign:
enabled: true
#本地测试时打开
#tsf_namespace_id: default_namespace
tsf_namespace_id: default_namespace
logging:
file:

@ -1,5 +1,5 @@
server:
port: 18081
port: 56789
spring:
application:
name: provider-demo
@ -7,6 +7,7 @@ spring:
import: optional:polaris
cloud:
polaris:
address: grpc://127.0.0.1:8091
namespace: default
enabled: true
stat:

Loading…
Cancel
Save