From b13c3b86cadc6c7770fe575fa6145b36c889b370 Mon Sep 17 00:00:00 2001 From: icanci Date: Sun, 5 Feb 2023 12:35:58 +0800 Subject: [PATCH] RasServerProperties --- .../ras/client/RasClientAutoConfig.java | 4 +- .../ras/client/cache/MetaCacheHolder.java | 4 +- ...operties.java => RasClientProperties.java} | 4 +- .../ras/client/server/RegisterServer.java | 6 +- .../ras/server/RasServerAutoConfig.java | 19 ++++++ .../cn/icanci/loopstack/ras/server/Test.java | 8 --- .../properties/RasServerProperties.java | 63 +++++++++++++++++++ 7 files changed, 91 insertions(+), 17 deletions(-) rename client/src/main/java/cn/icanci/loopstack/ras/client/properties/{RasProperties.java => RasClientProperties.java} (93%) create mode 100644 server/src/main/java/cn/icanci/loopstack/ras/server/RasServerAutoConfig.java delete mode 100644 server/src/main/java/cn/icanci/loopstack/ras/server/Test.java create mode 100644 server/src/main/java/cn/icanci/loopstack/ras/server/properties/RasServerProperties.java diff --git a/client/src/main/java/cn/icanci/loopstack/ras/client/RasClientAutoConfig.java b/client/src/main/java/cn/icanci/loopstack/ras/client/RasClientAutoConfig.java index e017fa7..0cc711c 100644 --- a/client/src/main/java/cn/icanci/loopstack/ras/client/RasClientAutoConfig.java +++ b/client/src/main/java/cn/icanci/loopstack/ras/client/RasClientAutoConfig.java @@ -1,6 +1,6 @@ package cn.icanci.loopstack.ras.client; -import cn.icanci.loopstack.ras.client.properties.RasProperties; +import cn.icanci.loopstack.ras.client.properties.RasClientProperties; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ComponentScan({ "cn.icanci.loopstack.ras.client" }) -@EnableConfigurationProperties(RasProperties.class) +@EnableConfigurationProperties(RasClientProperties.class) @AutoConfigureBefore public class RasClientAutoConfig { } diff --git a/client/src/main/java/cn/icanci/loopstack/ras/client/cache/MetaCacheHolder.java b/client/src/main/java/cn/icanci/loopstack/ras/client/cache/MetaCacheHolder.java index 5df78f8..bed89be 100644 --- a/client/src/main/java/cn/icanci/loopstack/ras/client/cache/MetaCacheHolder.java +++ b/client/src/main/java/cn/icanci/loopstack/ras/client/cache/MetaCacheHolder.java @@ -3,7 +3,7 @@ package cn.icanci.loopstack.ras.client.cache; import cn.icanci.loopstack.ras.client.cache.model.ApplicationKey; import cn.icanci.loopstack.ras.client.cache.model.ApplicationValue; import cn.icanci.loopstack.ras.client.cache.model.ClientApplicationValue; -import cn.icanci.loopstack.ras.client.properties.RasProperties; +import cn.icanci.loopstack.ras.client.properties.RasClientProperties; import java.util.Collection; import java.util.Map; @@ -32,7 +32,7 @@ public abstract class MetaCacheHolder { private static final Logger logger = LoggerFactory.getLogger(MetaCacheHolder.class); @Resource - protected RasProperties rasProperties; + protected RasClientProperties rasProperties; /** * 服务端缓存 多个bean共享数据 diff --git a/client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasProperties.java b/client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasClientProperties.java similarity index 93% rename from client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasProperties.java rename to client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasClientProperties.java index 4344487..3fde0ff 100644 --- a/client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasProperties.java +++ b/client/src/main/java/cn/icanci/loopstack/ras/client/properties/RasClientProperties.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; * @since 1.0 Created in 2023/01/06 22:28 */ @Component -@ConfigurationProperties(prefix = "ras") -public class RasProperties { +@ConfigurationProperties(prefix = "ras-client") +public class RasClientProperties { /** * appId */ diff --git a/client/src/main/java/cn/icanci/loopstack/ras/client/server/RegisterServer.java b/client/src/main/java/cn/icanci/loopstack/ras/client/server/RegisterServer.java index 875f8fa..318542d 100644 --- a/client/src/main/java/cn/icanci/loopstack/ras/client/server/RegisterServer.java +++ b/client/src/main/java/cn/icanci/loopstack/ras/client/server/RegisterServer.java @@ -5,7 +5,7 @@ import cn.hutool.json.JSONUtil; import cn.icanci.loopstack.api.client.Client; import cn.icanci.loopstack.api.client.http.HttpClientImpl; import cn.icanci.loopstack.lsi.common.result.R; -import cn.icanci.loopstack.ras.client.properties.RasProperties; +import cn.icanci.loopstack.ras.client.properties.RasClientProperties; import cn.icanci.loopstack.ras.client.utils.RandomAddressUtils; import cn.icanci.loopstack.ras.common.socket.RegisterDTO; import cn.icanci.loopstack.ras.common.socket.UriConstant; @@ -31,9 +31,9 @@ import com.google.common.collect.Maps; public class RegisterServer implements InitializingBean { private static final Logger logger = LoggerFactory.getLogger(RegisterServer.class); /** http实例 */ - private static final Client CLIENT = HttpClientImpl.getInstance(); + private static final Client CLIENT = HttpClientImpl.getInstance(); @Resource - private RasProperties rasProperties; + private RasClientProperties rasProperties; private static final int CORE_SIZE = Runtime.getRuntime().availableProcessors(); diff --git a/server/src/main/java/cn/icanci/loopstack/ras/server/RasServerAutoConfig.java b/server/src/main/java/cn/icanci/loopstack/ras/server/RasServerAutoConfig.java new file mode 100644 index 0000000..4403768 --- /dev/null +++ b/server/src/main/java/cn/icanci/loopstack/ras/server/RasServerAutoConfig.java @@ -0,0 +1,19 @@ +package cn.icanci.loopstack.ras.server; + +import cn.icanci.loopstack.ras.server.properties.RasServerProperties; + +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * @author icanci + * @since 1.0 Created in 2023/01/06 22:27 + */ +@Configuration +@ComponentScan({ "cn.icanci.loopstack.ras.server" }) +@EnableConfigurationProperties(RasServerProperties.class) +@AutoConfigureBefore +public class RasServerAutoConfig { +} diff --git a/server/src/main/java/cn/icanci/loopstack/ras/server/Test.java b/server/src/main/java/cn/icanci/loopstack/ras/server/Test.java deleted file mode 100644 index a4a877c..0000000 --- a/server/src/main/java/cn/icanci/loopstack/ras/server/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.icanci.loopstack.ras.server; - -/** - * @author icanci - * @since 1.0 Created in 2023/02/04 21:38 - */ -public class Test { -} diff --git a/server/src/main/java/cn/icanci/loopstack/ras/server/properties/RasServerProperties.java b/server/src/main/java/cn/icanci/loopstack/ras/server/properties/RasServerProperties.java new file mode 100644 index 0000000..110cf87 --- /dev/null +++ b/server/src/main/java/cn/icanci/loopstack/ras/server/properties/RasServerProperties.java @@ -0,0 +1,63 @@ +package cn.icanci.loopstack.ras.server.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 服务端配置 + * + * @author icanci + * @since 1.0 Created in 2023/02/04 22:52 + */ +@Component +@ConfigurationProperties(prefix = "ras-server") +public class RasServerProperties { + /** + * 注册中心appId，不建议修改 + */ + private String appId = "cn.icanci.loopstack.ras.server"; + /** + * 客户端注册的port：此处指的是服务端向其他服务器注册的端口 + */ + private int clientPort = 11100; + /** + * 服务端ip，以,分隔：此处指的是服务端向其他服务器注册的地址 + */ + private String serverIps = "127.0.0.1"; + /** + * 服务端port：此处指的是服务端启动提供服务的端口 + */ + private int serverPort = 9995; + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public int getClientPort() { + return clientPort; + } + + public void setClientPort(int clientPort) { + this.clientPort = clientPort; + } + + public String getServerIps() { + return serverIps; + } + + public void setServerIps(String serverIps) { + this.serverIps = serverIps; + } + + public int getServerPort() { + return serverPort; + } + + public void setServerPort(int serverPort) { + this.serverPort = serverPort; + } +} -- Gitee