diff --git a/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java b/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java index 9578f31..a35fbb2 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java @@ -25,7 +25,6 @@ import java.security.cert.X509Certificate; * @author xiongxiaoyang * @date 2022/5/23 */ -@ConditionalOnProperty(value = "spring.elasticsearch.enabled", havingValue = "true") @Configuration @Slf4j public class EsConfig { @@ -42,6 +41,7 @@ public class EsConfig { * fix `sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: * unable to find valid certification path to requested target` */ + @ConditionalOnProperty(value = "spring.elasticsearch.ssl.verification-mode", havingValue = "none") @Bean RestClient elasticsearchRestClient(RestClientBuilder restClientBuilder, ObjectProvider builderCustomizers) { diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json index db7e44c..d74c6a7 100644 --- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -60,6 +60,11 @@ "name": "xxl.job.accessToken", "type": "java.lang.String", "description": "xxl-job accessToken." + }, + { + "name": "spring.elasticsearch.ssl.verification-mode", + "type": "java.lang.String", + "description": "设置 ssl 的认证模式,如果该配置项为 none ,说明不需要认证,信任所有的 ssl 证书." } ] } \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9952814..946e0d0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -97,6 +97,9 @@ spring: - https://my-deployment-ce7ca3.es.us-central1.gcp.cloud.es.io:9243 username: elastic password: qTjgYVKSuExX6tWAsDuvuvwl + # 设置 ssl 的认证模式,如果该配置项为 none ,说明不需要认证,信任所有的 ssl 证书。 + # ssl: + # verification-mode: none # Spring AMQP 配置 amqp: