更新 search-service 的 AppProperties.java, 指定一个 baseDir 作为存放 search-service 数据的根目录

search/search-service/src/main/java/cn/reghao/tnb/search/app/config/AppProperties.java

@@ -18,10 +18,11 @@ public class AppProperties {
     private int esPort;
     private String esUsername;
     private String esPassword;
-    private String nativeLuceneDir;
-    private String hibernateLuceneDir;
     private String kafkaUri;
     private String kafkaTopic;
-    private String geoipPath;
-    private String geojsonPath;
+    private String baseDir;
+    private String nativeLuceneDirname;
+    private String hibernateLuceneDirname;
+    private String geoipFilename;
+    private String geojsonFilename;
 }

search/search-service/src/main/java/cn/reghao/tnb/search/app/config/SpringLifecycle.java

@@ -23,9 +23,9 @@ public class SpringLifecycle implements ApplicationRunner, DisposableBean {
 
     @Override
     public void run(ApplicationArguments args) {
-        String nativeLuceneDir = appProperties.getNativeLuceneDir();
+        String nativeLuceneDir = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getNativeLuceneDirname());
         createDir(nativeLuceneDir);
-        String hibernateLuceneDir = appProperties.getHibernateLuceneDir();
+        String hibernateLuceneDir = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getHibernateLuceneDirname());
         createDir(hibernateLuceneDir);
         log.info("SearchService 启动...");
     }

search/search-service/src/main/java/cn/reghao/tnb/search/app/log/service/NginxLogService.java

@@ -50,7 +50,8 @@ public class NginxLogService {
         this.nginxLogDocument = nginxLogDocument;
         this.searchService = searchService;
         this.geoIpTool = geoIpTool;
-        this.geoJson = new TextFile().readFile(appProperties.getGeojsonPath());
+        String geojsonPath = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getGeojsonFilename());
+        this.geoJson = new TextFile().readFile(geojsonPath);
         this.idGenerator = new SnowFlake(1, 1);
     }
 

search/search-service/src/main/java/cn/reghao/tnb/search/app/log/util/BeanConfig.java

@@ -13,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
 public class BeanConfig {
     @Bean
     public GeoIpTool ipTool(AppProperties appProperties) throws Exception {
-        return new GeoIpTool(appProperties.getGeoipPath());
+        String geoipPath = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getGeoipFilename());
+        return new GeoIpTool(geoipPath);
     }
 }

search/search-service/src/main/java/cn/reghao/tnb/search/app/lucene/LuceneIndex.java

@@ -27,7 +27,7 @@ public class LuceneIndex {
     private final Analyzer luceneAnalyzer;
 
     public LuceneIndex(AppProperties appProperties) {
-        this.nativeLuceneDir = appProperties.getNativeLuceneDir();
+        this.nativeLuceneDir = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getNativeLuceneDirname());
         this.luceneAnalyzer = new IKAnalyzer();
     }
 

search/search-service/src/main/java/cn/reghao/tnb/search/app/lucene/LuceneSearch.java

@@ -41,7 +41,7 @@ public class LuceneSearch {
     private Map<String, IndexReader> indexReaderMap = new HashMap<>();
 
     public LuceneSearch(AppProperties appProperties) {
-        this.nativeLuceneDir = appProperties.getNativeLuceneDir();
+        this.nativeLuceneDir = String.format("%s/%s", appProperties.getBaseDir(), appProperties.getNativeLuceneDirname());
         this.luceneAnalyzer = new IKAnalyzer();
         this.formatter = new SimpleHTMLFormatter("<span style='color:red;'>", "</span>");
     }

search/search-service/src/main/resources/application-cluster.yml

@@ -16,11 +16,6 @@ spring:
     url: jdbc:mysql://192.168.0.209/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
     password: Test@123456
-es:
-  host: 127.0.0.1
-  port: 9200
-  username: elastic
-  password: VLTtN03SSJ4lsyyg56kf
 eureka:
   client:
     service-url:

search/search-service/src/main/resources/application-dev.yml

@@ -44,7 +44,7 @@ spring:
       hibernate.naming.physical-strategy: org.hibernate.scripts.model.naming.PhysicalNamingStrategyStandardImpl
       hibernate.cache.use_second_level_cache: false
       hibernate.search.backend.directory.type: local-filesystem
-      hibernate.search.backend.directory.root: /opt/data/search_data/hibernate_lucene
+      hibernate.search.backend.directory.root: ${app.base-dir}/${app.hibernate-lucene-dirname}
       hibernate.search.backend.analysis.configurer: class:cn.reghao.tnb.search.app.config.MyLuceneAnalysisConfigurer
   cloud:
     discovery:
@@ -80,9 +80,10 @@ app:
   es-port: 9200
   es-username: elastic
   es-password: VLTtN03SSJ4lsyyg56kf
-  native-lucene-dir: /opt/data/search_data/native_lucene
-  hibernate-lucene-dir: /opt/data/search_data/hibernate_lucene
   kafka-uri: 192.168.0.81:9092
   kafka-topic: NginxLog
-  geoip-path: /home/reghao/Downloads/qqwry.dat
-  geojson-path: /home/reghao/Downloads/china1.json
+  base-dir: /opt/data/search_data
+  native-lucene-dirname: native_lucene
+  hibernate-lucene-dirname: hibernate_lucene
+  geoip-filename: qqwry.dat
+  geojson-filename: china1.json

search/search-service/src/main/resources/application-test.yml

@@ -44,7 +44,7 @@ spring:
       hibernate.naming.physical-strategy: org.hibernate.scripts.model.naming.PhysicalNamingStrategyStandardImpl
       hibernate.cache.use_second_level_cache: false
       hibernate.search.backend.directory.type: local-filesystem
-      hibernate.search.backend.directory.root: /opt/data/search_data/hibernate_lucene
+      hibernate.search.backend.directory.root: ${app.base-dir}/${app.hibernate-lucene-dirname}
       hibernate.search.backend.analysis.configurer: class:cn.reghao.tnb.search.app.config.MyLuceneAnalysisConfigurer
   cloud:
     discovery:
@@ -75,10 +75,15 @@ eureka:
     fetch-registry: true
     service-url:
       defaultZone: http://192.168.0.210:6060/eureka/
-es:
-  host: 127.0.0.1
-  port: 9200
-  username: elastic
-  password: VLTtN03SSJ4lsyyg56kf
-  native-lucene-dir: /opt/data/search_data/native_lucene
-  hibernate-lucene-dir: /opt/data/search_data/hibernate_lucene
+app:
+  es-host: 192.168.0.81
+  es-port: 9200
+  es-username: elastic
+  es-password: VLTtN03SSJ4lsyyg56kf
+  kafka-uri: 192.168.0.81:9092
+  kafka-topic: NginxLog
+  base-dir: /opt/data/search_data
+  native-lucene-dirname: native_lucene
+  hibernate-lucene-dirname: hibernate_lucene
+  geoip-filename: qqwry.dat
+  geojson-filename: china1.json