diff --git a/example-server/src/main/java/github/javaguide/HelloServiceImpl.java b/example-server/src/main/java/github/javaguide/HelloServiceImpl.java index bcff8ae6405cb1a2fab7a8026036c87c6fb045da..86d12325d33a8bb444cd7b08017aef7306f545d7 100644 --- a/example-server/src/main/java/github/javaguide/HelloServiceImpl.java +++ b/example-server/src/main/java/github/javaguide/HelloServiceImpl.java @@ -1,5 +1,7 @@ package github.javaguide; +import github.javaguide.api.Hello; +import github.javaguide.api.HelloService; import lombok.extern.slf4j.Slf4j; /** diff --git a/example-server/src/main/java/github/javaguide/NettyServerMain.java b/example-server/src/main/java/github/javaguide/NettyServerMain.java index b7223161c09ee6365ac4dc73591408b2940acf41..3f4bca28605b7b5f2aef0179b035e54962007dfa 100644 --- a/example-server/src/main/java/github/javaguide/NettyServerMain.java +++ b/example-server/src/main/java/github/javaguide/NettyServerMain.java @@ -1,5 +1,6 @@ package github.javaguide; +import github.javaguide.api.HelloService; import github.javaguide.remoting.transport.netty.server.NettyServer; /** @@ -8,6 +9,7 @@ import github.javaguide.remoting.transport.netty.server.NettyServer; */ public class NettyServerMain { public static void main(String[] args) { + HelloService helloService = new HelloServiceImpl(); NettyServer nettyServer = new NettyServer("127.0.0.1", 9999); nettyServer.publishService(helloService, HelloService.class); diff --git a/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java b/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java index ef0a340818804976cf812fc16a426661a96c0d80..7e2c93aea81fcc9cd413c23b2d89ba2fb5f60519 100644 --- a/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java +++ b/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java @@ -1,5 +1,6 @@ package github.javaguide; +import github.javaguide.api.HelloService; import github.javaguide.remoting.transport.socket.SocketRpcServer; /** diff --git a/hello-service-api/src/main/java/github/javaguide/Hello.java b/hello-service-api/src/main/java/github/javaguide/api/Hello.java similarity index 60% rename from hello-service-api/src/main/java/github/javaguide/Hello.java rename to hello-service-api/src/main/java/github/javaguide/api/Hello.java index 52ca9966b0d6891bea3be81f9cef6618ba571050..bd914a91e768635d42673bee89e99de518b03423 100644 --- a/hello-service-api/src/main/java/github/javaguide/Hello.java +++ b/hello-service-api/src/main/java/github/javaguide/api/Hello.java @@ -1,11 +1,6 @@ -package github.javaguide; +package github.javaguide.api; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; import java.io.Serializable; diff --git a/hello-service-api/src/main/java/github/javaguide/HelloService.java b/hello-service-api/src/main/java/github/javaguide/api/HelloService.java similarity index 82% rename from hello-service-api/src/main/java/github/javaguide/HelloService.java rename to hello-service-api/src/main/java/github/javaguide/api/HelloService.java index 9f8662e7cfdb7095e915560f29725b07d6fc5bfe..29a150cbfa430b5a19d6ddf8bf62fa1bcba171d8 100644 --- a/hello-service-api/src/main/java/github/javaguide/HelloService.java +++ b/hello-service-api/src/main/java/github/javaguide/api/HelloService.java @@ -1,4 +1,4 @@ -package github.javaguide; +package github.javaguide.api; /** * @author shuang.kou diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/zk/CuratorUtils.java b/rpc-framework-common/src/main/java/github/javaguide/utils/zk/CuratorUtils.java index 9fdb6ced8653cd4f5006514a4957f4c6d97e3f9c..271baa7228150bb6b96f591550f469cb994e20a8 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/utils/zk/CuratorUtils.java +++ b/rpc-framework-common/src/main/java/github/javaguide/utils/zk/CuratorUtils.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; public final class CuratorUtils { private static final int BASE_SLEEP_TIME = 1000; private static final int MAX_RETRIES = 5; - private static final String CONNECT_STRING = "127.0.0.1:2181"; + private static final String CONNECT_STRING = "20.21.1.145:2181"; public static final String ZK_REGISTER_ROOT_PATH = "/my-rpc"; private static Map> serviceAddressMap = new ConcurrentHashMap<>(); private static Set registeredPathSet = ConcurrentHashMap.newKeySet(); diff --git a/rpc-framework-simple/src/main/java/github/javaguide/registry/ZkServiceRegistry.java b/rpc-framework-simple/src/main/java/github/javaguide/registry/ZkServiceRegistry.java index 7beeb6f4c236329f71d7348219d0e56d82364d21..6e843e9de857cd10dabe9d4a855c336b07129722 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/registry/ZkServiceRegistry.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/registry/ZkServiceRegistry.java @@ -19,5 +19,6 @@ public class ZkServiceRegistry implements ServiceRegistry { //根节点下注册子节点:服务 String servicePath = CuratorUtils.ZK_REGISTER_ROOT_PATH + "/" + serviceName + inetSocketAddress.toString(); CuratorUtils.createPersistentNode(servicePath); + } } diff --git a/rpc-framework-spring/README.md b/rpc-framework-spring/README.md index 0ae7be2d754160b6b1b4e6709fe29f7d342e682b..8ccfc0647ef835a79427496d629c3f2fc59b6af7 100644 --- a/rpc-framework-spring/README.md +++ b/rpc-framework-spring/README.md @@ -2,4 +2,4 @@ 基于spring 5.2.6.RELEASE - 通过一个注解就可以实现远程接口的调用 - @RpcServiceScan("github.javaguide.spring.service") \ No newline at end of file + @RpcServiceScan("github.javaguide.api") \ No newline at end of file diff --git a/rpc-framework-spring/pom.xml b/rpc-framework-spring/pom.xml index 6aed0d162234ce29378ae2b691fcaee847e1c617..da0daac1fa08e47a90677884efc725300f99a3d9 100644 --- a/rpc-framework-spring/pom.xml +++ b/rpc-framework-spring/pom.xml @@ -27,5 +27,12 @@ ${project.version} compile + + + github.javaguide + hello-service-api + ${project.version} + test + \ No newline at end of file diff --git a/rpc-framework-spring/src/main/java/github/javaguide/spring/rpcservice/RpcServiceFactoryBean.java b/rpc-framework-spring/src/main/java/github/javaguide/spring/rpcservice/RpcServiceFactoryBean.java index 263888006436bcdc08f4535c94cc7f0a91fcfc3f..3ddb10153a6a7da3ab679f424a1d0b62eeb2e8a5 100644 --- a/rpc-framework-spring/src/main/java/github/javaguide/spring/rpcservice/RpcServiceFactoryBean.java +++ b/rpc-framework-spring/src/main/java/github/javaguide/spring/rpcservice/RpcServiceFactoryBean.java @@ -25,15 +25,7 @@ public class RpcServiceFactoryBean implements FactoryBean { if (rpcServiceInterface == null) { throw new IllegalStateException(""); } - return ClientProxy.getServiceProxy(rpcServiceInterface); -// return (T) Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(), new Class[]{rpcServiceInterface}, new InvocationHandler() { -// @Override -// public Object invoke(Object o, Method method, Object[] objects) throws Throwable { -// if(method.equals()){} -// return null; -// } -// }); } @Override diff --git a/rpc-framework-spring/src/test/java/github/javaguide/spring/ClientTest.java b/rpc-framework-spring/src/test/java/github/javaguide/spring/ClientTest.java index d9511ce9a2074e825019f31e218b571a59081a77..96c593b792dbb586b7914845a43442d8a62a2a5d 100644 --- a/rpc-framework-spring/src/test/java/github/javaguide/spring/ClientTest.java +++ b/rpc-framework-spring/src/test/java/github/javaguide/spring/ClientTest.java @@ -1,6 +1,9 @@ package github.javaguide.spring; +import github.javaguide.api.Hello; +import github.javaguide.api.HelloService; import github.javaguide.spring.annotation.RpcServiceScan; +import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -19,12 +22,16 @@ public class ClientTest { applicationContext.refresh(); applicationContext.start(); - + HelloService helloService = applicationContext.getBean(HelloService.class); + Hello hello = Hello.builder().message("test message").description("test description").build(); + String res = helloService.hello(hello); + String expectedResult = "Hello description is " + hello.getDescription(); + Assert.assertEquals(expectedResult, res); } - @Configuration - @RpcServiceScan("github.javaguide.spring.service") + //@Configuration + @RpcServiceScan("github.javaguide.api") public static class TestConfig { } diff --git a/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service1.java b/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service1.java deleted file mode 100644 index 705a1d6781c12a9e9bc0584e383261c336e77868..0000000000000000000000000000000000000000 --- a/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service1.java +++ /dev/null @@ -1,6 +0,0 @@ -package github.javaguide.spring.service; - -public interface Service1 { - - -} diff --git a/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service2.java b/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service2.java deleted file mode 100644 index 241da9190941f1a1b0bc624cf71f5f1835319f42..0000000000000000000000000000000000000000 --- a/rpc-framework-spring/src/test/java/github/javaguide/spring/service/Service2.java +++ /dev/null @@ -1,10 +0,0 @@ -package github.javaguide.spring.service; - -/** - * @description: - * @author:lvxuhong - * @date:2020/6/18 - */ -public interface Service2 { - -}