feat: ✨ 添加 common-es 模块 优化 ai 微服务和 search 微服务中的调用

Author: StephenQiu30

algorithm-common/algorithm-common-elasticsearch/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.algorithm.cloud</groupId>
+        <artifactId>algorithm-common</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>algorithm-common-elasticsearch</artifactId>
+    <name>algorithm-common-elasticsearch</name>
+    <description>Algorithm RAG-Enhanced Interactive Teaching System</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

…h/config/ElasticsearchConfiguration.java …h/config/ElasticsearchConfiguration.javaalgorithm-service/algorithm-search-service/src/main/java/com/stephen/cloud/search/config/ElasticsearchConfiguration.java renamed to algorithm-common/algorithm-common-elasticsearch/src/main/java/com/stephen/cloud/common/elasticsearch/config/ElasticsearchConfiguration.java algorithm-service/algorithm-search-service/src/main/java/com/stephen/cloud/search/config/ElasticsearchConfiguration.java renamed to algorithm-common/algorithm-common-elasticsearch/src/main/java/com/stephen/cloud/common/elasticsearch/config/ElasticsearchConfiguration.java

@@ -1,11 +1,11 @@
-package com.stephen.cloud.search.config;
+package com.stephen.cloud.common.elasticsearch.config;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.stephen.cloud.search.config.properties.ElasticsearchProperties;
+import com.stephen.cloud.common.elasticsearch.properties.ElasticsearchProperties;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -24,12 +24,6 @@
 
 import java.util.List;
 
-/**
- * Elasticsearch 配置
- * 手动配置 RestClient 以确保认证信息被正确应用，解决 Actuator 401 问题
- *
- * @author StephenQiu30
- */
 @Configuration
 @EnableConfigurationProperties(ElasticsearchProperties.class)
 @ConditionalOnProperty(prefix = "spring.elasticsearch", name = "enable", havingValue = "true", matchIfMissing = true)
@@ -47,7 +41,6 @@ public RestClient restClient() {
             uris = List.of("http://localhost:9200");
         }
 
-        // 调试日志：验证 Nacos 属性是否正确注入
         log.info("[Elasticsearch] 正在初始化 RestClient. Hosts: {}, User: {}",
                 uris, elasticsearchProperties.getUsername());
 
@@ -57,12 +50,10 @@ public RestClient restClient() {
 
         RestClientBuilder builder = RestClient.builder(hosts);
 
-        // 配置连接超时
         builder.setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
                 .setConnectTimeout(10000)
                 .setSocketTimeout(60000));
 
-        // 核心修复：手动配置认证信息
         builder.setHttpClientConfigCallback(httpClientBuilder -> {
             if (StringUtils.isNotBlank(elasticsearchProperties.getUsername())) {
                 CredentialsProvider credentialsProvider = new BasicCredentialsProvider();

…/properties/ElasticsearchProperties.java …/properties/ElasticsearchProperties.javaalgorithm-service/algorithm-search-service/src/main/java/com/stephen/cloud/search/config/properties/ElasticsearchProperties.java renamed to algorithm-common/algorithm-common-elasticsearch/src/main/java/com/stephen/cloud/common/elasticsearch/properties/ElasticsearchProperties.java algorithm-service/algorithm-search-service/src/main/java/com/stephen/cloud/search/config/properties/ElasticsearchProperties.java renamed to algorithm-common/algorithm-common-elasticsearch/src/main/java/com/stephen/cloud/common/elasticsearch/properties/ElasticsearchProperties.java

@@ -1,42 +1,22 @@
-package com.stephen.cloud.search.config.properties;
+package com.stephen.cloud.common.elasticsearch.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.List;
 
-/**
- * Elasticsearch 配置属性
- *
- * @author StephenQiu30
- */
 @Data
 @ConfigurationProperties(prefix = "spring.elasticsearch")
 public class ElasticsearchProperties {
 
-    /**
-     * 是否启用索引管理功能
-     */
     private boolean enable = true;
 
-    /**
-     * 冲突时是否强制重建索引（生产环境慎用）
-     */
     private boolean recreateOnConflict = false;
 
-    /**
-     * ES 地址列表
-     */
     private List<String> uris;
 
-    /**
-     * 用户名
-     */
     private String username;
 
-    /**
-     * 密码
-     */
     private String password;
 
 }

algorithm-common/pom.xml

@@ -26,6 +26,7 @@
         <module>algorithm-common-rabbitmq</module>
         <module>algorithm-common-websocket</module>
         <module>algorithm-common-log</module>
+        <module>algorithm-common-elasticsearch</module>
     </modules>
 
 </project>

algorithm-service/algorithm-ai-service/pom.xml

@@ -125,6 +125,11 @@
             <groupId>com.algorithm.cloud</groupId>
             <artifactId>algorithm-common-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.algorithm.cloud</groupId>
+            <artifactId>algorithm-common-elasticsearch</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

algorithm-service/algorithm-search-service/pom.xml

@@ -48,10 +48,9 @@
             <artifactId>algorithm-api-post</artifactId>
         </dependency>
 
-        <!-- Elasticsearch -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <groupId>com.algorithm.cloud</groupId>
+            <artifactId>algorithm-common-elasticsearch</artifactId>
         </dependency>
 
         <!-- Apache Commons Lang3 -->

algorithm-service/algorithm-search-service/src/main/java/com/stephen/cloud/search/manager/EsIndexManager.java

@@ -3,7 +3,7 @@
 import cn.hutool.core.io.resource.ResourceUtil;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import com.stephen.cloud.api.search.constant.EsIndexConstant;
-import com.stephen.cloud.search.config.properties.ElasticsearchProperties;
+import com.stephen.cloud.common.elasticsearch.properties.ElasticsearchProperties;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

pom.xml

@@ -411,6 +411,12 @@
                 <version>${algorithm-cloud.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.algorithm.cloud</groupId>
+                <artifactId>algorithm-common-elasticsearch</artifactId>
+                <version>${algorithm-cloud.version}</version>
+            </dependency>
+
             <!-- API 模块 -->
             <dependency>
                 <groupId>com.algorithm.cloud</groupId>