From 2777ca5b5525a509be1418bd506ed415eba5abcb Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 11:18:47 +0800 Subject: [PATCH 01/10] REQ-3540: try to repair tree --- .../doc/api/anonymous/request/NodeCreateAnonymous.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/anonymous/request/NodeCreateAnonymous.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/anonymous/request/NodeCreateAnonymous.java index abd284b7..4dcee41e 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/anonymous/request/NodeCreateAnonymous.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/anonymous/request/NodeCreateAnonymous.java @@ -44,6 +44,11 @@ abstract class NodeCreateAnonymous implements NodeCreate, IndexNodeScope { */ private Long operatorId; + /** + * 描述 + */ + private String description; + @Override public String biz() { return biz; @@ -64,6 +69,11 @@ abstract class NodeCreateAnonymous implements NodeCreate, IndexNodeScope { return operatorId; } + @Override + public String description() { + return description; + } + @Override public final IndexNodeScope nodeScope() { return this; From 0dde6cba806f4d07c5c0420bcd4914e836ad78a1 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:06:13 +0800 Subject: [PATCH 02/10] REQ-3540: try to repair tree --- .../java/cn/axzo/nanopart/doc/config/DocProps.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java index 26a043cf..0ac88f81 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java @@ -19,9 +19,9 @@ import lombok.Setter; @ConfigurationProperties(prefix = "doc") public class DocProps { - private String createFileWordOssFileKey = "ent-workspace-empty-docx"; - private String createFileExcelFileKey = "ent-workspace-empty-xlsx"; - private String createFilePptFileKey = "ent-workspace-empty-pptx"; + private String createFileOssFileKeyWord = "ent-workspace-empty-docx"; + private String createFileFileKeyExcel = "ent-workspace-empty-xlsx"; + private String createFileFileKeyPpt = "ent-workspace-empty-pptx"; private int indexNodeMaxChildrenSize = 200; private int indexNodeMaxDepth = 10; private int indexNodeMaxCopyFileSize = 1000; @@ -37,11 +37,11 @@ public class DocProps { public String createFileOssFileKey(FileFormat format) { if (format == FileFormat.WORD) - return createFileWordOssFileKey; + return createFileOssFileKeyWord; if (format == FileFormat.EXCEL) - return createFileExcelFileKey; + return createFileFileKeyExcel; if (format == FileFormat.PDF) - return createFilePptFileKey; + return createFileFileKeyPpt; return ""; } From ff1cd0c47b248dd09d1dac29664cff5c34175bb4 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:07:56 +0800 Subject: [PATCH 03/10] REQ-3540: foo --- .../main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java index c35f7301..09f7ef81 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java @@ -182,11 +182,11 @@ public class IndexManager { IndexNode srcNode = getOrThrow(srcCode); IndexNode destParentNode = determineDestParentNode(srcNode, destParentCode, "移动"); return async(() -> transaction.execute(unused -> { + docLogDao.log("indexNode:asyncMove", srcCode, "srcCode", srcCode, "destParentCode", destParentCode); if (docProps.isLockSubtreeWhenMove()) indexSupport.lockSubtree(srcNode); List subtreeNodes = indexSupport.collectValidSubtreeAsValueRoot(srcNode); RootNode moveRoot = IndexNodeTreeUtils.build(subtreeNodes); - docLogDao.log("indexNode:asyncMove", srcCode, "srcCode", srcCode, "destParentCode", destParentCode); return connectNodes(moveRoot, destParentNode); })); } From 61d1511493fa85572cb00a19240dbcda384986e7 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:16:37 +0800 Subject: [PATCH 04/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/doc/file/index/IndexManager.java | 11 +++++++++-- .../axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java | 5 +---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java index 09f7ef81..90ae521a 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java @@ -81,11 +81,18 @@ public class IndexManager { BizAssertions.assertNotBlank(ossFile.getOssFileKey(), "oosFileKey不能为空"); BizAssertions.assertNotBlank(ossFile.getExtension(), "extension不能为空"); IndexNode fileNode = createFile(node, ossFile); - indexNodeDao.updateFileSize(fileNode.getCode(), ossFile.getSize()); - fileBroadcaster.fireFileSizeChanged(fileNode.getCode()); + updateFileSize(fileNode, ossFile.getSize()); return fileNode; } + @BizTransactional + public void updateFileSize(IndexNode fileNode, int size) { + if (fileNode == null || !fileNode.isFile()) + return; + indexNodeDao.updateFileSize(fileNode.getCode(), size); + fileBroadcaster.fireFileSizeChanged(fileNode.getCode()); + } + public IndexNode createFile(NodeCreate create, OssFile ossFile) { Ref deleteOssFile = Ref.create(false); try { diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java index d81a6764..9ac35c2b 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java @@ -17,7 +17,6 @@ import cn.axzo.nanopart.doc.api.wps.response.WpsEditUploadCompleteResponse; import cn.axzo.nanopart.doc.api.wps.response.WpsEditUploadPrepareResponse; import cn.axzo.nanopart.doc.config.DocProps; import cn.axzo.nanopart.doc.dao.IndexNodeDao; -import cn.axzo.nanopart.doc.dao.TemplateDatabaseDao; import cn.axzo.nanopart.doc.entity.IndexNode; import cn.axzo.nanopart.doc.file.index.IndexManager; import cn.axzo.nanopart.doc.file.mq.FileBroadcaster; @@ -41,7 +40,6 @@ import lombok.extern.slf4j.Slf4j; public class WpsEditManager { private final IndexManager indexManager; - private final TemplateDatabaseDao templateDatabaseDao; private final IndexNodeDao indexNodeDao; private final DocOssGateway docOssGateway; private final FileBroadcaster fileBroadcaster; @@ -110,8 +108,7 @@ public class WpsEditManager { public WpsEditUploadCompleteResponse uploadComplete(WpsEditUploadCompleteRequest request) { log.info("wpsEditManager-uploadComplete-params,request:{}", request); IndexNode node = indexNodeDao.findOrNull(request.getDocCode()); - indexNodeDao.updateFileSize(request.getDocCode(), request.getSize()); - fileBroadcaster.fireFileSizeChanged(request.getDocCode()); + indexManager.updateFileSize(node, request.getSize()); return WpsEditUploadCompleteResponse.builder() .docCode(request.getDocCode()) .name(node.getFullFileName()) From 33ad8ea857fa59ade9f7a04f20b1fcd5d6d3287b Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:23:38 +0800 Subject: [PATCH 05/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/nanopart/doc/file/index/IndexSupport.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java index 9b8e89aa..4b6c5d40 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java @@ -31,7 +31,6 @@ import cn.axzo.nanopart.doc.dao.DocLockDao; import cn.axzo.nanopart.doc.dao.IndexNodeDao; import cn.axzo.nanopart.doc.entity.IndexNode; import cn.axzo.nanopart.doc.entity.domain.Path; -import cn.axzo.nanopart.doc.file.index.domain.NameUsedException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -132,8 +131,7 @@ public class IndexSupport { void ensureChildNameNotUsed(IndexNodeParentScope parentScope, IndexNodeType nodeType, String childName) { IndexNode child = indexNodeDao.findValidChildByName(parentScope, nodeType, childName); - if (child != null) - throw new NameUsedException("名称已被使用"); + BizAssertions.assertNull(child, "名称已被使用"); } void lockParentAndReleaseOnCommit(IndexNodeParentScope parentScope) { From b11893bb4f4cccc24f58fc4049a6c85dd4960492 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:23:52 +0800 Subject: [PATCH 06/10] =?UTF-8?q?Revert=20"REQ-3540:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 33ad8ea857fa59ade9f7a04f20b1fcd5d6d3287b. --- .../java/cn/axzo/nanopart/doc/file/index/IndexSupport.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java index 4b6c5d40..9b8e89aa 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java @@ -31,6 +31,7 @@ import cn.axzo.nanopart.doc.dao.DocLockDao; import cn.axzo.nanopart.doc.dao.IndexNodeDao; import cn.axzo.nanopart.doc.entity.IndexNode; import cn.axzo.nanopart.doc.entity.domain.Path; +import cn.axzo.nanopart.doc.file.index.domain.NameUsedException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -131,7 +132,8 @@ public class IndexSupport { void ensureChildNameNotUsed(IndexNodeParentScope parentScope, IndexNodeType nodeType, String childName) { IndexNode child = indexNodeDao.findValidChildByName(parentScope, nodeType, childName); - BizAssertions.assertNull(child, "名称已被使用"); + if (child != null) + throw new NameUsedException("名称已被使用"); } void lockParentAndReleaseOnCommit(IndexNodeParentScope parentScope) { From c8d9ccc25c5f7eb4e00d74b305c8bf687d6bb67d Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:24:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java index 9b8e89aa..a8f61524 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java @@ -132,6 +132,7 @@ public class IndexSupport { void ensureChildNameNotUsed(IndexNodeParentScope parentScope, IndexNodeType nodeType, String childName) { IndexNode child = indexNodeDao.findValidChildByName(parentScope, nodeType, childName); + // don't use BizAssertions.assertNull if (child != null) throw new NameUsedException("名称已被使用"); } From a5aab38757b9c95fe24698c473a5b9a467f0309c Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:33:46 +0800 Subject: [PATCH 08/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/anonymous/DocAnonymousDatabaseApiController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/anonymous/DocAnonymousDatabaseApiController.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/anonymous/DocAnonymousDatabaseApiController.java index bd531387..21e74a15 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/anonymous/DocAnonymousDatabaseApiController.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/anonymous/DocAnonymousDatabaseApiController.java @@ -26,16 +26,14 @@ public class DocAnonymousDatabaseApiController implements DocAnonymousDatabaseAp @Override public CommonResponse createDir(AnonymousCreateDirRequest request) { log.info("create dir request:{}", request); - IndexNode dirNode = indexManager.createDir(request); - return CommonResponse.success(dirNode.getCode()); + return CommonResponse.success(indexManager.createDir(request).getCode()); } @Override public CommonResponse createFile(AnonymousCreateFileRequest request) { log.info("create file request:{}", request); OssFile ossFile = indexManager.prepareEmptyOssFile(request, request.getFormat()); - IndexNode fileNode = indexManager.createFile(request, ossFile); - return CommonResponse.success(fileNode.getCode()); + return CommonResponse.success(indexManager.createFile(request, ossFile).getCode()); } } From b7f68fc7a66a6487a324ae1919c36503abc632b3 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:42:40 +0800 Subject: [PATCH 09/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/api/domain/DirectoryAttributes.java | 5 ----- .../doc/api/domain/IndexNodeAttributes.java | 5 +++++ .../reqeust/NodeCreateTemplateDatabase.java | 15 ++++++++++++++- .../reqeust/TemplateDatabaseCreateDirRequest.java | 8 +++----- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java index a8cbc7a5..6f981d7d 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/DirectoryAttributes.java @@ -11,9 +11,4 @@ import lombok.Setter; @Getter public class DirectoryAttributes { - /** - * 是否为资料库文件夹 - */ - private Boolean isTemplateDatabaseDir; - } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java index 388994a7..05e22110 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeAttributes.java @@ -20,6 +20,11 @@ public class IndexNodeAttributes { */ private Boolean customIcon; + /** + * 是否资料库创建的节点 + */ + private Boolean templateDatabaseNode; + /** * 数据库属性 */ diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java index 7e9098f7..1e4166df 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java @@ -3,11 +3,13 @@ package cn.axzo.nanopart.doc.api.templatedb.reqeust; import javax.validation.constraints.NotBlank; +import org.apache.commons.lang3.StringUtils; + +import cn.axzo.nanopart.doc.api.domain.IndexNodeAttributes; import cn.axzo.nanopart.doc.api.domain.IndexNodeScope; import cn.axzo.nanopart.doc.api.domain.NodeCreate; import lombok.Getter; import lombok.Setter; -import org.apache.commons.lang3.StringUtils; /** * @author yanglin @@ -48,4 +50,15 @@ abstract class NodeCreateTemplateDatabase implements NodeCreate { public Long operatorId() { return operatorId; } + + @Override + public final IndexNodeAttributes attributes() { + IndexNodeAttributes attributes = IndexNodeAttributes.create(); + attributes.setTemplateDatabaseNode(true); + postProcessAttributes(attributes); + return attributes; + } + + protected void postProcessAttributes(IndexNodeAttributes attributes) { + } } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java index 2ea43169..6c63f16b 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java @@ -3,9 +3,10 @@ package cn.axzo.nanopart.doc.api.templatedb.reqeust; import javax.validation.constraints.NotBlank; -import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; +import com.alibaba.fastjson.JSON; + import cn.axzo.nanopart.doc.api.domain.IndexNodeAttributes; import lombok.Getter; import lombok.Setter; @@ -51,11 +52,8 @@ public class TemplateDatabaseCreateDirRequest extends NodeCreateTemplateDatabase } @Override - public IndexNodeAttributes attributes() { - IndexNodeAttributes attributes = IndexNodeAttributes.create(); - attributes.getOrCreateDirectoryAttributes().setIsTemplateDatabaseDir(true); + protected void postProcessAttributes(IndexNodeAttributes attributes) { attributes.setCustomIcon(customIcon); - return attributes; } @Override From c00b31e8949b0982f381eca36087883d013ff632 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Mar 2025 14:44:51 +0800 Subject: [PATCH 10/10] =?UTF-8?q?REQ-3540:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reqeust/NodeCreateTemplateDatabase.java | 4 ---- .../reqeust/TemplateDatabaseCreateDirRequest.java | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java index 1e4166df..15aa2b9a 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/NodeCreateTemplateDatabase.java @@ -55,10 +55,6 @@ abstract class NodeCreateTemplateDatabase implements NodeCreate { public final IndexNodeAttributes attributes() { IndexNodeAttributes attributes = IndexNodeAttributes.create(); attributes.setTemplateDatabaseNode(true); - postProcessAttributes(attributes); return attributes; } - - protected void postProcessAttributes(IndexNodeAttributes attributes) { - } } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java index 6c63f16b..834ac1e4 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/templatedb/reqeust/TemplateDatabaseCreateDirRequest.java @@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils; import com.alibaba.fastjson.JSON; -import cn.axzo.nanopart.doc.api.domain.IndexNodeAttributes; import lombok.Getter; import lombok.Setter; @@ -34,11 +33,6 @@ public class TemplateDatabaseCreateDirRequest extends NodeCreateTemplateDatabase */ private String icon; - /** - * 是否为自定义的图标 - */ - private boolean customIcon; - public String icon() { return StringUtils.isBlank(icon) ? "" : icon; } @@ -51,11 +45,6 @@ public class TemplateDatabaseCreateDirRequest extends NodeCreateTemplateDatabase return StringUtils.isBlank(description) ? "" : description; } - @Override - protected void postProcessAttributes(IndexNodeAttributes attributes) { - attributes.setCustomIcon(customIcon); - } - @Override public String toString() { return JSON.toJSONString(this);