From 5fc096ab0a946c900efbc7181aea38e9ed2c230f Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 18 Jun 2025 10:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87yml=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BD=BF=E7=94=A8=E5=93=AA=E4=BA=9B=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=90=91=E9=87=8F=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/cms-ai/pom.xml                        | 16 +++++------
 .../cms/ai/properties/CmsAiProperties.java    | 27 +++++++++++++++++++
 .../main/resources/config/jeesite-cms-ai.yml  | 10 +++++++
 web-ai/pom.xml                                |  2 +-
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index c3a375f5..5e32ac78 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -43,11 +43,11 @@
 			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
-		<!-- 本地大模型
+		<!-- 本地大模型 -->
 		<dependency>
 		   <groupId>org.springframework.ai</groupId>
 		   <artifactId>spring-ai-starter-model-ollama</artifactId>
-		</dependency> -->
+		</dependency>
 
 		<!-- 向量数据库 -->
 		<dependency>
@@ -65,19 +65,19 @@
 			<artifactId>httpclient5</artifactId>
 		</dependency>
 
-		<!-- PG 向量数据库
+		<!-- PG 向量数据库 -->
         <dependency>
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-starter-vector-store-pgvector</artifactId>
-        </dependency> -->
+        </dependency>
 
-		<!-- ES 向量数据库
+		<!-- ES 向量数据库 -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-starter-vector-store-elasticsearch</artifactId>
-		</dependency> -->
+		</dependency>
 
-		<!-- Milvus 向量数据库
+		<!-- Milvus 向量数据库 -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-starter-vector-store-milvus</artifactId>
@@ -92,7 +92,7 @@
 			<groupId>io.netty</groupId>
 			<artifactId>netty-resolver-dns-native-macos</artifactId>
 			<classifier>osx-aarch_64</classifier>
-		</dependency> -->
+		</dependency>
 
 		<!-- HTML 转 Markdown -->
 		<dependency>
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
index 8adaf470..fd924f25 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
@@ -1,6 +1,7 @@
 package com.jeesite.modules.cms.ai.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 @ConfigurationProperties("spring.ai")
 public class CmsAiProperties {
@@ -20,6 +21,12 @@ public class CmsAiProperties {
 	 */
 	private String defaultPromptTemplate = "";
 
+	/**
+	 * 向量数据库设置
+	 */
+	@NestedConfigurationProperty
+	private final Vectorstore vectorstore = new Vectorstore();
+
 	public Boolean getToolCalls() {
 		return toolCalls;
 	}
@@ -43,4 +50,24 @@ public class CmsAiProperties {
 	public void setDefaultPromptTemplate(String defaultPromptTemplate) {
 		this.defaultPromptTemplate = defaultPromptTemplate;
 	}
+
+	public Vectorstore getVectorstore() {
+		return vectorstore;
+	}
+
+	public static class Vectorstore {
+
+		/**
+		 * 向量库类型选择：chroma、pgvector、elasticsearch、milvus
+		 */
+		private String type;
+
+		public String getType() {
+			return type;
+		}
+
+		public void setType(String type) {
+			this.type = type;
+		}
+	}
 }
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 94ceb69f..39413a39 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -3,6 +3,13 @@
 spring:
   ai:
 
+    # 模型选择：openai、ollama
+    model:
+      chat: ollama
+      embedding: ${spring.ai.model.chat}
+      image: ${spring.ai.model.chat}
+      audio: ${spring.ai.model.chat}
+
     # 在线大模型【请在 pom.xml 中打开 openai 的注释，并注释上其它模型】
     openai:
 
@@ -83,6 +90,9 @@ spring:
     # 向量数据库配置
     vectorstore:
 
+      # 向量库类型：chroma、pgvector、elasticsearch、milvus
+      type: chroma
+
       # Chroma 向量数据库【请在 pom.xml 中打开 chroma 的注释，并注释上其它向量库】
       chroma:
         client:
diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 05462ade..8c9e951a 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -13,7 +13,7 @@
 	<artifactId>jeesite-web-ai</artifactId>
 	<packaging>war</packaging>
 	
-	<description>Web AI 服务，也可为分离端提供接口服务</description>
+	<description>Web AI 服务</description>
 	
 	<name>JeeSite Web AI</name>
 	<url>http://jeesite.com</url>