8000 Merge pull request #6 from JavaCourse00/main · JavaCourse00/JavaCourseCodes@20ede77 · GitHub
[go: up one dir, main page]
Skip to content

Commit 20ede77

Browse files
EwenShengEwenSheng
authored
Merge pull request #6 from JavaCourse00/main
upgrade from kimking
2 parents 75b5b7f + 7fc6668 commit 20ede77

File tree

41 files changed

+853
-193
lines changed

Some content is hidden

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

41 files changed

+853
-193
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ hs_err_pid*
2727
classes/
2828
target/
2929
build/
30+
31+
.DS_Store

‎07rpc/rpc01/.DS_Store‎

-6 KB
Binary file not shown.

‎07rpc/rpc01/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
<description>RPC demo project for Spring Boot</description>
1717

1818
<modules>
19-
<module>rpcfx-api</module>
20-
<module>rpcfx-server</module>
21-
<module>rpcfx-client</module>
19+
<module>rpcfx-core</module>
20+
<module>rpcfx-demo-api</module>
21+
<module>rpcfx-demo-consumer</module>
22+
<module>rpcfx-demo-provider</module>
2223
</modules>
2324

2425
<properties>

‎07rpc/rpc01/rpcfx-client/pom.xml‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎07rpc/rpc01/rpcfx-client/src/main/java/io/kimmking/rpcfx/client/RpcfxClientApplication.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎07rpc/rpc01/rpcfx-client/src/main/resources/application.yml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎07rpc/rpc01/rpcfx-client/src/test/java/io/kimmking/rpcfx/client/Springboot01ApplicationTests.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

07rpc/rpc01/rpcfx-server/pom.xml renamed to 07rpc/rpc01/rpcfx-core/pom.xml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
<!-- <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
1010
</parent>
1111
<groupId>io.kimmking</groupId>
12-
<artifactId>rpcfx-server</artifactId>
12+
<artifactId>rpcfx-core</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<name>rpcfx-server</name>
14+
<name>rpcfx-core</name>
1515

1616
<properties>
1717
<java.version>1.8</java.version>
1818
</properties>
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>io.kimmking</groupId>
23-
<artifactId>rpcfx-api</artifactId>
24-
<version>${project.version}</version>
22+
<groupId>com.alibaba</groupId>
23+
<artifactId>fastjson</artifactId>
24+
<version>1.2.70</version>
2525
</dependency>
2626

2727
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter</artifactId>
28+
<groupId>com.squareup.okhttp3</groupId>
29+
<artifactId>okhttp</artifactId>
30+
<version>3.12.2</version>
3031
</dependency>
3132

3233
<dependency>
3334
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-starter-web</artifactId>
35+
<artifactId>spring-boot-starter</artifactId>
3536
</dependency>
3637

3738
<dependency>
38-
<groupId>com.alibaba</groupId>
39-
<artifactId>fastjson</artifactId>
40-
<version>1.2.70</version>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-starter-web</artifactId>
4141
</dependency>
4242

4343
<dependency>
@@ -53,13 +53,4 @@
5353
</dependency>
5454
</dependencies>
5555

56-
<build>
57-
<plugins>
58-
<plugin>
59-
<groupId>org.springframework.boot</groupId>
60-
<artifactId>spring-boot-maven-plugin</artifactId>
61-
</plugin>
62-
</plugins>
63-
</build>
64-
6556
</project>

07rpc/rpc01/rpcfx-api/src/main/java/io/kimmking/rpcfx/api/RpcfxRequest.java renamed to 07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/api/RpcfxRequest.java

File renamed without changes.

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/api/RpcfxResolver.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package io.kimmking.rpcfx.api;
2+
3+
public interface RpcfxResolver {
4+
5+
Object resolve(String serviceClass);
6+
7+
}

0 commit comments

Comments
 (0)
0