pull/1/head
liu 1 year ago
parent cb2d919420
commit 119754c431

@ -42,6 +42,13 @@
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId> <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
</dependency> </dependency>
<!--将http客户端引入httpclient,以提供给spring-ai使用,因为minio引入了okhttp,如果不引入httpclient,会导致自动使用okhttp(okhttp超时时间短,会导致大模型来不及回答消息)-->
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.3.1</version> <!-- 使用时请替换为最新的版本 -->
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>

@ -1,11 +1,13 @@
package com.supervision.config; package com.supervision.config;
import io.minio.MinioClient; import io.minio.MinioClient;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import java.util.concurrent.TimeUnit;
@Configuration @Configuration
public class MinioConfig { public class MinioConfig {
@ -13,9 +15,14 @@ public class MinioConfig {
* JavaMinioClient * JavaMinioClient
*/ */
@Bean @Bean
@ConditionalOnProperty(prefix = "minio",name = "url") @ConditionalOnProperty(prefix = "minio", name = "url")
public MinioClient minioClient(MinioProperties minioProperties) { public MinioClient minioClient(MinioProperties minioProperties) {
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(60, TimeUnit.SECONDS);
builder.readTimeout(120, TimeUnit.SECONDS);
builder.callTimeout(120, TimeUnit.SECONDS);
return MinioClient.builder().endpoint(minioProperties.getUrl()) return MinioClient.builder().endpoint(minioProperties.getUrl())
.httpClient(builder.build())
.credentials(minioProperties.getAccessKey(), minioProperties.getSecretKey()) .credentials(minioProperties.getAccessKey(), minioProperties.getSecretKey())
.build(); .build();
} }

@ -70,7 +70,7 @@ public class AiChatUtil {
String s = submit.get(); String s = submit.get();
return Optional.ofNullable(JSONUtil.toBean(s, clazz)); return Optional.ofNullable(JSONUtil.toBean(s, clazz));
} catch (ExecutionException | InterruptedException e) { } catch (ExecutionException | InterruptedException e) {
log.error("调用大模型生成失败"); log.error("调用大模型生成失败", e);
} }
return Optional.empty(); return Optional.empty();
} }

@ -69,18 +69,18 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- 用来生成yml文件,jakson的模板库满足不了多行文本|管道符的需求--> <!-- 用来生成yml文件,jakson的模板库满足不了多行文本|管道符的需求-->
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
</dependency> </dependency>
<!-- 文字转拼音--> <!-- 文字转拼音-->
<dependency> <dependency>
<groupId>io.github.biezhi</groupId> <groupId>io.github.biezhi</groupId>
<artifactId>TinyPinyin</artifactId> <artifactId>TinyPinyin</artifactId>
</dependency> </dependency>
<!-- excel操作--> <!-- excel操作-->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
@ -108,11 +108,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- 引入ollama的依赖.版本号来自于 dependencyManagement中 spring-ai-bom中的版本号.-->
<dependency>
<groupId>io.springboot.ai</groupId>
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>

@ -29,7 +29,7 @@ public class AiServiceImpl implements AiService {
, ,
, ,
'//'",! ''或''或'',!
'',','!!! '',','!!!
"""; """;

Loading…
Cancel
Save