diff --git a/examples/local-rpc-lient/.gitignore b/examples/local-rpc-client/.gitignore similarity index 100% rename from examples/local-rpc-lient/.gitignore rename to examples/local-rpc-client/.gitignore diff --git a/examples/local-rpc-lient/.mvn/wrapper/maven-wrapper.jar b/examples/local-rpc-client/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from examples/local-rpc-lient/.mvn/wrapper/maven-wrapper.jar rename to examples/local-rpc-client/.mvn/wrapper/maven-wrapper.jar diff --git a/examples/local-rpc-lient/.mvn/wrapper/maven-wrapper.properties b/examples/local-rpc-client/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from examples/local-rpc-lient/.mvn/wrapper/maven-wrapper.properties rename to examples/local-rpc-client/.mvn/wrapper/maven-wrapper.properties diff --git a/examples/local-rpc-lient/mvnw b/examples/local-rpc-client/mvnw similarity index 100% rename from examples/local-rpc-lient/mvnw rename to examples/local-rpc-client/mvnw diff --git a/examples/local-rpc-lient/mvnw.cmd b/examples/local-rpc-client/mvnw.cmd similarity index 100% rename from examples/local-rpc-lient/mvnw.cmd rename to examples/local-rpc-client/mvnw.cmd diff --git a/examples/local-rpc-lient/pom.xml b/examples/local-rpc-client/pom.xml similarity index 95% rename from examples/local-rpc-lient/pom.xml rename to examples/local-rpc-client/pom.xml index afdd6bb..81689d2 100644 --- a/examples/local-rpc-lient/pom.xml +++ b/examples/local-rpc-client/pom.xml @@ -4,11 +4,10 @@ 4.0.0 io.github.forezp - local-rpc-lient + local-rpc-client 1.0.6 jar - - local-rpc-lient + local-rpc-client Demo project for Spring Boot @@ -30,19 +29,16 @@ io.github.forezp boot-netty-rpc-core ${netty.rpc.core} - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-test test - diff --git a/examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java b/examples/local-rpc-client/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java similarity index 86% rename from examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java rename to examples/local-rpc-client/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java index b1e7ca5..bc962b8 100644 --- a/examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java +++ b/examples/local-rpc-client/src/main/java/com/forezp/localrpclient/LocalRpcLientApplication.java @@ -3,7 +3,6 @@ import com.forezp.localrpclient.client.IGreeting; import io.github.forezp.netty.rpc.core.annotation.EnableNettyRpc; import io.github.forezp.netty.rpc.core.common.dto.RespDTO; - import io.github.forezp.netty.rpc.core.monitor.trace.MonitorMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; @@ -20,22 +19,20 @@ public class LocalRpcLientApplication { public static void main(String[] args) { - SpringApplication.run( LocalRpcLientApplication.class, args ); + SpringApplication.run(LocalRpcLientApplication.class, args); } - @Autowired IGreeting greeting; @GetMapping("/test") public RespDTO test() throws Exception { - // IGreeting invoker = (IGreeting) Invoker.invoke( IGreeting.class ); // Object result = invoker.sayHello( "sww" ); - Object object = greeting.sayHello( "hi" ); - - return RespDTO.success( object ); + //调用服务端sayHello()方法 + Object object = greeting.sayHello("zhangsan"); + return RespDTO.success(object); } @PostMapping("/postmsg") diff --git a/examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/client/IGreeting.java b/examples/local-rpc-client/src/main/java/com/forezp/localrpclient/client/IGreeting.java similarity index 99% rename from examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/client/IGreeting.java rename to examples/local-rpc-client/src/main/java/com/forezp/localrpclient/client/IGreeting.java index d2f2e01..1c3ebe4 100644 --- a/examples/local-rpc-lient/src/main/java/com/forezp/localrpclient/client/IGreeting.java +++ b/examples/local-rpc-client/src/main/java/com/forezp/localrpclient/client/IGreeting.java @@ -12,4 +12,5 @@ public interface IGreeting { String sayHello(String name); + } diff --git a/examples/local-rpc-client/src/main/resources/application.yml b/examples/local-rpc-client/src/main/resources/application.yml new file mode 100644 index 0000000..ec6d4e9 --- /dev/null +++ b/examples/local-rpc-client/src/main/resources/application.yml @@ -0,0 +1,31 @@ +server: + port: 7002 + +netty: + clients: + - + name: server + host: localhost + port: 6001 + - + name: server + host: localhost + port: 6001 + + +spring: + application: + name: client + + +monitor: + mail: + enable: + ssl: false + host: smtp.163.com + password: yourpassword + username: miles02 + from: miles02@163.com + to: 124746406@qq.com + cc: 88943553@qq.com #抄送 + bcc: 88943553@qq.com #密送 diff --git a/examples/local-rpc-lient/src/main/resources/application.yml b/examples/local-rpc-lient/src/main/resources/application.yml deleted file mode 100644 index 7338688..0000000 --- a/examples/local-rpc-lient/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -server.port: 7002 - -netty: - clients: - - name: server - host: localhost - port: 6001 - - name: server - host: localhost - port: 6001 - - -monitor.mail.enable: false -monitor.mail.host: smtp.163.com -monitor.mail.username: miles02 -monitor.mail.password: yourpassword -monitor.mail.enable.ssl: -monitor.mail.from: miles02@163.com -monitor.mail.to: 124746406@qq.com -monitor.mail.cc: 88943553@qq.com -monitor.mail.bcc: 88943553@qq.com \ No newline at end of file diff --git a/examples/local-rpc-server/pom.xml b/examples/local-rpc-server/pom.xml index 6b5c986..45256c1 100644 --- a/examples/local-rpc-server/pom.xml +++ b/examples/local-rpc-server/pom.xml @@ -7,7 +7,6 @@ local-rpc-server 1.0.5 jar - local-rpc-server Demo project for Spring Boot @@ -34,7 +33,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter @@ -44,15 +42,10 @@ spring-boot-starter-test test - - org.springframework.boot spring-boot-starter-data-redis - - - diff --git a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/LocalRpcServerApplication.java b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/LocalRpcServerApplication.java index adf0c67..6e0feb0 100644 --- a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/LocalRpcServerApplication.java +++ b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/LocalRpcServerApplication.java @@ -2,8 +2,6 @@ import io.github.forezp.netty.rpc.core.annotation.EnableNettyRpc; -import io.github.forezp.netty.rpc.core.monitor.warm.*; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.web.bind.annotation.GetMapping; @@ -19,9 +17,8 @@ public static void main(String[] args) { SpringApplication.run( LocalRpcServerApplication.class, args ); } - - @GetMapping("/test") - public void test() { + public String test() { + return "server : test"; } } diff --git a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/Greeting.java b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/Greeting.java index 2060510..aa2390e 100644 --- a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/Greeting.java +++ b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/Greeting.java @@ -10,8 +10,11 @@ **/ @Service public class Greeting implements IGreeting { + @Override public String sayHello(String name) { - return "hi "+name; + System.out.println("server: Client message received {"+name+"}"); + return "hi " + name; } + } diff --git a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/IGreeting.java b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/IGreeting.java index 1cdfea9..412cf23 100644 --- a/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/IGreeting.java +++ b/examples/local-rpc-server/src/main/java/com/forezp/localrpcserver/api/IGreeting.java @@ -9,4 +9,5 @@ public interface IGreeting { String sayHello(String name); + } diff --git a/examples/local-rpc-server/src/main/resources/application.yml b/examples/local-rpc-server/src/main/resources/application.yml index 7dff077..03b9868 100644 --- a/examples/local-rpc-server/src/main/resources/application.yml +++ b/examples/local-rpc-server/src/main/resources/application.yml @@ -1,17 +1,19 @@ server: port: 7001 -netty.server.name: server -netty.server.port: 6001 +netty: + server: + name: server + port: 6001 + spring: application: name: server - redis: host: localhost port: 6379 -# password: ee + #password: ee database: 1 pool: max-active: 8 @@ -20,19 +22,18 @@ spring: min-idle: 0 timeout: 0 + monitor: + #type: redis type: http url: http://localhost:7002/postmsg - -#monitor: -# type: redis - -monitor.mail.enable: false -monitor.mail.host: smtp.163.com -monitor.mail.username: miles02 -monitor.mail.password: yourpassword -monitor.mail.enable.ssl: -monitor.mail.from: miles02@163.com -monitor.mail.to: 124746406@qq.com -monitor.mail.cc: 88943553@qq.com -monitor.mail.bcc: 88943553@qq.com \ No newline at end of file + mail: + enable: + ssl: false + host: smtp.163.com + password: yourpassword + username: miles02 + from: miles02@163.com + to: 124746406@qq.com + cc: 88943553@qq.com #抄送 + bcc: 88943553@qq.com #密送 \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index 85a1bee..efe7bb3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -15,12 +15,11 @@ pom - example-rpc-lib example-eureka-server example-rpc-server example-rpc-client - local-rpc-lient + local-rpc-client local-rpc-server @@ -35,14 +34,12 @@ import - org.springframework.boot spring-boot-starter-web ${spring-boot.version} - org.springframework.boot spring-boot-starter @@ -67,7 +64,6 @@ test ${spring-boot.version} -