Skip to content

Release/1.29 hoxton higher #26

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

Open
wants to merge 9 commits into
base: release/1.23-greenwich
Choose a base branch
from
Open

Release/1.29 hoxton higher #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e7ff212
更新pom.xml 设置定时任务速度提高2倍 采样率设置为百分之10
Nov 15, 2021
794b16a
更新pom.xml 设置定时任务速度提高2倍 采样率设置为百分之10
Nov 15, 2021
194ab57
Merge pull request #25 from 871561674/release/1.29-greenwich
LilyJlLm Nov 16, 2021
ef52076
Merge pull request #27 from 871561674/release/1.29-hoxton-higher
LilyJlLm Nov 16, 2021
a9de19f
Update pom.xml
yangjuanying Mar 3, 2022
b6ea2fa
Update Application.java
yangjuanying Mar 3, 2022
b491d28
Merge pull request #35 from yangjuanying/patch-6
LilyJlLm Mar 3, 2022
f0e77d6
Merge pull request #34 from yangjuanying/patch-5
LilyJlLm Mar 3, 2022
2c2f080
feat:upgrade to 1.29.21-Hoxton-Higher-RELEASE.
shedfreez Oct 23, 2025
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ pom.xml 中定义了工程需要的依赖包（以下以基于 Spring Cloud Gree
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-dependencies</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion consumer-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<artifactId>consumer-demo</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion consumer-demo/src/main/java/com/tsf/demo/consumer/schedule/ScheduledProviderDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
2 changes: 2 additions & 0 deletions consumer-demo/src/main/resources/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ tsf_namespace_id: default_namespace

#方便本地自测调试
tsf:
sleuth:
samplerRate: 0.1
circuit-breaker:
rules:
- targetServiceName: provider-demo
Expand Down
2 changes: 1 addition & 1 deletion kafka-demo/kafka-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>kafka-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kafka-demo/kafka-producer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>kafka-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kafka-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tsf-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mongodb-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<artifactId>mongodb-demo</artifactId>
Expand Down
19 changes: 17 additions & 2 deletions msgw-demo/msgw-scg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>msgw-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -17,5 +17,20 @@
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-msgw-scg</artifactId>
</dependency>
<!--TSF 其它 SDK 依赖，添加到 msgw-scg 依赖的后面-->
<dependency>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-swagger</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
</project>
8 changes: 2 additions & 6 deletions msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
35 changes: 0 additions & 35 deletions msgw-demo/msgw-scg/src/main/java/com/tencent/tsf/msgw/scg/filter/TestFilter.java
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions msgw-demo/msgw-scg/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ spring:
scheme: HTTP

logging:
file: /tsf-demo-logs/${spring.application.name}/root.log
level:
root: INFO
root: INFO
file:
name: /tsf-demo-logs/${spring.application.name}/root.log
2 changes: 1 addition & 1 deletion msgw-demo/msgw-zuul1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>msgw-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
44 changes: 0 additions & 44 deletions msgw-demo/msgw-zuul1/src/main/java/com.tencent.tsf.msgw.zuul1/filter/TestFilter.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion msgw-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tsf-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mysql-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<artifactId>mysql-demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion opensource-scg-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-dependencies</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion opensource-zuul-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<artifactId>opensource-zuul-demo</artifactId>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-dependencies</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion provider-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<artifactId>provider-demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion redis-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>tsf-demo</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>

<artifactId>redis-demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion rocketmq-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tsf-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion rocketmq-demo/rocketmq-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>rocketmq-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion rocketmq-demo/rocketmq-producer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>rocketmq-demo</artifactId>
<groupId>com.tencent.tsf</groupId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion task-schedule-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.tsf</groupId>
<artifactId>spring-cloud-tsf-parent</artifactId>
<version>1.23.0-Greenwich-RELEASE</version>
<version>1.29.21-Hoxton-Higher-RELEASE</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down