v2.0.1

zpqsunny · Jun 25, 2024 · 88a8844 · 88a8844
1 parent d9039d4
commit 88a8844
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 30 deletions.
diff --git a/config.properties b/config.properties
@@ -12,7 +12,7 @@ redis.port=6379
 redis.password=
 redis.database=0
 mongodb.url=mongodb://localhost
-es.host=http://127.0.0.1
-es.port=9200
-es.username=elastic
-es.password=elastic
+elasticsearch.host=http://127.0.0.1
+elasticsearch.port=9200
+elasticsearch.username=elastic
+elasticsearch.password=elastic
diff --git a/dht-common/pom.xml b/dht-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-elasticsearch/pom.xml b/dht-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-elasticsearch/src/main/java/me/zpq/elasticsearch/ElasticSearchApplication.java b/dht-elasticsearch/src/main/java/me/zpq/elasticsearch/ElasticSearchApplication.java
@@ -69,21 +69,21 @@ private static void readConfig() throws IOException {
             Properties properties = new Properties();
             properties.load(inputStream);
             MONGODB_URL = properties.getProperty("mongodb.url", MONGODB_URL);
-            ELASTIC = properties.getProperty("es.host", ELASTIC);
-            PORT = Integer.parseInt(properties.getProperty("es.port", PORT.toString()));
-            ELASTIC_USERNAME = properties.getProperty("es.username", ELASTIC_USERNAME);
-            ELASTIC_PASSWORD = properties.getProperty("es.password", ELASTIC_PASSWORD);
+            ELASTIC = properties.getProperty("elasticsearch.host", ELASTIC);
+            PORT = Integer.parseInt(properties.getProperty("elasticsearch.port", PORT.toString()));
+            ELASTIC_USERNAME = properties.getProperty("elasticsearch.username", ELASTIC_USERNAME);
+            ELASTIC_PASSWORD = properties.getProperty("elasticsearch.password", ELASTIC_PASSWORD);
             inputStream.close();
         }
 
         readEnv();
 
         log.info("==========>");
         log.info("=> mongodb.url: {}", MONGODB_URL);
-        log.info("=> es.host: {}", ELASTIC);
-        log.info("=> es.port: {}", PORT);
-        log.info("=> es.username: {}", ELASTIC_USERNAME);
-        log.info("=> es.password: {}", ELASTIC_PASSWORD);
+        log.info("=> elasticsearch.host: {}", ELASTIC);
+        log.info("=> elasticsearch.port: {}", PORT);
+        log.info("=> elasticsearch.username: {}", ELASTIC_USERNAME);
+        log.info("=> elasticsearch.password: {}", ELASTIC_PASSWORD);
     }
 
     private static void readEnv() {
@@ -94,27 +94,27 @@ private static void readEnv() {
             MONGODB_URL = mongodbUrl;
         }
 
-        String elastic = System.getenv("ES_HOST");
+        String elastic = System.getenv("ELASTICSEARCH_HOST");
         if (elastic != null && !elastic.isEmpty()) {
-            log.info("=> env ES_HOST: {}", elastic);
+            log.info("=> env ELASTICSEARCH_HOST: {}", elastic);
             ELASTIC = elastic;
         }
 
-        String elasticPort = System.getenv("ES_PORT");
+        String elasticPort = System.getenv("ELASTICSEARCH_PORT");
         if (elasticPort != null && !elasticPort.isEmpty()) {
-            log.info("=> env ES_PORT: {}", elasticPort);
+            log.info("=> env ELASTICSEARCH_PORT: {}", elasticPort);
             PORT = Integer.parseInt(elasticPort);
         }
 
-        String elasticUsername = System.getenv("ES_USERNAME");
+        String elasticUsername = System.getenv("ELASTICSEARCH_USERNAME");
         if (elasticUsername != null && !elasticUsername.isEmpty()) {
-            log.info("=> env ES_USERNAME: {}", elasticUsername);
+            log.info("=> env ELASTICSEARCH_USERNAME: {}", elasticUsername);
             ELASTIC_USERNAME = elasticUsername;
         }
 
-        String elasticPassword = System.getenv("ES_PASSWORD");
+        String elasticPassword = System.getenv("ELASTICSEARCH_PASSWORD");
         if (elasticPassword != null && !elasticPassword.isEmpty()) {
-            log.info("=> env ES_PASSWORD: {}", elasticPassword);
+            log.info("=> env ELASTICSEARCH_PASSWORD: {}", elasticPassword);
             ELASTIC_PASSWORD = elasticPassword;
         }
 

diff --git a/dht-fresh/pom.xml b/dht-fresh/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-krpc/pom.xml b/dht-krpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-peer/pom.xml b/dht-peer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-routing-table/pom.xml b/dht-routing-table/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dht-routing-table/src/main/java/me/zpq/route/NodeTable.java b/dht-routing-table/src/main/java/me/zpq/route/NodeTable.java
@@ -5,6 +5,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * @author zpq
  * @date 2019-08-26
@@ -13,7 +15,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class NodeTable {
+public class NodeTable implements Serializable {
 
     private String id;
 

diff --git a/dht-server/pom.xml b/dht-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dht</artifactId>
         <groupId>me.zpq.dht</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.zpq.dht</groupId>
     <artifactId>dht</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <modules>
         <module>dht-common</module>
         <module>dht-krpc</module>
@@ -17,6 +17,7 @@
         <module>dht-elasticsearch</module>
     </modules>
     <properties>
+        <dht.version>2.0.1</dht.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -29,7 +30,6 @@
         <io.lettuce.version>6.1.9.RELEASE</io.lettuce.version>
         <mongodb.version>4.1.2</mongodb.version>
         <elasticsearch.version>7.17.8</elasticsearch.version>
-        <dht.version>2.0.0</dht.version>
         <jackson.version>2.13.5</jackson.version>
     </properties>
     <packaging>pom</packaging>