diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java
index 9f9686a..350bff9 100644
--- a/src/main/java/com/xly/service/XlyErpService.java
+++ b/src/main/java/com/xly/service/XlyErpService.java
@@ -102,9 +102,9 @@ public class XlyErpService {
){ // 缺失的参数明细
sResponMessage = session.getSFunPrompts();
}
-// if (session.getCurrentTool()== null){
-// sResponMessage = StrUtil.EMPTY;
-// }
+ if (session.getCurrentTool()== null){
+ sResponMessage = StrUtil.EMPTY;
+ }
//5.执行工具方法后,清除记忆
if(session.getBCleanMemory()){
operableChatMemoryProvider.clearSpecifiedMemory(userId);
diff --git a/src/main/java/com/xly/tool/DynamicToolProvider.java b/src/main/java/com/xly/tool/DynamicToolProvider.java
index 43c0ae9..79fd1cd 100644
--- a/src/main/java/com/xly/tool/DynamicToolProvider.java
+++ b/src/main/java/com/xly/tool/DynamicToolProvider.java
@@ -235,7 +235,7 @@ public class DynamicToolProvider implements ToolProvider {
if(ObjectUtil.isNotEmpty(meta.getStoolDesc())){
stoolDesc.append("MethodNo:").append(meta.getSMethodNo()).append(",核心工作内容:【").append(meta.getSMethodName()).append("】").append(meta.getStoolDesc());
}
- if("SinglePageQuote".equals(meta.getSMethodNo())){
+ if("boxQuote".equals(meta.getSMethodNo())){
log.info(meta.getSParamRules());
}
try {
@@ -625,11 +625,10 @@ public class DynamicToolProvider implements ToolProvider {
sName = ObjectUtil.isEmpty(sName)?StrUtil.EMPTY:"["+sName+"]";
markdown.append("请确认是否执行").append(sName).append("操作?1.全部数据生成多个单据 回复【全部确认】;2.全部数据生成一个单据 回复【合并确认】;3.按自然语义描述生成一个单据 如"1,3行确认"\n");
//全部确认 ,部分确认,取消
- markdown.append("回复: ").append("**全部确认**").append(" ")
- .append("**合并确认**").append(" ")
- .append("**取消**");
+ markdown.append("回复: ").append("**全部确认**").append(" ")
+ .append("**合并确认**").append(" ")
+ .append("**取消**");
}
-
/***
* @Author 钱豹
* @Date 14:56 2026/2/9
@@ -997,6 +996,10 @@ public class DynamicToolProvider implements ToolProvider {
public String buildResultMessageWithTable(ToolMeta meta,ErpResult erpResult){
ErpDataset dataset = erpResult.getDataset();
+ //返回错误信息
+ if(erpResult.getCode()<0 && ObjectUtil.isNotEmpty(erpResult.getMsg())){
+ return erpResult.getMsg();
+ }
if(dataset==null){
return ErrorCode.DATA_NOT_FOUND.getMessage();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e926fa..2b9c968 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -49,6 +49,24 @@ spring:
connection-timeout: 30000
idle-timeout: 600000
max-lifetime: 1800000
+ # REDIS (RedisProperties)
+# redis:
+# host: 127.0.0.1
+# password: xlyXLY2015
+# port: 6380
+# database: 8 # index
+# timeout: 30000ms # 连接超时时长(毫秒)
+# block-when-exhausted: true #redis配置结束
+# lettuce:
+# pool:
+# # 连接池中的最大空闲连接
+# max-idle: 20
+# # 连接池中的最小空闲连接
+# min-idle: 20
+# # 连接池最大连接数(使用负值表示没有限制)
+# max-active: 200
+# # 连接池最大阻塞等待时间(使用负值表示没有限制)
+# max-wait: -1
# application.yml 或 application.properties
langchain4j: