From 7c7949b0580c5220d24c63b54b1affd0420a265d Mon Sep 17 00:00:00 2001 From: p_huityu Date: Sun, 30 Oct 2022 10:57:51 +0800 Subject: [PATCH] [update] update version 1.7.3 --- README.md | 2 +- .../com/qq/tars/common/ClientVersion.java | 2 +- .../java/com/tencent/tars/TestExpired.java | 28 +++++++++---------- docs-en/tars-http-server.md | 2 +- docs-en/tars_java_quickstart.md | 10 +++---- docs-en/tars_java_spring.md | 2 +- docs-en/tars_java_spring_cloud.md | 4 +-- docs-en/tars_java_user_guide.md | 6 ++-- docs-en/tars_tracing.md | 4 +-- docs/tars_java_quickstart.md | 10 +++---- docs/tars_java_spring.md | 2 +- docs/tars_java_spring_boot.md | 2 +- docs/tars_java_spring_cloud.md | 4 +-- docs/tars_java_user_guide.md | 6 ++-- docs/tars_tracing.md | 4 +-- .../server/testapp/HelloServant.java | 2 +- .../server/testapp/HelloServant.java | 2 +- .../springcloud/test/server/HelloServant.java | 2 +- .../server/testapp/HelloServant.java | 2 +- pom.xml | 2 +- protobuf/README.md | 2 +- .../qq/tars/maven/gensrc/Tars2JavaMojo.java | 2 +- 22 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 46a21371..94fbb284 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ The following configuration needs to be added in pom.xml: com.tencent.tars tars-spring-boot-starter - 1.7.2 + 1.7.3 ``` diff --git a/core/src/main/java/com/qq/tars/common/ClientVersion.java b/core/src/main/java/com/qq/tars/common/ClientVersion.java index 22d8813f..077ac2de 100644 --- a/core/src/main/java/com/qq/tars/common/ClientVersion.java +++ b/core/src/main/java/com/qq/tars/common/ClientVersion.java @@ -23,7 +23,7 @@ public final class ClientVersion { // public static final String build = "1"; public static String getVersion() { - return "1.7.2"; + return "1.7.3"; } public String toString() { diff --git a/core/src/test/java/com/tencent/tars/TestExpired.java b/core/src/test/java/com/tencent/tars/TestExpired.java index 9b2d0618..bf91f39f 100644 --- a/core/src/test/java/com/tencent/tars/TestExpired.java +++ b/core/src/test/java/com/tencent/tars/TestExpired.java @@ -12,19 +12,19 @@ public class TestExpired { @Test public void testExpired() throws InterruptedException { - CommunicatorConfig cfg = new CommunicatorConfig(); - Communicator communicator = CommunicatorFactory.getInstance().getCommunicator(cfg); - HelloPrx proxy = communicator.stringToProxy(HelloPrx.class, "TestServer.HelloServer.HelloObj@tcp -h 127.0.0.1 -p 18605 -t 60000"); - proxy.promise_hello(1000, "hello world").thenCompose(x -> { - try { - // triggle ticket expired - Thread.sleep(5000l); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("invoke use promise " + x); - return CompletableFuture.completedFuture(0); - }); - Thread.sleep(10000l); +// CommunicatorConfig cfg = new CommunicatorConfig(); +// Communicator communicator = CommunicatorFactory.getInstance().getCommunicator(cfg); +// HelloPrx proxy = communicator.stringToProxy(HelloPrx.class, "TestServer.HelloServer.HelloObj@tcp -h 127.0.0.1 -p 18605 -t 60000"); +// proxy.promise_hello(1000, "hello world").thenCompose(x -> { +// try { +// // triggle ticket expired +// Thread.sleep(5000L); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// System.out.println("invoke use promise " + x); +// return CompletableFuture.completedFuture(0); +// }); +// Thread.sleep(10000l); } } diff --git a/docs-en/tars-http-server.md b/docs-en/tars-http-server.md index 42126f46..11cdfb08 100644 --- a/docs-en/tars-http-server.md +++ b/docs-en/tars-http-server.md @@ -56,7 +56,7 @@ The following configuration needs to be added in pom.xml: com.tencent.tars tars-spring-boot-starter - 1.7.2 + 1.7.3 ``` diff --git a/docs-en/tars_java_quickstart.md b/docs-en/tars_java_quickstart.md index c3eb2445..40af0f46 100644 --- a/docs-en/tars_java_quickstart.md +++ b/docs-en/tars_java_quickstart.md @@ -48,7 +48,7 @@ Add a dependency jar package by modifying pom.xml com.tencent.tars tars-server - 1.7.2 + 1.7.3 jar ``` @@ -59,7 +59,7 @@ Add a dependency jar package by modifying pom.xml com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -102,7 +102,7 @@ Tars provides plugins to compile and generate java code, only need to add java f com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -179,7 +179,7 @@ Execute "mvn package" in the project root directory to generate the war package, com.tencent.tars tars-client - 1.7.2 + 1.7.3 jar ``` @@ -190,7 +190,7 @@ Execute "mvn package" in the project root directory to generate the war package, com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 diff --git a/docs-en/tars_java_spring.md b/docs-en/tars_java_spring.md index db0f8bad..31528fd8 100644 --- a/docs-en/tars_java_spring.md +++ b/docs-en/tars_java_spring.md @@ -12,7 +12,7 @@ Using this function requires adding a dependency jar package and adding the foll com.tencent.tars tars-spring - 1.7.2 + 1.7.3 ``` diff --git a/docs-en/tars_java_spring_cloud.md b/docs-en/tars_java_spring_cloud.md index 4e6669e4..7684d18c 100644 --- a/docs-en/tars_java_spring_cloud.md +++ b/docs-en/tars_java_spring_cloud.md @@ -21,7 +21,7 @@ Here are the steps to create and publish a service: com.tencent.tars tars-spring-cloud-starter - 1.7.2 + 1.7.3 ``` @@ -109,7 +109,7 @@ Here's how to discover and access a service. com.tencent.tars tars-spring-cloud-starter - 1.7.2 + 1.7.3 ``` diff --git a/docs-en/tars_java_user_guide.md b/docs-en/tars_java_user_guide.md index 120ae580..8ced0d85 100644 --- a/docs-en/tars_java_user_guide.md +++ b/docs-en/tars_java_user_guide.md @@ -21,7 +21,7 @@ Add dependent jar packages in the build project **pom.xml** com.tencent.tars tars-server - 1.7.2 + 1.7.3 jar ``` @@ -30,7 +30,7 @@ Add dependent jar packages in the build project **pom.xml** com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -65,7 +65,7 @@ Provide plug-in compile to generate java code, add java file configuration in ta com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 diff --git a/docs-en/tars_tracing.md b/docs-en/tars_tracing.md index 1a2b9b1b..42644255 100644 --- a/docs-en/tars_tracing.md +++ b/docs-en/tars_tracing.md @@ -93,7 +93,7 @@ The integrated zipkin system is built in the framework, users can query call cha ## Tars-java Usage -At present, tars-java supports the call chain from version 1.7.2, and the cpp version is about to be released. The following is an example of integrated zipkin. +At present, tars-java supports the call chain from version 1.7.3, and the cpp version is about to be released. The following is an example of integrated zipkin. ### Enable the call chain @@ -137,7 +137,7 @@ Notes: > > com.tencent.tars > tars-core -> 1.7.2 +> 1.7.3 > > > org.apache.kafka diff --git a/docs/tars_java_quickstart.md b/docs/tars_java_quickstart.md index 0dbc5622..9a2eb168 100644 --- a/docs/tars_java_quickstart.md +++ b/docs/tars_java_quickstart.md @@ -46,7 +46,7 @@ com.tencent.tars tars-server - 1.7.2 + 1.7.3 jar ``` @@ -55,7 +55,7 @@ com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -91,7 +91,7 @@ module TestApp com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -159,7 +159,7 @@ public class HelloServantImpl implements HelloServant { com.tencent.tars tars-client - 1.7.2 + 1.7.3 jar ``` @@ -168,7 +168,7 @@ public class HelloServantImpl implements HelloServant { com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 diff --git a/docs/tars_java_spring.md b/docs/tars_java_spring.md index 003b31d8..bb4d20a2 100644 --- a/docs/tars_java_spring.md +++ b/docs/tars_java_spring.md @@ -12,7 +12,7 @@ Tars支持使用Spring配置servant，使用此功能需要依赖tars-spring.jar com.tencent.tars tars-spring - 1.7.2 + 1.7.3 ``` diff --git a/docs/tars_java_spring_boot.md b/docs/tars_java_spring_boot.md index 57e96ff5..7e10696f 100644 --- a/docs/tars_java_spring_boot.md +++ b/docs/tars_java_spring_boot.md @@ -31,7 +31,7 @@ demo工程参考[demo工程](https://github.com/TarsCloud/TarsJava/tree/master/e com.tencent.tars tars-spring-boot-starter - 1.7.2 + 1.7.3 ``` diff --git a/docs/tars_java_spring_cloud.md b/docs/tars_java_spring_cloud.md index 7c7008d7..3d8722b0 100644 --- a/docs/tars_java_spring_cloud.md +++ b/docs/tars_java_spring_cloud.md @@ -22,7 +22,7 @@ com.tencent.tars tars-spring-cloud-starter - 1.7.2 + 1.7.3 ``` @@ -110,7 +110,7 @@ tars: com.tencent.tars tars-spring-cloud-starter - 1.7.2 + 1.7.3 ``` diff --git a/docs/tars_java_user_guide.md b/docs/tars_java_user_guide.md index 2ff6a910..d25dca58 100644 --- a/docs/tars_java_user_guide.md +++ b/docs/tars_java_user_guide.md @@ -21,7 +21,7 @@ com.tencent.tars tars-server - 1.7.2 + 1.7.3 jar ``` @@ -30,7 +30,7 @@ com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 @@ -65,7 +65,7 @@ module TestApp com.tencent.tars tars-maven-plugin - 1.7.2 + 1.7.3 diff --git a/docs/tars_tracing.md b/docs/tars_tracing.md index 24da6f41..209488d3 100644 --- a/docs/tars_tracing.md +++ b/docs/tars_tracing.md @@ -92,7 +92,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并 ## tars-java 使用方法 -目前tars -java从 1.7.2版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。 +目前tars -java从 1.7.3版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。 ### 开启调用链 @@ -136,7 +136,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并 > > com.tencent.tars > tars-core -> 1.7.2 +> 1.7.3 > > > org.apache.kafka diff --git a/examples/quickstart-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java b/examples/quickstart-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java index fe6b1d1a..191f9ab5 100644 --- a/examples/quickstart-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java +++ b/examples/quickstart-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java @@ -1,6 +1,6 @@ // ********************************************************************** // This file was generated by a TARS parser! -// TARS version 1.7.2. +// TARS version 1.7.3. // ********************************************************************** package com.qq.tars.quickstart.server.testapp; diff --git a/examples/tars-spring-boot-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java b/examples/tars-spring-boot-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java index be341470..b7e14804 100644 --- a/examples/tars-spring-boot-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java +++ b/examples/tars-spring-boot-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java @@ -1,6 +1,6 @@ // ********************************************************************** // This file was generated by a TARS parser! -// TARS version 1.7.2. +// TARS version 1.7.3. // ********************************************************************** package com.qq.tars.quickstart.server.testapp; diff --git a/examples/tars-spring-cloud-server/src/main/java/com/qq/tars/springcloud/test/server/HelloServant.java b/examples/tars-spring-cloud-server/src/main/java/com/qq/tars/springcloud/test/server/HelloServant.java index be341470..b7e14804 100644 --- a/examples/tars-spring-cloud-server/src/main/java/com/qq/tars/springcloud/test/server/HelloServant.java +++ b/examples/tars-spring-cloud-server/src/main/java/com/qq/tars/springcloud/test/server/HelloServant.java @@ -1,6 +1,6 @@ // ********************************************************************** // This file was generated by a TARS parser! -// TARS version 1.7.2. +// TARS version 1.7.3. // ********************************************************************** package com.qq.tars.quickstart.server.testapp; diff --git a/examples/tars-spring-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java b/examples/tars-spring-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java index be341470..b7e14804 100644 --- a/examples/tars-spring-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java +++ b/examples/tars-spring-server/src/main/java/com/qq/tars/quickstart/server/testapp/HelloServant.java @@ -1,6 +1,6 @@ // ********************************************************************** // This file was generated by a TARS parser! -// TARS version 1.7.2. +// TARS version 1.7.3. // ********************************************************************** package com.qq.tars.quickstart.server.testapp; diff --git a/pom.xml b/pom.xml index 6aec3852..5cace1b2 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ - 1.7.2 + 1.7.3 1.8 1.8 UTF-8 diff --git a/protobuf/README.md b/protobuf/README.md index 5ef89995..52ab5fbb 100644 --- a/protobuf/README.md +++ b/protobuf/README.md @@ -6,7 +6,7 @@ com.tencent.tars tars-protobuf - 1.7.2 + 1.7.3 ``` 然后使用java-protobuf-plugin插件配合pb生成代码，详细使用方式参见 diff --git a/tools/tars-maven-plugin/src/main/java/com/qq/tars/maven/gensrc/Tars2JavaMojo.java b/tools/tars-maven-plugin/src/main/java/com/qq/tars/maven/gensrc/Tars2JavaMojo.java index 508c6bbb..1a1229dd 100644 --- a/tools/tars-maven-plugin/src/main/java/com/qq/tars/maven/gensrc/Tars2JavaMojo.java +++ b/tools/tars-maven-plugin/src/main/java/com/qq/tars/maven/gensrc/Tars2JavaMojo.java @@ -166,7 +166,7 @@ private void genJava(String nsName, List namespaces, Map