diff --git a/lib/ojdbc8.jar b/lib/ojdbc8.jar new file mode 100755 index 00000000..2ebb05e6 Binary files /dev/null and b/lib/ojdbc8.jar differ 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 1cc58d59..31c916b3 100755 --- a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java @@ -129,7 +129,7 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{ if(category.getId()==null) { return ResultData.build().error(); } - CategoryEntity _category = (CategoryEntity)categoryBiz.getEntity(Integer.parseInt(category.getId())); + CategoryEntity _category = (CategoryEntity)categoryBiz.getById(category.getId()); return ResultData.build().success(_category); } 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 51f31345..eedefcb3 100755 --- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java @@ -118,7 +118,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ if(content.getId()==null) { return ResultData.build().error(); } - ContentEntity _content = (ContentEntity)contentBiz.getEntity(Integer.parseInt(content.getId())); + ContentEntity _content = (ContentEntity)contentBiz.getById(content.getId());; return ResultData.build().success(_content); } 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 573d4dc7..59c7593a 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl @@ -272,7 +272,7 @@ scaleEnabled: true, compressSide: 0, maxImageSideLength: 1000, - maximumWords: 2000, + maximumWords: 100000, initialFrameWidth: '100%', initialFrameHeight: 400, serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.1/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'" + ms.base + "\',fileUrlPrefix:\'" + ms.base + "\',imageUrlPrefix:\'" + ms.base + "\',imagePathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\',filePathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\',videoPathFormat:\'/upload/${appId}/cms/content/editor/%7Btime%7D\'%7D",