diff --git a/src/main/java/net/mingsoft/MSApplication.java b/src/main/java/net/mingsoft/MSApplication.java old mode 100755 new mode 100644 index 2c03b86f..23212dab --- a/src/main/java/net/mingsoft/MSApplication.java +++ b/src/main/java/net/mingsoft/MSApplication.java @@ -19,8 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - package net.mingsoft; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/main/java/net/mingsoft/MSServletInitializer.java b/src/main/java/net/mingsoft/MSServletInitializer.java old mode 100755 new mode 100644 index 45b0119a..1dbdd9e8 --- a/src/main/java/net/mingsoft/MSServletInitializer.java +++ b/src/main/java/net/mingsoft/MSServletInitializer.java @@ -19,8 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - package net.mingsoft; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/net/mingsoft/cms/action/BaseAction.java b/src/main/java/net/mingsoft/cms/action/BaseAction.java index 4995cb0f..350d63af 100755 --- a/src/main/java/net/mingsoft/cms/action/BaseAction.java +++ b/src/main/java/net/mingsoft/cms/action/BaseAction.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.action; import java.util.MissingResourceException; diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java index c054051d..5e091cc9 100755 --- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java @@ -7,10 +7,10 @@ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * the Software, and to permit persons to whom the Software is furnished to do so, * subject to the following conditions: - + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.action; import cn.hutool.core.io.file.FileNameUtil; diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java index d58ff0c4..890b3569 100755 --- a/src/main/java/net/mingsoft/cms/action/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.action; import io.swagger.annotations.Api; diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index bb0d1df8..d1d5523b 100755 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -22,8 +22,6 @@ - - package net.mingsoft.cms.action; import cn.hutool.core.bean.BeanUtil; diff --git a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java index 59646437..68da8156 100755 --- a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package net.mingsoft.cms.action.web; @@ -63,7 +61,24 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{ */ @ApiOperation(value = "查询分类列表接口") @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "栏目管理ID", required =false,paramType="query"), @ApiImplicitParam(name = "categoryTitle", value = "栏目管理名称", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryShortTitle", value = "栏目管理副标题", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryPinyin", value = "栏目管理别名", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryId", value = "所属栏目id", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryType", value = "栏目管理属性", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryListUrl", value = "列表模板", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryUrl", value = "内容模板", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryKeyword", value = "栏目管理关键字", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryDescrip", value = "栏目管理描述", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"), + @ApiImplicitParam(name = "mdiyModelId", value = "文章管理的内容模型id", required =false,paramType="query"), + @ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryParentIds", value = "父类型编号", required =false,paramType="query"), + @ApiImplicitParam(name = "leaf", value = "叶子节点", required =false,paramType="query"), + @ApiImplicitParam(name = "topId", value = "顶级id", required =false,paramType="query"), }) @PostMapping(value="/list") @ResponseBody diff --git a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java index dbf88373..0755581e 100755 --- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package net.mingsoft.cms.action.web; @@ -73,15 +71,26 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ */ @ApiOperation(value = "查询文章列表接口") @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "文章id", required =false,paramType="query"), @ApiImplicitParam(name = "contentTitle", value = "文章标题", required =false,paramType="query"), + @ApiImplicitParam(name = "contentShortTitle", value = "文章副标题", required =false,paramType="query"), @ApiImplicitParam(name = "categoryId", value = "所属栏目", required =false,paramType="query"), - @ApiImplicitParam(name = "contentType", value = "文章类型", required =false,paramType="query"), - @ApiImplicitParam(name = "flag", value = "文章类型", required =false,paramType="query"), + @ApiImplicitParam(name = "contentType", value = "文章类型", required =false,paramType="query"), + @ApiImplicitParam(name = "contentAuthor", value = "文章作者", required =false,paramType="query"), + @ApiImplicitParam(name = "contentSource", value = "文章来源", required =false,paramType="query"), + @ApiImplicitParam(name = "contentDatetime", value = "发布时间", required =false,paramType="query"), + @ApiImplicitParam(name = "contentTags", value = "文章标签", required =false,paramType="query"), + @ApiImplicitParam(name = "contentDescription", value = "描述", required =false,paramType="query"), + @ApiImplicitParam(name = "contentKeyword", value = "关键字", required =false,paramType="query"), + @ApiImplicitParam(name = "contentDetails", value = "文章内容", required =false,paramType="query"), + @ApiImplicitParam(name = "contentOutLink", value = "文章跳转链接地址", required =false,paramType="query"), + @ApiImplicitParam(name = "contentHit", value = "点击次数", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryType", value = "栏目类型", required =false,paramType="query"), + @ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"), + @ApiImplicitParam(name = "flag", value = "属性标记", required =false,paramType="query"), @ApiImplicitParam(name = "noflag", value = "排除文章类型", required =false,paramType="query"), - @ApiImplicitParam(name = "contentDisplay", value = "是否显示", required =false,paramType="query"), - @ApiImplicitParam(name = "contentAuthor", value = "文章作者", required =false,paramType="query"), - @ApiImplicitParam(name = "contentSource", value = "文章来源", required =false,paramType="query"), - @ApiImplicitParam(name = "contentDatetime", value = "发布时间", required =false,paramType="query"), + @ApiImplicitParam(name = "hasDetailHtml", value = "文章是否被静态化", required =false,paramType="query"), + @ApiImplicitParam(name = "hasListHtml", value = "栏目是否被静态化", required =false,paramType="query"), }) @RequestMapping(value = "/list",method = {RequestMethod.GET,RequestMethod.POST}) @ResponseBody diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index 9236a2fb..1a1619ae 100755 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -19,8 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - package net.mingsoft.cms.action.web; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/net/mingsoft/cms/aop/CategoryAop.java b/src/main/java/net/mingsoft/cms/aop/CategoryAop.java old mode 100755 new mode 100644 index 234b5e7f..8ebed093 --- a/src/main/java/net/mingsoft/cms/aop/CategoryAop.java +++ b/src/main/java/net/mingsoft/cms/aop/CategoryAop.java @@ -20,7 +20,6 @@ */ - package net.mingsoft.cms.aop; import cn.hutool.core.collection.CollectionUtil; diff --git a/src/main/java/net/mingsoft/cms/aop/ContentAop.java b/src/main/java/net/mingsoft/cms/aop/ContentAop.java index 1729ccac..598c25b6 100755 --- a/src/main/java/net/mingsoft/cms/aop/ContentAop.java +++ b/src/main/java/net/mingsoft/cms/aop/ContentAop.java @@ -7,10 +7,10 @@ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * the Software, and to permit persons to whom the Software is furnished to do so, * subject to the following conditions: - + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.aop; import cn.hutool.core.io.FileUtil; diff --git a/src/main/java/net/mingsoft/cms/bean/CategoryBean.java b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java index 381af54e..f0e8c155 100755 --- a/src/main/java/net/mingsoft/cms/bean/CategoryBean.java +++ b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.bean; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/net/mingsoft/cms/bean/ContentBean.java b/src/main/java/net/mingsoft/cms/bean/ContentBean.java index b1fe0dff..ec8c59a0 100755 --- a/src/main/java/net/mingsoft/cms/bean/ContentBean.java +++ b/src/main/java/net/mingsoft/cms/bean/ContentBean.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package net.mingsoft.cms.bean; diff --git a/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java b/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java index c46adac5..1e0b91e6 100755 --- a/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java index 50357888..9d9c78db 100755 --- a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java b/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java index f1af513f..efc098ef 100755 --- a/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java index abb07503..14ade9ce 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java @@ -22,8 +22,6 @@ - - package net.mingsoft.cms.biz.impl; import cn.hutool.core.collection.CollUtil; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index 1dc898f8..19a51761 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -22,8 +22,6 @@ - - package net.mingsoft.cms.biz.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java index 2f89006f..aefb84e5 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ diff --git a/src/main/java/net/mingsoft/cms/constant/Const.java b/src/main/java/net/mingsoft/cms/constant/Const.java index 089004a5..73e9bba8 100755 --- a/src/main/java/net/mingsoft/cms/constant/Const.java +++ b/src/main/java/net/mingsoft/cms/constant/Const.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.constant; /** diff --git a/src/main/java/net/mingsoft/cms/constant/e/CategoryDisplayEnum.java b/src/main/java/net/mingsoft/cms/constant/e/CategoryDisplayEnum.java old mode 100755 new mode 100644 index fb277e53..5834c200 --- a/src/main/java/net/mingsoft/cms/constant/e/CategoryDisplayEnum.java +++ b/src/main/java/net/mingsoft/cms/constant/e/CategoryDisplayEnum.java @@ -19,8 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - package net.mingsoft.cms.constant.e; import net.mingsoft.base.constant.e.BaseEnum; diff --git a/src/main/java/net/mingsoft/cms/constant/e/CategoryIsSearchEnum.java b/src/main/java/net/mingsoft/cms/constant/e/CategoryIsSearchEnum.java old mode 100755 new mode 100644 index 5ef5c0f8..5f73391e --- a/src/main/java/net/mingsoft/cms/constant/e/CategoryIsSearchEnum.java +++ b/src/main/java/net/mingsoft/cms/constant/e/CategoryIsSearchEnum.java @@ -20,7 +20,6 @@ */ - package net.mingsoft.cms.constant.e; import net.mingsoft.base.constant.e.BaseEnum; diff --git a/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java b/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java index e64793ea..51db7d86 100755 --- a/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java +++ b/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java @@ -21,8 +21,6 @@ - - package net.mingsoft.cms.constant.e; import net.mingsoft.base.constant.e.BaseEnum; diff --git a/src/main/java/net/mingsoft/cms/constant/e/ContentEnum.java b/src/main/java/net/mingsoft/cms/constant/e/ContentEnum.java old mode 100755 new mode 100644 index 0b047cbf..4c89d724 --- a/src/main/java/net/mingsoft/cms/constant/e/ContentEnum.java +++ b/src/main/java/net/mingsoft/cms/constant/e/ContentEnum.java @@ -19,6 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package net.mingsoft.cms.constant.e; import net.mingsoft.base.constant.e.BaseEnum; diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java index 01b17e90..19cddd54 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java +++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java index 09ef851e..a158ffb7 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java +++ b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.java b/src/main/java/net/mingsoft/cms/dao/IContentDao.java index aa257120..94e2132e 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java index dd3fdd24..348a00a1 100755 --- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java @@ -7,10 +7,10 @@ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * the Software, and to permit persons to whom the Software is furnished to do so, * subject to the following conditions: - + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.entity; import cn.hutool.core.util.BooleanUtil; @@ -534,6 +532,13 @@ public class CategoryEntity extends BaseEntity { return this.categoryType; } + /** + * 获取栏目副标题 (标签使用) + */ + public String getTypeshorttitle(){ + return this.categoryShortTitle; + } + /** * 获取子分类数量 (标签使用） */ diff --git a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java index f536eaa4..e3734886 100755 --- a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package net.mingsoft.cms.entity; diff --git a/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java b/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java index f5eb9138..d134bb12 100755 --- a/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java @@ -1,25 +1,23 @@ -/** - * The MIT License (MIT) - * Copyright (c) 2012-present 铭软科技(mingsoft.net) - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package net.mingsoft.cms.entity; diff --git a/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties b/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties index 3d0d45d9..d76fabf2 100755 --- a/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties @@ -36,3 +36,4 @@ content.keyword=keyword template.file=template file not found category.pinyin=pinyin datetime.format=datatime format +cannot.select.child=cannot select child node diff --git a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties index f97c0c97..56899762 100755 --- a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties @@ -36,4 +36,5 @@ content.keyword=\u5173\u952E\u5B57 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6 category.pinyin=\u62FC\u97F3 datetime.format=\u65F6\u95F4\u683C\u5F0F +cannot.select.child=\u65e0\u6cd5\u9009\u62e9\u5b50\u8282\u70b9 diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 313cc320..fb34d457 100755 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -20,8 +20,6 @@ */ - - package net.mingsoft.cms.util; import cn.hutool.core.io.FileUtil; diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java old mode 100755 new mode 100644 index cc7bfbe0..b94cbe61 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/src/main/java/net/mingsoft/config/WebConfig.java @@ -19,8 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - package net.mingsoft.config; import cn.hutool.core.util.StrUtil; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 250d7824..4196d9cd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,6 +10,7 @@ server: error: include-exception: true include-message: always + # ssl: #https证书配置 配置了之后只能通过https访问应用 # key-store: xxx.pfx 证书文件，证书文件格式具体参考证书分发平台 # key-store-password: 1234 证书密码 @@ -29,6 +30,7 @@ ms: exclude-url: /ms/**,/static/**,/template/**,/file/upload.do,/static/plugins/ueditor/1.4.3.3/jsp/editor.do #过滤的参数名,多个用逗号分开 默认排除菜单、自定模型JSON、模版内容、文章内容，具体根据需要配置其他字段 exclude-filed: menuStr,modelField,modelUrl,modelJson,fileContent,contentDetails + # shiro-key: #16位长度，不填写默认随机生成 diy: html-dir: html diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl index 5a16467f..026faa3a 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -8,10 +8,10 @@

<@shiro.hasPermission name="cms:category:save"> - 保存 + 保存 - 返回 + 返回 @@ -41,10 +41,10 @@ + :key="treeKey" + :props="{value: 'id',label: 'categoryTitle',children: 'children'}" + :options="treeList" :style="{width:'100%'}" + v-model:value="form.categoryId">
不能将父级别栏目移动到自身子级栏目
@@ -84,7 +84,13 @@ 可以在自定义字典中管理
- + + + + - - - - + @@ -299,11 +299,13 @@ accept="image/*" list-type="picture-card"> -
- 只能上传1张图片 - 标签：<#noparse>{@ms:file field.typelitpic/}
-
+ @@ -321,15 +323,17 @@ accept="image/*" list-type="picture-card"> -
- 只能上传1张图片 - 标签：<#noparse>{@ms:file field.typeico/}
-
+ -
+ @@ -658,6 +662,7 @@ }); }, + //获取当前分类 get: function (id) { var that = this; @@ -828,10 +833,12 @@ title: '加载中...', name: 'custom-name' }); + }, }, created: function () { + this.queryColumnContentModelList(); this.queryCategoryModelList(); this.getTree(); @@ -840,6 +847,7 @@ this.categoryFlagOptionsGet(); this.form.id = ms.util.getParameter("id"); this.form.childId = ms.util.getParameter("childId");// 判断是否增加子栏目 + this.form.categoryId = '0'; // 判断三种状态，默认为新增状态 this.categoryTypeDisabled = false;// 控制栏目分类是否可编辑 if (this.form.id != undefined && (this.form.childId == undefined || this.form.childId == "undefined")) { @@ -852,13 +860,11 @@ this.form.categoryId = this.form.childId; } } + }); - - - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl index d8dc126d..822b8b00 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl @@ -124,7 +124,7 @@ "label": "列表" }, { "value": "2", - "label": "封面" + "label": "单篇" }, { "value": "3", "label": "链接" diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl index a9dd5048..4c6414cd 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl @@ -13,14 +13,14 @@ 编号：{{form.id}} - + <@shiro.hasPermission name="cms:content:save"> - 保存 + 保存 - 返回 + 返回 删除 @@ -225,14 +225,16 @@ accept="image/*" list-type="picture-card"> -
- 标签：${'{@ms:file field.litpic/}'}
- 最多可上传10张图片，文章缩略图,支持jpg格式；多图情况下，{@ms:file field.litpic/}会只取第一张缩略图，其他用法参考文档arclist标签 -
+ - + - - {{ data.categoryTitle }} - + diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl index d04aa4c6..c062ef0a 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl @@ -417,7 +417,11 @@ }); if (data && data.categoryPath) { // row.url /html/web/categoryPath/文章id.html categoryPath做占位符 - path = row.url.replace("categoryPath",data.categoryPath); + if (data.categoryType === "2"){ + path = row.url.replace("categoryPath/"+row.id,data.categoryPinyin+"/index"); + }else { + path = row.url.replace("categoryPath",data.categoryPath); + } }else { path = row.url; } diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl index 9f5dba8b..4e322e9d 100644 --- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl @@ -56,7 +56,7 @@
- @@ -99,7 +99,7 @@
- diff --git a/src/main/webapp/static/images/login-banner.png b/src/main/webapp/static/images/login-banner.png index 15004bd8..8da31232 100644 Binary files a/src/main/webapp/static/images/login-banner.png and b/src/main/webapp/static/images/login-banner.png differ