opt 获取dubbo register配置，改为从环境变量中读取

hiforce · Nov 3, 2022 · edcd19c · edcd19c
1 parent deecab2
commit edcd19c
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 25 deletions.
diff --git a/lattice-model/pom.xml b/lattice-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lattice-model</artifactId>

diff --git a/lattice-remote/lattice-remote-client/pom.xml b/lattice-remote/lattice-remote-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-remote</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...main/java/org/hiforce/lattice/remote/client/properties/LatticeRemoteClientProperties.java b/...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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-remote</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-remote-runner</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lattice-remote/lattice-remote-runner/pom.xml b/lattice-remote/lattice-remote-runner/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-remote</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lattice-remote/pom.xml b/lattice-remote/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lattice-runtime/pom.xml b/lattice-runtime/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lattice-tools/lattice-dynamic-loading/pom.xml b/lattice-tools/lattice-dynamic-loading/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-tools</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lattice-tools/lattice-load-config-res/pom.xml b/lattice-tools/lattice-load-config-res/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-tools</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-maven-build</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-maven-build</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-plugin</packaging>

diff --git a/lattice-tools/lattice-maven-build/pom.xml b/lattice-tools/lattice-maven-build/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice-tools</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/lattice-tools/pom.xml b/lattice-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lattice</artifactId>
         <groupId>org.hiforce.lattice</groupId>
-        <version>1.0.12</version>
+        <version>1.0.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
@@ -16,9 +16,9 @@
     <url>https://github.com/hiforce/lattice</url>
     <inceptionYear>2022</inceptionYear>
 
-    <version>1.0.12</version>
+    <version>1.0.12.1-SNAPSHOT</version>
     <properties>
-        <version.lattice>1.0.12</version.lattice>
+        <version.lattice>1.0.12.1-SNAPSHOT</version.lattice>
         <version.spring>5.3.23</version.spring>
         <version.spring.boot>2.7.4</version.spring.boot>
         <springext-plugin-version>1.2</springext-plugin-version>
@@ -180,7 +180,18 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
+    <distributionManagement>
+        <repository>
+            <id>quadtalent-quadtalent-release</id>
+            <name>release</name>
+            <url>https://quadtalent-maven.pkg.coding.net/repository/quadtalent/release/</url>
+        </repository>
+        <snapshotRepository>
+            <id>quadtalent-quadtalent-snapshot</id>
+            <name>snapshot</name>
+            <url>https://quadtalent-maven.pkg.coding.net/repository/quadtalent/snapshot/</url>
+        </snapshotRepository>
+    </distributionManagement>
     <profiles>
         <profile>
             <id>hiforce</id>