日志修复
This commit is contained in:
@@ -797,7 +797,7 @@ CLICKZETTA_VECTOR_DISTANCE_FUNCTION=cosine_distance
|
|||||||
# ------------------------------
|
# ------------------------------
|
||||||
|
|
||||||
# Upload file size limit, default 15M.
|
# Upload file size limit, default 15M.
|
||||||
UPLOAD_FILE_SIZE_LIMIT=15
|
UPLOAD_FILE_SIZE_LIMIT=100
|
||||||
|
|
||||||
# The maximum number of files that can be uploaded at a time, default 5.
|
# The maximum number of files that can be uploaded at a time, default 5.
|
||||||
UPLOAD_FILE_BATCH_LIMIT=5
|
UPLOAD_FILE_BATCH_LIMIT=5
|
||||||
|
|||||||
@@ -267,10 +267,16 @@ public class DifyApiClient {
|
|||||||
try {
|
try {
|
||||||
// 构建 data JSON 字符串(包含所有元数据)
|
// 构建 data JSON 字符串(包含所有元数据)
|
||||||
Map<String, Object> dataMap = new HashMap<>();
|
Map<String, Object> dataMap = new HashMap<>();
|
||||||
if (uploadRequest.getName() != null) {
|
|
||||||
|
// name 字段:如果提供则使用,否则使用文件名
|
||||||
|
if (uploadRequest.getName() != null && !uploadRequest.getName().trim().isEmpty()) {
|
||||||
dataMap.put("name", uploadRequest.getName());
|
dataMap.put("name", uploadRequest.getName());
|
||||||
|
} else {
|
||||||
|
dataMap.put("name", originalFilename);
|
||||||
}
|
}
|
||||||
if (uploadRequest.getIndexingTechnique() != null) {
|
|
||||||
|
// indexing_technique 字段:只有在明确提供且非空时才添加
|
||||||
|
if (uploadRequest.getIndexingTechnique() != null && !uploadRequest.getIndexingTechnique().trim().isEmpty()) {
|
||||||
dataMap.put("indexing_technique", uploadRequest.getIndexingTechnique());
|
dataMap.put("indexing_technique", uploadRequest.getIndexingTechnique());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -284,9 +290,6 @@ public class DifyApiClient {
|
|||||||
dataMap.put("process_rule", defaultProcessRule);
|
dataMap.put("process_rule", defaultProcessRule);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 只保留官方支持的参数
|
|
||||||
// doc_form 和 doc_language 不是请求参数,移除
|
|
||||||
|
|
||||||
String dataJson = JSON.toJSONString(dataMap);
|
String dataJson = JSON.toJSONString(dataMap);
|
||||||
logger.info("上传文档到知识库: datasetId={}, file={}, data={}", datasetId, originalFilename, dataJson);
|
logger.info("上传文档到知识库: datasetId={}, file={}, data={}", datasetId, originalFilename, dataJson);
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class KnowledgeFileLogServiceImpl implements KnowledgeFileLogService{
|
|||||||
knowledgeFileLog.setOptsn(IdUtil.getOptsn());
|
knowledgeFileLog.setOptsn(IdUtil.getOptsn());
|
||||||
knowledgeFileLog.setLogId(IdUtil.generateID());
|
knowledgeFileLog.setLogId(IdUtil.generateID());
|
||||||
ValidationResult rt = ValidationUtils.validate(knowledgeFileLog, Arrays.asList(
|
ValidationResult rt = ValidationUtils.validate(knowledgeFileLog, Arrays.asList(
|
||||||
|
ValidationUtils.requiredString("fileId", "文件id")
|
||||||
));
|
));
|
||||||
if(!rt.isValid()){
|
if(!rt.isValid()){
|
||||||
return ResultDomain.failure("日志参数校验失败");
|
return ResultDomain.failure("日志参数校验失败");
|
||||||
|
|||||||
@@ -26,8 +26,18 @@
|
|||||||
optsn, log_id, knowledge_id, file_root_id, file_id, file_name, version,
|
optsn, log_id, knowledge_id, file_root_id, file_id, file_name, version,
|
||||||
action, service, creator, creator_name, create_time
|
action, service, creator, creator_name, create_time
|
||||||
) VALUES (
|
) VALUES (
|
||||||
#{optsn}, #{logId}, #{knowledgeId}, #{fileRootId}, #{fileId}, #{fileName}, #{version},
|
#{optsn}, #{logId}, #{knowledgeId}, #{fileRootId}, #{fileId},
|
||||||
#{action}, #{service}, #{creator}, #{creatorName}, NOW()
|
<choose>
|
||||||
|
<!-- action为delete时,查询历史fileName,无数据则填空字符串 -->
|
||||||
|
<when test="action == 'delete'">
|
||||||
|
(SELECT COALESCE(file_name, '') FROM ai.tb_knowledge_file_log WHERE file_id = #{fileId} LIMIT 1)
|
||||||
|
</when>
|
||||||
|
<!-- 其他操作直接使用传入的fileName -->
|
||||||
|
<otherwise>
|
||||||
|
#{fileName}
|
||||||
|
</otherwise>
|
||||||
|
</choose>,
|
||||||
|
#{version}, #{action}, #{service}, #{creator}, #{creatorName}, NOW()
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user