From f37b47065191b20ba038be70505f1134a377292f Mon Sep 17 00:00:00 2001 From: bounce5733 Date: Mon, 20 Oct 2025 15:43:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E9=83=BD=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEdocId=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../torna/service/DocDiffRecordService.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java b/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java index 25af52b4..280123d3 100644 --- a/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java +++ b/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java @@ -62,17 +62,18 @@ public class DocDiffRecordService extends BaseLambdaService listDocDiff(Long docId) { - DocInfo docInfo = docInfoService.getById(docId); - String version = docInfo.getVersion(); - List diffRecordList; - // 如果有版本号,只能看截止到当前版本的记录 - if (StringUtils.hasText(version) && !"-".equals(version)) { - diffRecordList = listByField(DocDiffRecord::getDocId, docId); - } else { - // 可以查看所有变更记录 - String docKey = docInfoService.getDocKey(docId); - diffRecordList = listByField(DocDiffRecord::getDocKey, docKey); - } +// DocInfo docInfo = docInfoService.getById(docId); +// String version = docInfo.getVersion(); +// List diffRecordList; +// // 如果有版本号,只能看截止到当前版本的记录 +// if (StringUtils.hasText(version) && !"-".equals(version)) { +// diffRecordList = listByField(DocDiffRecord::getDocId, docId); +// } else { +// // 可以查看所有变更记录 +// String docKey = docInfoService.getDocKey(docId); +// diffRecordList = listByField(DocDiffRecord::getDocKey, docKey); +// } + List diffRecordList = listByField(DocDiffRecord::getDocId, docId); if (CollectionUtils.isEmpty(diffRecordList)) { return Collections.emptyList(); } -- Gitee From 05a9acfe24c5e196d74040071d5dfe7292d80e3d Mon Sep 17 00:00:00 2001 From: bounce5733 Date: Mon, 20 Oct 2025 16:38:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=89=80=E6=9C=89=E5=BF=AB=E7=85=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/META-INF/torna.properties | 2 ++ .../java/cn/torna/service/DocSnapshotService.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/boot/src/main/resources/META-INF/torna.properties b/server/boot/src/main/resources/META-INF/torna.properties index b3f2cef1..f0bf68ff 100644 --- a/server/boot/src/main/resources/META-INF/torna.properties +++ b/server/boot/src/main/resources/META-INF/torna.properties @@ -73,6 +73,8 @@ torna.view-config.response-hidden-columns=required,maxLength # \u521D\u59CB\u6392\u5E8F\u503C torna.view-config.init-order=10000 torna.view-config.compose-show-debug=true +# \u662F\u5426\u4FDD\u5B58\u6240\u6709\u5FEB\u7167 +torna.snapshot.save.all=false # \u65E5\u5FD7\u7B49\u7EA7 diff --git a/server/server-service/src/main/java/cn/torna/service/DocSnapshotService.java b/server/server-service/src/main/java/cn/torna/service/DocSnapshotService.java index d2d93ef0..c861f54b 100644 --- a/server/server-service/src/main/java/cn/torna/service/DocSnapshotService.java +++ b/server/server-service/src/main/java/cn/torna/service/DocSnapshotService.java @@ -16,6 +16,7 @@ import com.gitee.fastmybatis.core.support.BaseLambdaService; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -32,6 +33,9 @@ import java.util.stream.Collectors; @Slf4j public class DocSnapshotService extends BaseLambdaService { + @Value("${torna.snapshot.save.all:false}") + private boolean saveAllSnapshot; + @Autowired private DocInfoService docInfoService; @@ -73,10 +77,12 @@ public class DocSnapshotService extends BaseLambdaService