add enabled registry by ipman

ipipman · Apr 21, 2024 · 63765e9 · 63765e9
1 parent 1c77d35
commit 63765e9
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 25 deletions.
diff --git a/rpcman-core/src/main/java/cn/ipman/rpc/core/annotation/EnableRpcMan.java b/rpcman-core/src/main/java/cn/ipman/rpc/core/annotation/EnableRpcMan.java
@@ -2,6 +2,7 @@
 
 import cn.ipman.rpc.core.config.ConsumerConfig;
 import cn.ipman.rpc.core.config.ProviderConfig;
+import cn.ipman.rpc.core.config.RegistryCenterConfig;
 import org.springframework.context.annotation.Import;
 
 import java.lang.annotation.*;
@@ -10,6 +11,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Inherited
-@Import({ProviderConfig.class, ConsumerConfig.class})
+@Import({ProviderConfig.class, ConsumerConfig.class, RegistryCenterConfig.class})
+@SuppressWarnings("unused")
 public @interface EnableRpcMan {
 }
diff --git a/rpcman-core/src/main/java/cn/ipman/rpc/core/config/ConsumerConfig.java b/rpcman-core/src/main/java/cn/ipman/rpc/core/config/ConsumerConfig.java
@@ -96,15 +96,15 @@ public Router<InstanceMeta> loadRouter() {
         return new GrayRouter(consumerConfigProperties.getGrayRatio());
     }
 
-    /**
-     * 创建注册中心实例，默认为ZkRegistryCenter。
-     * @return RegistryCenter 注册中心实例
-     */
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    @ConditionalOnMissingBean
-    public RegistryCenter consumerRc() {
-        return new ZkRegistryCenter();
-    }
+//    /**
+//     * 创建注册中心实例，默认为ZkRegistryCenter。
+//     * @return RegistryCenter 注册中心实例
+//     */
+//    @Bean(initMethod = "start", destroyMethod = "stop")
+//    @ConditionalOnMissingBean
+//    public RegistryCenter consumerRc() {
+//        return new ZkRegistryCenter();
+//    }
 
 
     /**

diff --git a/rpcman-core/src/main/java/cn/ipman/rpc/core/config/ProviderConfig.java b/rpcman-core/src/main/java/cn/ipman/rpc/core/config/ProviderConfig.java
@@ -84,16 +84,15 @@ public ApplicationRunner providerBootstrapRunner(@Autowired ProviderBootstrap pr
         };
     }
 
-    /**
-     * 创建注册中心Bean，如果容器中不存在则创建一个新的ZkRegistryCenter实例。
-     *
-     * @return RegistryCenter 注册中心实例。
-     */
-    @Bean
-    @ConditionalOnMissingBean
-    public RegistryCenter consumer_rc() {
-        return new ZkRegistryCenter();
-    }
+//    /**
+//     * 创建注册中心实例，默认为ZkRegistryCenter。
+//     * @return RegistryCenter 注册中心实例
+//     */
+//    @Bean(initMethod = "start", destroyMethod = "stop")
+//    @ConditionalOnMissingBean
+//    public RegistryCenter providerRc() {
+//        return new ZkRegistryCenter();
+//    }
 
     /**
      * 创建Netty服务器Bean，用于提供HTTP服务。

diff --git a/rpcman-core/src/main/java/cn/ipman/rpc/core/config/RegistryCenterConfig.java b/rpcman-core/src/main/java/cn/ipman/rpc/core/config/RegistryCenterConfig.java
@@ -0,0 +1,38 @@
+package cn.ipman.rpc.core.config;
+
+import cn.ipman.rpc.core.api.RegistryCenter;
+import cn.ipman.rpc.core.registry.ipman.IpManRegistryCenter;
+import cn.ipman.rpc.core.registry.zk.ZkRegistryCenter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Description for this class
+ *
+ * @Author IpMan
+ * @Date 2024/4/21 20:39
+ */
+@Configuration
+public class RegistryCenterConfig {
+
+    /**
+     * 创建注册中心实例，默认为ZkRegistryCenter。
+     * @return RegistryCenter 注册中心实例
+     */
+    @Bean(initMethod = "start", destroyMethod = "stop")
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "rpcman.zk", value = "enabled", havingValue = "true")
+    public RegistryCenter zkRc() {
+        return new ZkRegistryCenter();
+    }
+
+
+    @Bean(initMethod = "start", destroyMethod = "stop")
+    @ConditionalOnProperty(prefix = "registry-ipman", value = "enabled", havingValue = "true")
+    public RegistryCenter ipManRc() {
+        return new IpManRegistryCenter();
+    }
+
+}
diff --git a/rpcman-core/src/main/java/cn/ipman/rpc/core/registry/ipman/IpManRegistryCenter.java b/rpcman-core/src/main/java/cn/ipman/rpc/core/registry/ipman/IpManRegistryCenter.java
@@ -99,7 +99,7 @@ private String unRegPath(ServiceMeta service) {
     }
 
     private String findAllPath(ServiceMeta service) {
-        return server + "/findAll?service=" + service.toPath();
+        return server + "/findall?service=" + service.toPath();
     }
 
     private String versionPath(ServiceMeta service) {

diff --git a/...demo-consumer/src/main/java/cn/ipman/rpc/demo/consumer/RpcmanDemoConsumerApplication.java b/...demo-consumer/src/main/java/cn/ipman/rpc/demo/consumer/RpcmanDemoConsumerApplication.java
@@ -3,6 +3,7 @@
 import cn.ipman.rpc.core.annotation.RpcConsumer;
 import cn.ipman.rpc.core.api.RpcContext;
 import cn.ipman.rpc.core.config.ConsumerConfig;
+import cn.ipman.rpc.core.config.RegistryCenterConfig;
 import cn.ipman.rpc.demo.api.OrderService;
 import cn.ipman.rpc.demo.api.User;
 import cn.ipman.rpc.demo.api.UserService;
@@ -21,7 +22,7 @@
 import java.util.Map;
 
 @SpringBootApplication
-@Import({ConsumerConfig.class})
+@Import({ConsumerConfig.class, RegistryCenterConfig.class})
 @RestController
 public class RpcmanDemoConsumerApplication {
 

diff --git a/rpcman-demo-consumer/src/main/resources/application.yaml b/rpcman-demo-consumer/src/main/resources/application.yaml
@@ -4,6 +4,7 @@ server:
 rpcman:
   #providers: http://localhost:8080,http://localhost:8081,http://localhost:8082
   zk:
+    enabled: false
     zkServer: localhost:2181
     zkRoot: rpcman
 

diff --git a/rpcman-demo-consumer/src/test/java/resources/application.yaml b/rpcman-demo-consumer/src/test/java/resources/application.yaml
@@ -4,6 +4,7 @@ server:
 rpcman:
   #providers: http://localhost:8080,http://localhost:8081,http://localhost:8082
   zk:
+    enabled: true
     zkServer: localhost:2183
     zkRoot: rpcman
 
@@ -38,7 +39,7 @@ apollo:
 
 # 作者手写的注册中心:https://github.com/ipipman/registry-man
 registry-ipman:
-  enabled: true
+  enabled: false
   servers: http://localhost:8484
 
 logging:

diff --git a/...demo-provider/src/main/java/cn/ipman/rpc/demo/provider/RpcmanDemoProviderApplication.java b/...demo-provider/src/main/java/cn/ipman/rpc/demo/provider/RpcmanDemoProviderApplication.java
@@ -4,6 +4,7 @@
 import cn.ipman.rpc.core.api.RpcResponse;
 import cn.ipman.rpc.core.config.ProviderConfig;
 import cn.ipman.rpc.core.config.ProviderConfigProperties;
+import cn.ipman.rpc.core.config.RegistryCenterConfig;
 import cn.ipman.rpc.core.transport.SpringBootTransport;
 import cn.ipman.rpc.demo.api.User;
 import cn.ipman.rpc.demo.api.UserService;
@@ -26,7 +27,7 @@
 
 @SpringBootApplication
 @RestController
-@Import({ProviderConfig.class})
+@Import({ProviderConfig.class, RegistryCenterConfig.class})
 @EnableApolloConfig
 @Slf4j
 public class RpcmanDemoProviderApplication {

diff --git a/rpcman-demo-provider/src/main/resources/application.yaml b/rpcman-demo-provider/src/main/resources/application.yaml
@@ -3,6 +3,7 @@ server:
 
 rpcman:
   zk:
+    enabled: false
     zkServer: localhost:2181
     zkRoot: rpcman
 

diff --git a/rpcman-demo-provider/src/test/resources/application.yaml b/rpcman-demo-provider/src/test/resources/application.yaml
@@ -3,6 +3,7 @@ server:
 
 rpcman:
   zk:
+    enabled: true
     zkServer: localhost:2182
     zkRoot: rpcman
 
@@ -36,7 +37,7 @@ apollo:
 
 # 作者手写的注册中心:https://github.com/ipipman/registry-man
 registry-ipman:
-  enabled: true
+  enabled: false
   servers: http://localhost:8484
 
 logging:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ server: @@
     rpcman:
       zk:
+        enabled: false
         zkServer: localhost:2181
         zkRoot: rpcman
@@ Expand Down @@