diff --git a/README.md b/README.md index 9e1e947..747b8c7 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,12 @@ pom.xml 中定义了工程需要的依赖包（以下以基于 Spring Cloud Gree com.tencent.tsf spring-cloud-tsf-dependencies - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE pom diff --git a/consumer-demo/pom.xml b/consumer-demo/pom.xml index 38b5114..06113d1 100644 --- a/consumer-demo/pom.xml +++ b/consumer-demo/pom.xml @@ -5,7 +5,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE consumer-demo jar diff --git a/consumer-demo/src/main/java/com/tsf/demo/consumer/schedule/ScheduledProviderDemo.java b/consumer-demo/src/main/java/com/tsf/demo/consumer/schedule/ScheduledProviderDemo.java index 48a99c8..ce1f433 100644 --- a/consumer-demo/src/main/java/com/tsf/demo/consumer/schedule/ScheduledProviderDemo.java +++ b/consumer-demo/src/main/java/com/tsf/demo/consumer/schedule/ScheduledProviderDemo.java @@ -25,7 +25,7 @@ public class ScheduledProviderDemo { @Autowired private ProviderDemoService providerDemoService; - @Scheduled(fixedDelayString = "${consumer.auto.test.interval:1000}") + @Scheduled(fixedDelayString = "${consumer.auto.test.interval:500}") public void doWork() throws InterruptedException { TsfContext.putTag("test", "123"); TsfContext.putCustomMetadata(new CustomMetadata("test", "123")); diff --git a/consumer-demo/src/main/resources/bootstrap.yml b/consumer-demo/src/main/resources/bootstrap.yml index f29ae2c..6478ed4 100644 --- a/consumer-demo/src/main/resources/bootstrap.yml +++ b/consumer-demo/src/main/resources/bootstrap.yml @@ -13,6 +13,8 @@ tsf_namespace_id: default_namespace #方便本地自测调试 tsf: + sleuth: + samplerRate: 0.1 circuit-breaker: rules: - targetServiceName: provider-demo diff --git a/kafka-demo/kafka-consumer/pom.xml b/kafka-demo/kafka-consumer/pom.xml index ed7b463..229d4a1 100644 --- a/kafka-demo/kafka-consumer/pom.xml +++ b/kafka-demo/kafka-consumer/pom.xml @@ -5,7 +5,7 @@ kafka-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/kafka-demo/kafka-producer/pom.xml b/kafka-demo/kafka-producer/pom.xml index 6f6ddcd..c621ae7 100644 --- a/kafka-demo/kafka-producer/pom.xml +++ b/kafka-demo/kafka-producer/pom.xml @@ -5,7 +5,7 @@ kafka-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/kafka-demo/pom.xml b/kafka-demo/pom.xml index 510eeef..9265725 100644 --- a/kafka-demo/pom.xml +++ b/kafka-demo/pom.xml @@ -5,7 +5,7 @@ tsf-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/mongodb-demo/pom.xml b/mongodb-demo/pom.xml index a9c573d..e9c6304 100644 --- a/mongodb-demo/pom.xml +++ b/mongodb-demo/pom.xml @@ -5,7 +5,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE mongodb-demo diff --git a/msgw-demo/msgw-scg/pom.xml b/msgw-demo/msgw-scg/pom.xml index 00e0d53..84efddc 100644 --- a/msgw-demo/msgw-scg/pom.xml +++ b/msgw-demo/msgw-scg/pom.xml @@ -5,7 +5,7 @@ msgw-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 @@ -17,5 +17,20 @@ com.tencent.tsf spring-cloud-tsf-msgw-scg + + + com.tencent.tsf + spring-cloud-tsf-starter + + + org.springframework.boot + spring-boot-starter-tomcat + + + com.tencent.tsf + spring-cloud-tsf-swagger + + + - \ No newline at end of file + diff --git a/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/Application.java b/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/Application.java index ed940d9..4e6e1a7 100644 --- a/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/Application.java +++ b/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/Application.java @@ -1,18 +1,14 @@ package com.tencent.tsf.msgw.scg; -import com.tencent.tsf.monitor.annotation.EnableTsfMonitor; -import com.tencent.tsf.sleuth.annotation.EnableTsfSleuth; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.tsf.annotation.EnableTsf; /** * @author seanlxliu */ @SpringBootApplication -@EnableDiscoveryClient -@EnableTsfSleuth -@EnableTsfMonitor +@EnableTsf public class Application { public static void main(String[] args) { diff --git a/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/filter/TestFilter.java b/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/filter/TestFilter.java deleted file mode 100644 index aff8195..0000000 --- a/msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/filter/TestFilter.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tencent.tsf.msgw.scg.filter; - -import com.tencent.tsf.gateway.core.annotation.TsfGatewayFilter; -import com.tencent.tsf.gateway.scg.AbstractTsfGlobalFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.gateway.filter.GatewayFilterChain; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; - -/** - * @author seanlxliu - */ -@TsfGatewayFilter -public class TestFilter extends AbstractTsfGlobalFilter { - - private static final Logger logger = LoggerFactory.getLogger(TestFilter.class); - - @Override - public int getOrder() { - return 100; - } - - @Override - public boolean shouldFilter(ServerWebExchange exchange, GatewayFilterChain chain) { - return true; - } - - @Override - public Mono doFilter(ServerWebExchange exchange, GatewayFilterChain chain) { - System.out.println("hello world"); - logger.info("hello world"); - return chain.filter(exchange); - } -} diff --git a/msgw-demo/msgw-scg/src/main/resources/application.yml b/msgw-demo/msgw-scg/src/main/resources/application.yml index cd828fe..393bdc8 100644 --- a/msgw-demo/msgw-scg/src/main/resources/application.yml +++ b/msgw-demo/msgw-scg/src/main/resources/application.yml @@ -26,6 +26,7 @@ spring: scheme: HTTP logging: - file: /tsf-demo-logs/${spring.application.name}/root.log level: - root: INFO \ No newline at end of file + root: INFO + file: + name: /tsf-demo-logs/${spring.application.name}/root.log \ No newline at end of file diff --git a/msgw-demo/msgw-zuul1/pom.xml b/msgw-demo/msgw-zuul1/pom.xml index 63c2d7c..bb38b66 100644 --- a/msgw-demo/msgw-zuul1/pom.xml +++ b/msgw-demo/msgw-zuul1/pom.xml @@ -5,7 +5,7 @@ msgw-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/msgw-demo/msgw-zuul1/src/main/java/com.tencent.tsf.msgw.zuul1/filter/TestFilter.java b/msgw-demo/msgw-zuul1/src/main/java/com.tencent.tsf.msgw.zuul1/filter/TestFilter.java deleted file mode 100644 index 301d31f..0000000 --- a/msgw-demo/msgw-zuul1/src/main/java/com.tencent.tsf.msgw.zuul1/filter/TestFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.tencent.tsf.msgw.zuul1.filter; - -import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_TYPE; - -import com.netflix.zuul.exception.ZuulException; -import com.tencent.tsf.gateway.core.annotation.TsfGatewayFilter; -import com.tencent.tsf.gateway.zuul1.filter.TsfGatewayZuulFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 自定义Filter - * @author seanlxliu - * @since 2019/9/5 - */ -@TsfGatewayFilter -public class TestFilter extends TsfGatewayZuulFilter { - - private Logger logger = LoggerFactory.getLogger(TestFilter.class); - - - @Override - public String filterType() { - return PRE_TYPE; - } - - @Override - public int filterOrder() { - return 100; - } - - @Override - public boolean shouldFilter() { - return true; - } - - @Override - public Object run() throws ZuulException { - System.out.println("hello world"); - logger.info("hello world"); - - return null; - } -} diff --git a/msgw-demo/pom.xml b/msgw-demo/pom.xml index 83d655c..7f2fba7 100644 --- a/msgw-demo/pom.xml +++ b/msgw-demo/pom.xml @@ -5,7 +5,7 @@ tsf-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/mysql-demo/pom.xml b/mysql-demo/pom.xml index 21d3348..d931889 100644 --- a/mysql-demo/pom.xml +++ b/mysql-demo/pom.xml @@ -6,7 +6,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE mysql-demo diff --git a/opensource-scg-demo/pom.xml b/opensource-scg-demo/pom.xml index 0add95b..b935cc7 100644 --- a/opensource-scg-demo/pom.xml +++ b/opensource-scg-demo/pom.xml @@ -5,7 +5,7 @@ com.tencent.tsf spring-cloud-tsf-dependencies - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/opensource-zuul-demo/pom.xml b/opensource-zuul-demo/pom.xml index 149ffdc..2dcc02a 100644 --- a/opensource-zuul-demo/pom.xml +++ b/opensource-zuul-demo/pom.xml @@ -4,7 +4,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE opensource-zuul-demo diff --git a/pom.xml b/pom.xml index 2e1da30..032f86b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ com.tencent.tsf spring-cloud-tsf-dependencies - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE pom diff --git a/provider-demo/pom.xml b/provider-demo/pom.xml index 4a88a67..4e74f13 100644 --- a/provider-demo/pom.xml +++ b/provider-demo/pom.xml @@ -4,7 +4,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE provider-demo diff --git a/redis-demo/pom.xml b/redis-demo/pom.xml index cf87053..71c9e39 100644 --- a/redis-demo/pom.xml +++ b/redis-demo/pom.xml @@ -6,7 +6,7 @@ com.tencent.tsf tsf-demo - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE redis-demo diff --git a/rocketmq-demo/pom.xml b/rocketmq-demo/pom.xml index 33c89f7..bedbef2 100644 --- a/rocketmq-demo/pom.xml +++ b/rocketmq-demo/pom.xml @@ -5,7 +5,7 @@ tsf-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/rocketmq-demo/rocketmq-consumer/pom.xml b/rocketmq-demo/rocketmq-consumer/pom.xml index 3aef52e..e703e86 100644 --- a/rocketmq-demo/rocketmq-consumer/pom.xml +++ b/rocketmq-demo/rocketmq-consumer/pom.xml @@ -5,7 +5,7 @@ rocketmq-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/rocketmq-demo/rocketmq-producer/pom.xml b/rocketmq-demo/rocketmq-producer/pom.xml index 044a122..8868cb3 100644 --- a/rocketmq-demo/rocketmq-producer/pom.xml +++ b/rocketmq-demo/rocketmq-producer/pom.xml @@ -5,7 +5,7 @@ rocketmq-demo com.tencent.tsf - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0 diff --git a/task-schedule-demo/pom.xml b/task-schedule-demo/pom.xml index a2e7a5a..a00cbd7 100644 --- a/task-schedule-demo/pom.xml +++ b/task-schedule-demo/pom.xml @@ -5,7 +5,7 @@ com.tencent.tsf spring-cloud-tsf-parent - 1.23.0-Greenwich-RELEASE + 1.29.21-Hoxton-Higher-RELEASE 4.0.0