diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationConfig.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationConfig.java index a892b169..113a43d7 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationConfig.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationConfig.java @@ -23,18 +23,22 @@ package fun.asgc.neutrino.core.context; import fun.asgc.neutrino.core.annotation.Configuration; +import lombok.Data; /** * * @author: aoshiguchen * @date: 2022/6/16 */ -@Configuration(prefix = "application") +@Configuration(prefix = "neutrino") public class ApplicationConfig { + private Application application; - /** - * 应用名称 - */ - private String name; - + @Data + public static class Application { + /** + * 应用名称 + */ + private String name; + } } diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java index 9d8c4120..2bf10eb4 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java @@ -34,7 +34,7 @@ import lombok.Data; * @date: 2022/6/16 */ @Data -@Configuration(prefix = "proxy") +@Configuration(prefix = "neutrino.proxy") public class ProxyConfig { public static ProxyConfig instance; private Protocol protocol; diff --git a/neutrino-proxy-client/src/main/resources/application.yml b/neutrino-proxy-client/src/main/resources/application.yml index 15dcf526..d3e00bae 100644 --- a/neutrino-proxy-client/src/main/resources/application.yml +++ b/neutrino-proxy-client/src/main/resources/application.yml @@ -1,19 +1,20 @@ -application: - name: neutrino-proxy-client +neutrino: + application: + name: neutrino-proxy-client -proxy: - protocol: - max-frame-length: 2097152 - length-field-offset: 0 - length-field-length: 4 - initial-bytes-to-strip: 0 - length-adjustment: 0 - read-idle-time: 60 - write-idle-time: 30 - all-idle-time-seconds: 0 - client: - key-store-password: 123456 - jks-path: classpath:/test.jks - server-ip: localhost - server-port: 9000 - ssl-enable: false + proxy: + protocol: + max-frame-length: 2097152 + length-field-offset: 0 + length-field-length: 4 + initial-bytes-to-strip: 0 + length-adjustment: 0 + read-idle-time: 60 + write-idle-time: 30 + all-idle-time-seconds: 0 + client: + key-store-password: 123456 + jks-path: classpath:/test.jks + server-ip: localhost + server-port: 9000 + ssl-enable: false diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/config/ProxyConfig.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/config/ProxyConfig.java index 039d9296..f8e4e73b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/config/ProxyConfig.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/config/ProxyConfig.java @@ -34,7 +34,7 @@ import java.util.Map; * @date: 2022/6/16 */ @Data -@Configuration(prefix = "proxy") +@Configuration(prefix = "neutrino.proxy") public class ProxyConfig { private Protocol protocol; private Server server; diff --git a/neutrino-proxy-server/src/main/resources/application.yml b/neutrino-proxy-server/src/main/resources/application.yml index 7940dca5..ed037ea2 100644 --- a/neutrino-proxy-server/src/main/resources/application.yml +++ b/neutrino-proxy-server/src/main/resources/application.yml @@ -1,22 +1,23 @@ -application: - name: neutrino-proxy-server +neutrino: + application: + name: neutrino-proxy-server -proxy: - protocol: - max-frame-length: 2097152 - length-field-offset: 0 - length-field-length: 4 - initial-bytes-to-strip: 0 - length-adjustment: 0 - read-idle-time: 60 - write-idle-time: 40 - all-idle-time-seconds: 0 - server: - port: 9000 - ssl-port: 9002 - key-store-password: 123456 - key-manager-password: 123456 - jks-path: classpath:/test.jks - license: - 79419a1a8691413aa5e845b9e3e90051: 3 - 9352b1c25f564c81a5677131d7769876: 2 + proxy: + protocol: + max-frame-length: 2097152 + length-field-offset: 0 + length-field-length: 4 + initial-bytes-to-strip: 0 + length-adjustment: 0 + read-idle-time: 60 + write-idle-time: 40 + all-idle-time-seconds: 0 + server: + port: 9000 + ssl-port: 9002 + key-store-password: 123456 + key-manager-password: 123456 + jks-path: classpath:/test.jks + license: + 79419a1a8691413aa5e845b9e3e90051: 3 + 9352b1c25f564c81a5677131d7769876: 2