优化索引处理

jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/index/strategies/AbstractElasticSearchIndexStrategy.java

@@ -31,11 +31,11 @@ public abstract class AbstractElasticSearchIndexStrategy implements ElasticSearc
 
     protected ElasticRestClient client;
 
-    private String wrapIndex(String index) {
+    protected String wrapIndex(String index) {
         return index.toLowerCase();
     }
 
-    public Mono<Boolean> indexExists(String index) {
+    protected Mono<Boolean> indexExists(String index) {
         return ReactorActionListener.mono(
             actionListener ->
                 client.getQueryClient()
@@ -43,7 +43,7 @@ public abstract class AbstractElasticSearchIndexStrategy implements ElasticSearc
                     .existsAsync(new GetIndexRequest(wrapIndex(index)), RequestOptions.DEFAULT, actionListener));
     }
 
-    public Mono<Void> doCreateIndex(ElasticSearchIndexMetadata metadata) {
+    protected Mono<Void> doCreateIndex(ElasticSearchIndexMetadata metadata) {
         return ReactorActionListener.<CreateIndexResponse>mono(
             actionListener -> client.getQueryClient()
                 .indices()
@@ -93,7 +93,7 @@ public abstract class AbstractElasticSearchIndexStrategy implements ElasticSearc
         Map<String, Object> properties = createElasticProperties(metadata.getProperties());
         Map<String, Object> ignoreProperties = createElasticProperties(ignore.getProperties());
         for (Map.Entry<String, Object> en : ignoreProperties.entrySet()) {
-            log.debug("ignore update index [{}] mapping property:{},{}", wrapIndex(metadata.getIndex()), en.getKey(), en.getValue());
+            log.trace("ignore update index [{}] mapping property:{},{}", wrapIndex(metadata.getIndex()), en.getKey(), en.getValue());
             properties.remove(en.getKey());
         }
         if (properties.isEmpty()) {

jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/index/strategies/DirectElasticSearchIndexStrategy.java

@@ -14,12 +14,12 @@ public class DirectElasticSearchIndexStrategy extends AbstractElasticSearchIndex
 
     @Override
     public String getIndexForSave(String index) {
-        return index;
+        return wrapIndex(index);
     }
 
     @Override
     public String getIndexForSearch(String index) {
-        return index;
+        return wrapIndex(index);
     }
 
     @Override

jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/index/strategies/TemplateElasticSearchIndexStrategy.java

@@ -21,15 +21,15 @@ public abstract class TemplateElasticSearchIndexStrategy extends AbstractElastic
     }
 
     protected String getTemplate(String index) {
-        return index.concat("_template");
+        return wrapIndex(index).concat("_template");
     }
 
     protected String getAlias(String index) {
-        return index.concat("_alias");
+        return wrapIndex(index).concat("_alias");
     }
 
     protected List<String> getIndexPatterns(String index) {
-        return Collections.singletonList(index.concat("*"));
+        return Collections.singletonList(wrapIndex(index).concat("*"));
     }
 
     @Override
@@ -51,7 +51,7 @@ public abstract class TemplateElasticSearchIndexStrategy extends AbstractElastic
     }
 
     protected PutIndexTemplateRequest createIndexTemplateRequest(ElasticSearchIndexMetadata metadata) {
-        String index = metadata.getIndex();
+        String index = wrapIndex(metadata.getIndex());
         PutIndexTemplateRequest request = new PutIndexTemplateRequest(getTemplate(index));
         request.alias(new Alias(getAlias(index)));
         request.mapping(Collections.singletonMap("properties", createElasticProperties(metadata.getProperties())));
@@ -61,6 +61,7 @@ public abstract class TemplateElasticSearchIndexStrategy extends AbstractElastic
 
     @Override
     public Mono<ElasticSearchIndexMetadata> loadIndexMetadata(String index) {
+
         return ReactorActionListener
             .<GetIndexTemplatesResponse>mono(listener -> client.getQueryClient()
                 .indices()

jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/index/strategies/TimeByMonthElasticSearchIndexStrategy.java

@@ -23,6 +23,6 @@ public class TimeByMonthElasticSearchIndexStrategy extends TemplateElasticSearch
 
     @Override
     public String getIndexForSave(String index) {
-        return index.concat("_").concat(DateFormatter.toString(new Date(), format));
+        return wrapIndex(index).concat("_").concat(DateFormatter.toString(new Date(), format));
     }
 }