diff --git a/lattice-model/pom.xml b/lattice-model/pom.xml index 2cf65f1a..7be0ec73 100644 --- a/lattice-model/pom.xml +++ b/lattice-model/pom.xml @@ -5,7 +5,7 @@ lattice org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 lattice-model diff --git a/lattice-remote/lattice-remote-client/pom.xml b/lattice-remote/lattice-remote-client/pom.xml index d593a671..333be708 100644 --- a/lattice-remote/lattice-remote-client/pom.xml +++ b/lattice-remote/lattice-remote-client/pom.xml @@ -5,7 +5,7 @@ lattice-remote org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-remote/lattice-remote-client/src/main/java/org/hiforce/lattice/remote/client/properties/LatticeRemoteClientProperties.java b/lattice-remote/lattice-remote-client/src/main/java/org/hiforce/lattice/remote/client/properties/LatticeRemoteClientProperties.java index 76d712c4..59f2262f 100644 --- a/lattice-remote/lattice-remote-client/src/main/java/org/hiforce/lattice/remote/client/properties/LatticeRemoteClientProperties.java +++ b/lattice-remote/lattice-remote-client/src/main/java/org/hiforce/lattice/remote/client/properties/LatticeRemoteClientProperties.java @@ -4,6 +4,8 @@ import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; /** @@ -20,6 +22,8 @@ public class LatticeRemoteClientProperties implements InitializingBean { @Setter private String registryAddress; + @Autowired + private Environment environment; private LatticeRemoteClientProperties() { @@ -28,18 +32,12 @@ private LatticeRemoteClientProperties() { @Override public void afterPropertiesSet() throws Exception { instance = this; - registryAddress = ApplicationProperties.getValueString("lattice.remote.registry.address"); + registryAddress = environment.getProperty("lattice.remote.registry.address"); if (StringUtils.isEmpty(registryAddress)) { - registryAddress = ApplicationProperties.getValueString("dubbo.registry.address"); + registryAddress = environment.getProperty("dubbo.registry.address"); } if (StringUtils.isEmpty(registryAddress)) { - String value = ApplicationProperties.getValueString("spring.cloud.nacos.config.server-addr"); - if (StringUtils.isNotEmpty(value)) { - registryAddress = "nacos://" + value; - } - } - if (StringUtils.isEmpty(registryAddress)) { - String value = BootstrapProperties.getValueString("spring.cloud.nacos.config.server-addr"); + String value = environment.getProperty("spring.cloud.nacos.config.server-addr"); if (StringUtils.isNotEmpty(value)) { registryAddress = "nacos://" + value; } diff --git a/lattice-remote/lattice-remote-container/pom.xml b/lattice-remote/lattice-remote-container/pom.xml index 4f415bf3..70537536 100644 --- a/lattice-remote/lattice-remote-container/pom.xml +++ b/lattice-remote/lattice-remote-container/pom.xml @@ -5,7 +5,7 @@ lattice-remote org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-remote/lattice-remote-runner/lattice-remote-runner-dubbo/pom.xml b/lattice-remote/lattice-remote-runner/lattice-remote-runner-dubbo/pom.xml index f7eacb52..ffe66284 100644 --- a/lattice-remote/lattice-remote-runner/lattice-remote-runner-dubbo/pom.xml +++ b/lattice-remote/lattice-remote-runner/lattice-remote-runner-dubbo/pom.xml @@ -5,7 +5,7 @@ lattice-remote-runner org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-remote/lattice-remote-runner/pom.xml b/lattice-remote/lattice-remote-runner/pom.xml index 90f73dae..202e906f 100644 --- a/lattice-remote/lattice-remote-runner/pom.xml +++ b/lattice-remote/lattice-remote-runner/pom.xml @@ -5,7 +5,7 @@ lattice-remote org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-remote/pom.xml b/lattice-remote/pom.xml index 27a78f2a..be81fdee 100644 --- a/lattice-remote/pom.xml +++ b/lattice-remote/pom.xml @@ -5,7 +5,7 @@ lattice org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-runtime/pom.xml b/lattice-runtime/pom.xml index 7c4b2474..e81a76ca 100644 --- a/lattice-runtime/pom.xml +++ b/lattice-runtime/pom.xml @@ -5,7 +5,7 @@ lattice org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-tools/lattice-dynamic-loading/pom.xml b/lattice-tools/lattice-dynamic-loading/pom.xml index c8325c16..05c434ba 100644 --- a/lattice-tools/lattice-dynamic-loading/pom.xml +++ b/lattice-tools/lattice-dynamic-loading/pom.xml @@ -5,7 +5,7 @@ lattice-tools org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-tools/lattice-load-config-res/pom.xml b/lattice-tools/lattice-load-config-res/pom.xml index cab26ab2..f8740435 100644 --- a/lattice-tools/lattice-load-config-res/pom.xml +++ b/lattice-tools/lattice-load-config-res/pom.xml @@ -5,7 +5,7 @@ lattice-tools org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-tools/lattice-maven-build/lattice-maven-build-model/pom.xml b/lattice-tools/lattice-maven-build/lattice-maven-build-model/pom.xml index c4ba12df..ab686b1f 100644 --- a/lattice-tools/lattice-maven-build/lattice-maven-build-model/pom.xml +++ b/lattice-tools/lattice-maven-build/lattice-maven-build-model/pom.xml @@ -5,7 +5,7 @@ lattice-maven-build org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 diff --git a/lattice-tools/lattice-maven-build/lattice-maven-build-plugin/pom.xml b/lattice-tools/lattice-maven-build/lattice-maven-build-plugin/pom.xml index 2100553c..e0d059a3 100644 --- a/lattice-tools/lattice-maven-build/lattice-maven-build-plugin/pom.xml +++ b/lattice-tools/lattice-maven-build/lattice-maven-build-plugin/pom.xml @@ -5,7 +5,7 @@ lattice-maven-build org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 maven-plugin diff --git a/lattice-tools/lattice-maven-build/pom.xml b/lattice-tools/lattice-maven-build/pom.xml index 07e6f66a..2fa19545 100644 --- a/lattice-tools/lattice-maven-build/pom.xml +++ b/lattice-tools/lattice-maven-build/pom.xml @@ -5,7 +5,7 @@ lattice-tools org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 pom diff --git a/lattice-tools/pom.xml b/lattice-tools/pom.xml index f3f46e6f..8443d209 100644 --- a/lattice-tools/pom.xml +++ b/lattice-tools/pom.xml @@ -5,7 +5,7 @@ lattice org.hiforce.lattice - 1.0.12 + 1.0.12.1-SNAPSHOT 4.0.0 pom diff --git a/pom.xml b/pom.xml index fd7aba75..496e48aa 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,9 @@ https://github.com/hiforce/lattice 2022 - 1.0.12 + 1.0.12.1-SNAPSHOT - 1.0.12 + 1.0.12.1-SNAPSHOT 5.3.23 2.7.4 1.2 @@ -180,7 +180,18 @@ - + + + quadtalent-quadtalent-release + release + https://quadtalent-maven.pkg.coding.net/repository/quadtalent/release/ + + + quadtalent-quadtalent-snapshot + snapshot + https://quadtalent-maven.pkg.coding.net/repository/quadtalent/snapshot/ + + hiforce