Merge branch 'oracle'

# Conflicts:
#	pom.xml
#	src/main/resources/application-dev.yml
#	src/main/resources/application-test.yml
#	src/main/resources/application.yml

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);
 	}
 

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);
 	}
 

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",