From e96bbae31d6f842d06c663c149b7fc5056b2b9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=AE=E7=8E=A5?= <190785909@qq.com> Date: Sun, 8 Oct 2023 19:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=AB=99=E7=82=B9/=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE=E6=89=A9=E5=B1=95=E6=A8=A1=E5=9E=8B=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=86=85=E5=AE=B9=E7=8B=AC=E7=AB=8B=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=A0=8F=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E9=A1=B5=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chestnut/contentcore/domain/dto/ContentDTO.java | 9 +++++++-- .../com/chestnut/contentcore/domain/vo/ContentVO.java | 5 +++++ .../properties/MaxPageOnContentPublishProperty.java | 4 ++-- .../com/chestnut/exmodel/service/ExModelService.java | 3 ++- chestnut-common/pom.xml | 2 +- .../chestnut/search/controller/SearchLogController.java | 1 - chestnut-modules/pom.xml | 2 +- chestnut-ui/src/views/index.vue | 4 ++-- pom.xml | 3 ++- 9 files changed, 22 insertions(+), 11 deletions(-) diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/dto/ContentDTO.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/dto/ContentDTO.java index f4681da8..7bbe3180 100644 --- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/dto/ContentDTO.java +++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/dto/ContentDTO.java @@ -169,8 +169,13 @@ public class ContentDTO { * 独立模板 */ private Map template; - - /** + + /** + * 独立路径 + */ + private String staticPath; + + /** * 备注 */ private String remark; diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/ContentVO.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/ContentVO.java index b6edef73..374c4d32 100644 --- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/ContentVO.java +++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/ContentVO.java @@ -185,6 +185,11 @@ public class ContentVO { * 发布通道 */ private String[] publishPipe; + + /** + * 独立路径 + */ + private String staticPath; /** * 发布通道配置 diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/properties/MaxPageOnContentPublishProperty.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/properties/MaxPageOnContentPublishProperty.java index 5caf794e..abfc36b4 100644 --- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/properties/MaxPageOnContentPublishProperty.java +++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/properties/MaxPageOnContentPublishProperty.java @@ -37,12 +37,12 @@ public class MaxPageOnContentPublishProperty implements IProperty { @Override public boolean validate(String value) { - return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value.toString()); + return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value); } @Override public Integer defaultValue() { - return 5; + return 0; } @Override diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/service/ExModelService.java b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/service/ExModelService.java index 8083b030..357441ac 100644 --- a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/service/ExModelService.java +++ b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/service/ExModelService.java @@ -1,6 +1,7 @@ package com.chestnut.exmodel.service; import com.chestnut.common.utils.NumberUtils; +import com.chestnut.common.utils.StringUtils; import com.chestnut.contentcore.domain.CmsCatalog; import com.chestnut.contentcore.domain.CmsContent; import com.chestnut.contentcore.service.ICatalogService; @@ -71,7 +72,7 @@ public class ExModelService { dto.setLabel(f.getName()); dto.setFieldName(CmsExtendMetaModelType.DATA_FIELD_PREFIX + f.getCode()); dto.setControlType(f.getControlType()); - dto.setValue(fv); + dto.setValue(Objects.requireNonNullElse(fv, StringUtils.EMPTY)); dto.setOptions(XModelUtils.getOptions(f.getOptions())); IMetaControlType controlType = controlTypeMap.get(IMetaControlType.BEAN_PREFIX + f.getControlType()); diff --git a/chestnut-common/pom.xml b/chestnut-common/pom.xml index dfcb78da..8d6b7ab2 100644 --- a/chestnut-common/pom.xml +++ b/chestnut-common/pom.xml @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java index d76963d8..05e8f732 100644 --- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java +++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java @@ -6,7 +6,6 @@ import com.chestnut.common.log.annotation.Log; import com.chestnut.common.log.enums.BusinessType; import com.chestnut.common.security.anno.Priv; import com.chestnut.common.security.web.BaseRestController; -import com.chestnut.common.utils.IP2RegionUtils; import com.chestnut.common.utils.StringUtils; import com.chestnut.search.domain.SearchLog; import com.chestnut.search.service.ISearchLogService; diff --git a/chestnut-modules/pom.xml b/chestnut-modules/pom.xml index 6a77c5d8..209091f2 100644 --- a/chestnut-modules/pom.xml +++ b/chestnut-modules/pom.xml @@ -24,4 +24,4 @@ chestnut-word chestnut-monitor - \ No newline at end of file + diff --git a/chestnut-ui/src/views/index.vue b/chestnut-ui/src/views/index.vue index 253705dc..4092060a 100644 --- a/chestnut-ui/src/views/index.vue +++ b/chestnut-ui/src/views/index.vue @@ -34,7 +34,7 @@ export default { 'shortcut': SysShortcut, 'server-info': ServerInfo, 'cms-site-visit-stat': CmsSiteVisitStat, - 'cms-site-data-stat': CmsSiteDataStat + 'cms-site-data-stat': CmsSiteDataStat, }, data() { return { @@ -64,4 +64,4 @@ export default { padding: 8px; } } - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 8cb27da4..c781339a 100644 --- a/pom.xml +++ b/pom.xml @@ -421,6 +421,7 @@ ${chestnut.version} + @@ -595,4 +596,4 @@ - \ No newline at end of file +