Skip to content

Commit d18be54

Browse files
author
yangyang36
committed
将版本号1.1.1修改为1.2.0
1 parent 90e92a2 commit d18be54

File tree

68 files changed

+82
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+82
-69
lines changed

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 版本说明
22

3-
## 1.1.1-SNAPSHOT
3+
## 1.2.0-SNAPSHOT
44

55
### Enhancement
66

joyrpc-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>joyrpc-all</artifactId>

joyrpc-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

joyrpc-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

joyrpc-core/src/main/java/io/joyrpc/constants/Version.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public class Version {
3030
* 2.0.1-SNAPSHOT对应2010<br>
3131
* 2.0.1正式版对应2011
3232
*/
33-
public static final short BUILD_VERSION = 2110;
33+
public static final short BUILD_VERSION = 2200;
3434

3535
/**
3636
* 当前Build版本,每次发布修改
3737
*/
38-
public static final String BUILD_VERSION_TIME = "2.1.1_202008041450";
38+
public static final String BUILD_VERSION_TIME = "2.2.0_202008240950";
3939

4040
/**
4141
* 当前协议版本

joyrpc-example/joyrpc-example-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc-example</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

joyrpc-example/joyrpc-example-api/src/test/java/io/joyrpc/example/api/ApiClient.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import io.joyrpc.config.ConsumerConfig;
2424
import io.joyrpc.config.RegistryConfig;
2525
import io.joyrpc.example.service.DemoService;
26+
import io.joyrpc.example.service.vo.Java8TimeObj;
27+
import org.junit.Assert;
2628
import org.slf4j.Logger;
2729
import org.slf4j.LoggerFactory;
2830

@@ -38,11 +40,18 @@ public static void main(String[] args) {
3840
ConsumerConfig<DemoService> consumerConfig = new ConsumerConfig<>(); //consumer设置
3941
consumerConfig.setInterfaceClazz(DemoService.class.getName());
4042
consumerConfig.setAlias("joyrpc-demo");
41-
consumerConfig.setRegistry(new RegistryConfig("broadcast"));
43+
//consumerConfig.setRegistry(new RegistryConfig("broadcast"));
44+
consumerConfig.setRegistry(new RegistryConfig("fix", "grpc://127.0.0.1:22000"));
45+
consumerConfig.setTimeout(1000000);
4246
try {
4347
CompletableFuture<DemoService> future = consumerConfig.refer();
4448
DemoService service = future.get();
4549

50+
// 验证java8 时间对象
51+
/*Java8TimeObj java8TimeObj = Java8TimeObj.newJava8TimeObj();
52+
Java8TimeObj java8TimeObjRes = service.echoJava8TimeObj(java8TimeObj);
53+
Assert.assertEquals(java8TimeObj, java8TimeObjRes);*/
54+
4655
String echo = service.sayHello("hello"); //发起服务调用
4756
logger.info("Get msg: {} ", echo);
4857

joyrpc-example/joyrpc-example-api/src/test/java/io/joyrpc/example/api/ApiServer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import io.joyrpc.config.ServerConfig;
2626
import io.joyrpc.example.service.DemoService;
2727
import io.joyrpc.example.service.impl.DemoServiceImpl;
28+
import io.joyrpc.util.network.Ipv4;
2829
import org.slf4j.Logger;
2930
import org.slf4j.LoggerFactory;
3031

@@ -43,7 +44,8 @@ public static void main(String[] args) throws Exception {
4344
providerConfig.setInterfaceClazz(DemoService.class.getName());
4445
providerConfig.setRef(demoService);
4546
providerConfig.setAlias("joyrpc-demo");
46-
providerConfig.setRegistry(new RegistryConfig("broadcast"));
47+
//providerConfig.setRegistry(new RegistryConfig("broadcast"));
48+
providerConfig.setRegistry(new RegistryConfig("memory"));
4749

4850
providerConfig.exportAndOpen().whenComplete((v, t) -> {
4951
if (t != null) {
@@ -53,6 +55,8 @@ public static void main(String[] args) throws Exception {
5355
});
5456

5557

58+
59+
5660
providerConfig.setParameter("shutdownTimeout", 15000);
5761
System.in.read();
5862
}

joyrpc-example/joyrpc-example-boot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc-example</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

joyrpc-example/joyrpc-example-dubbo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>joyrpc-example</artifactId>
77
<groupId>io.joyrpc</groupId>
8-
<version>1.1.1-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)