diff --git a/pom.xml b/pom.xml index bf17726d..1ab53d36 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.5.6 4.0.0 net.mingsoft ms-mcms - 6.0.3 + 6.1.0 ${project.groupId}:${project.artifactId} jar @@ -21,22 +21,22 @@ net.mingsoft ms-base - 3.0.3 + 3.0.4 net.mingsoft ms-basic - 3.0.3 + 3.0.4 net.mingsoft ms-mdiy - 3.0.3 + 3.0.4 net.mingsoft store-client - 3.0.3 + 3.0.4 com.github.oshi diff --git a/src/main/java/net/mingsoft/cms/action/BaseAction.java b/src/main/java/net/mingsoft/cms/action/BaseAction.java index f023db1e..e33b6a18 100755 --- a/src/main/java/net/mingsoft/cms/action/BaseAction.java +++ b/src/main/java/net/mingsoft/cms/action/BaseAction.java @@ -158,7 +158,7 @@ public class BaseAction extends BaseFileAction { return new EditorStateBean(false, "上传涂鸦图片失败").toString(); } - UploadConfigBean bean = new UploadConfigBean(uploadPath, file, null, true); + UploadConfigBean bean = new UploadConfigBean(uploadPath, file, true); bean.setFileSize(bytes.length); bean.setFileName(file.getName()); EditorStateBean state = new EditorStateBean(); @@ -200,7 +200,7 @@ public class BaseAction extends BaseFileAction { continue; } - UploadConfigBean bean = new UploadConfigBean(uploadPath, file, null, true); + UploadConfigBean bean = new UploadConfigBean(uploadPath, file, true); bean.setFileSize(file.getSize()); bean.setFileName(file.getName()); @@ -236,7 +236,7 @@ public class BaseAction extends BaseFileAction { return new EditorStateBean(false, getResString("err.error", getResString("file.name"))).toString(); } // 组装uploadConfigBean上传使用 - UploadConfigBean bean = new UploadConfigBean(uploadPath, upfile, null, true); + UploadConfigBean bean = new UploadConfigBean(uploadPath, upfile, true); bean.setFileSize(upfile.getSize()); bean.setFileName(upfile.getOriginalFilename()); try { 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 88f0fd33..20c68fb6 100755 --- a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java @@ -83,7 +83,6 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{ @PostMapping(value="/list") @ResponseBody public ResultData list(@ModelAttribute @Parameter(hidden = true) CategoryEntity category) { - BasicUtil.startPage(); category.setSqlWhere(""); List categoryList = categoryBiz.query(category); return ResultData.build().success(new EUListBean(categoryList,(int)BasicUtil.endPage(categoryList).getTotal())); diff --git a/src/main/java/net/mingsoft/cms/aop/EditorFileVerifyAop.java b/src/main/java/net/mingsoft/cms/aop/EditorFileVerifyAop.java index 8e5186ec..174516be 100644 --- a/src/main/java/net/mingsoft/cms/aop/EditorFileVerifyAop.java +++ b/src/main/java/net/mingsoft/cms/aop/EditorFileVerifyAop.java @@ -1,24 +1,3 @@ -/** - * 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.aop; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 0e86573d..b4512c90 100755 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -163,7 +163,7 @@ public class CmsParserUtil { columnListPath = ParserUtil.buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX, htmlDir, parserParams.get(ParserUtil.APP_DIR).toString()); // 设置分页的起始位置 page.setPageNo(pageNo); - String read = ParserUtil.rendering(File.separator + column.getCategoryListUrl(), parserParams); + String read = ParserUtil.rendering(column.getCategoryListUrl(), parserParams); FileUtil.writeString(read, columnListPath, Const.UTF8); } else { @@ -181,7 +181,7 @@ public class CmsParserUtil { } // 设置分页的起始位置 page.setPageNo(pageNo); - String read = ParserUtil.rendering(File.separator + column.getCategoryListUrl(), parserParams); + String read = ParserUtil.rendering(column.getCategoryListUrl(), parserParams); FileUtil.writeString(read, columnListPath, Const.UTF8); pageNo++; } diff --git a/src/main/webapp/static/images/ms.png b/src/main/webapp/static/images/ms.png index 614183aa..81e37b10 100644 Binary files a/src/main/webapp/static/images/ms.png and b/src/main/webapp/static/images/ms.png differ diff --git a/src/main/webapp/static/plugins/ueditor/1.4.3.3/index.html b/src/main/webapp/static/plugins/ueditor/1.4.3.3/index.html new file mode 100644 index 00000000..a4164182 --- /dev/null +++ b/src/main/webapp/static/plugins/ueditor/1.4.3.3/index.html @@ -0,0 +1,175 @@ + + + + 完整demo + + + + + + + + + + +

+

完整demo

+ +
+
+
+ + + + + + + + + + + +
+
+ + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + + + \ No newline at end of file