1.升级适配redisxinttiao

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/config/ElasticSearchClientConfig.java

@@ -8,7 +8,6 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,40 +16,39 @@ import java.util.Arrays;
 
 @Configuration
 public class ElasticSearchClientConfig {
- 
-	@Value("${spring.elasticsearch.rest.uris}")
+
+    @Value("${spring.elasticsearch.rest.uris}")
     private String uris;
-	@Value("${elasticsearch.username}")
-	private String username;
-
-	@Value("${elasticsearch.password}")
-	private String password;
-	 
-	@Bean
-	@Qualifier("highLevelClient")
-	public RestHighLevelClient restHighLevelClient() {
-		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
-		
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
         try {
-			HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
-        	RestClientBuilder builder = RestClient.builder(httpHosts);
-			builder.setHttpClientConfigCallback(httpClientBuilder -> {
-				httpClientBuilder.disableAuthCaching();
-				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-			});
-			// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
-			builder.setRequestConfigCallback(requestConfigBuilder -> {
-				// 连接超时（默认为1秒）
-				return requestConfigBuilder.setConnectTimeout(5000 * 1000)
-						// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
-						.setSocketTimeout(6000 * 1000);
-			});
-        	
-        	return new RestHighLevelClient(builder);
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
         } catch (Exception e) {
-        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
         }
-	}
+    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1324,12 +1324,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
         }
         return result;
     }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -312,12 +312,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -877,12 +877,6 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ eureka.instance.ip-address=172.16.3.34
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http:/172.16.10.230:9200
+spring.elasticsearch.rest.uris=http://172.16.10.230:9200
 ## unit(h)
 alertcall.es.synchrony.time=48
 #redis properties:

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/config/ElasticSearchClientConfig.java

@@ -17,40 +17,40 @@ import java.util.Arrays;
 
 @Configuration
 public class ElasticSearchClientConfig {
- 
-	@Value("${spring.elasticsearch.rest.uris}")
+
+    @Value("${spring.elasticsearch.rest.uris}")
     private String uris;
-	@Value("${elasticsearch.username}")
-	private String username;
-
-	@Value("${elasticsearch.password}")
-	private String password;
-	 
-	@Bean
-	@Qualifier("highLevelClient")
-	public RestHighLevelClient restHighLevelClient() {
-		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
-		
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    @Qualifier("highLevelClient")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
         try {
-			HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
-        	RestClientBuilder builder = RestClient.builder(httpHosts);
-			builder.setHttpClientConfigCallback(httpClientBuilder -> {
-				httpClientBuilder.disableAuthCaching();
-				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-			});
-			// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
-			builder.setRequestConfigCallback(requestConfigBuilder -> {
-				// 连接超时（默认为1秒）
-				return requestConfigBuilder.setConnectTimeout(5000 * 1000)
-						// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
-						.setSocketTimeout(6000 * 1000);
-			});
-        	
-        	return new RestHighLevelClient(builder);
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
         } catch (Exception e) {
-        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
         }
-	}
+    }
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1323,12 +1323,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
         }
         return result;
     }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -315,12 +315,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -947,12 +947,6 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ eureka.instance.ip-address=172.16.3.34
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http:/172.16.10.230:9200
+spring.elasticsearch.rest.uris=http://172.16.10.230:9200
 ## unit(h)
 alertcall.es.synchrony.time=48
 #redis properties:

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/config/ElasticSearchClientConfig.java

@@ -8,7 +8,6 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,39 +16,39 @@ import java.util.Arrays;
 
 @Configuration
 public class ElasticSearchClientConfig {
- 
-	@Value("${spring.elasticsearch.rest.uris}")
+
+    @Value("${spring.elasticsearch.rest.uris}")
     private String uris;
-	@Value("${elasticsearch.username}")
-	private String username;
-
-	@Value("${elasticsearch.password}")
-	private String password;
-	 
-	@Bean
-	public RestHighLevelClient restHighLevelClient() {
-		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
-		
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
         try {
-			HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
-        	RestClientBuilder builder = RestClient.builder(httpHosts);
-			builder.setHttpClientConfigCallback(httpClientBuilder -> {
-				httpClientBuilder.disableAuthCaching();
-				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-			});
-			// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
-			builder.setRequestConfigCallback(requestConfigBuilder -> {
-				// 连接超时（默认为1秒）
-				return requestConfigBuilder.setConnectTimeout(5000 * 1000)
-						// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
-						.setSocketTimeout(6000 * 1000);
-			});
-        	
-        	return new RestHighLevelClient(builder);
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
         } catch (Exception e) {
-        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
         }
-	}
+    }
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1323,12 +1323,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
         }
         return result;
     }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -313,12 +313,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -878,12 +878,6 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 			result.setTotal(totle);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
-		}finally {
-			try {
-				restHighLevelClient.close();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
 		}
 
 		return result;

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ eureka.instance.ip-address=172.16.3.34
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http:/172.16.10.230:9200
+spring.elasticsearch.rest.uris=http://172.16.10.230:9200
 ## unit(h)
 alertcall.es.synchrony.time=48
 #redis properties:

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/config/ElasticSearchClientConfig.java

@@ -8,47 +8,47 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
 import java.util.Arrays;
 
 @Configuration
 public class ElasticSearchClientConfig {
- 
-	@Value("${spring.elasticsearch.rest.uris}")
+
+    @Value("${spring.elasticsearch.rest.uris}")
     private String uris;
-	@Value("${elasticsearch.username}")
-	private String username;
-
-	@Value("${elasticsearch.password}")
-	private String password;
-	 
-	@Bean
-	public RestHighLevelClient restHighLevelClient() {
-		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
-		
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
         try {
-			HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
-        	RestClientBuilder builder = RestClient.builder(httpHosts);
-			builder.setHttpClientConfigCallback(httpClientBuilder -> {
-				httpClientBuilder.disableAuthCaching();
-				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-			});
-			// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
-			builder.setRequestConfigCallback(requestConfigBuilder -> {
-				// 连接超时（默认为1秒）
-				return requestConfigBuilder.setConnectTimeout(5000 * 1000)
-						// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
-						.setSocketTimeout(6000 * 1000);
-			});
-        	
-        	return new RestHighLevelClient(builder);
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
         } catch (Exception e) {
-        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
         }
-	}
+    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1324,12 +1324,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
         }
         return result;
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -314,12 +314,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -876,12 +876,6 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties

@@ -15,7 +15,7 @@ eureka.instance.ip-address=172.16.3.34
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http:/172.16.10.230:9200
+spring.elasticsearch.rest.uris=http://172.16.10.230:9200
 ## unit(h)
 alertcall.es.synchrony.time=48
 #redis properties:
@@ -27,6 +27,7 @@ spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
+spring.redis.mode=cluster
 
 ## emqx properties:
 emqx.clean-session=false

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/config/ElasticSearchClientConfig.java

@@ -8,7 +8,6 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,40 +16,39 @@ import java.util.Arrays;
 
 @Configuration
 public class ElasticSearchClientConfig {
- 
-	@Value("${spring.elasticsearch.rest.uris}")
+
+    @Value("${spring.elasticsearch.rest.uris}")
     private String uris;
-	@Value("${elasticsearch.username}")
-	private String username;
-
-	@Value("${elasticsearch.password}")
-	private String password;
-	 
-	@Bean
-	@Qualifier("highLevelClient")
-	public RestHighLevelClient restHighLevelClient() {
-		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
-		
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    @Bean(destroyMethod = "close")
+    public RestHighLevelClient restHighLevelClient() {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(username, password));
+
         try {
-			HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
-        	RestClientBuilder builder = RestClient.builder(httpHosts);
-			builder.setHttpClientConfigCallback(httpClientBuilder -> {
-				httpClientBuilder.disableAuthCaching();
-				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-			});
-			// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
-			builder.setRequestConfigCallback(requestConfigBuilder -> {
-				// 连接超时（默认为1秒）
-				return requestConfigBuilder.setConnectTimeout(5000 * 1000)
-						// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
-						.setSocketTimeout(6000 * 1000);
-			});
-        	
-        	return new RestHighLevelClient(builder);
+            HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
+            RestClientBuilder builder = RestClient.builder(httpHosts);
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.disableAuthCaching();
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+            // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+            builder.setRequestConfigCallback(requestConfigBuilder -> {
+                // 连接超时（默认为1秒）
+                return requestConfigBuilder.setConnectTimeout(5000 * 1000)
+                        // 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+                        .setSocketTimeout(6000 * 1000);
+            });
+
+            return new RestHighLevelClient(builder);
         } catch (Exception e) {
-        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+            throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
         }
-	}
+    }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -313,12 +313,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -877,12 +877,6 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } finally {
-            try {
-                restHighLevelClient.close();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
         }
 
         return result;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-dev.properties

@@ -15,7 +15,7 @@ eureka.instance.ip-address=172.16.3.34
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
-spring.elasticsearch.rest.uris=http:/172.16.10.230:9200
+spring.elasticsearch.rest.uris=http://172.16.10.230:9200
 ## unit(h)
 alertcall.es.synchrony.time=48
 #redis properties:

amos-boot-system-tzs/pom.xml

@@ -28,6 +28,10 @@
 					<artifactId>poi-ooxml</artifactId>
 					<groupId>org.apache.poi</groupId>
 				</exclusion>
+                <exclusion>
+                    <groupId>com.yeejoin</groupId>
+                    <artifactId>amos-component-security</artifactId>
+                </exclusion>
 			</exclusions>
 		</dependency>
         <dependency>
@@ -65,6 +69,11 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>6.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>amos-component-security</artifactId>
+            <version>${amos.version.tzs}</version>
+        </dependency>
 
     </dependencies>