sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'oracle'

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/resources/application-dev.yml
#	src/main/resources/application-test.yml
#	src/main/resources/application.yml
master
wujj 5 years ago
parent 94d2ee1137 3e26c01c95
commit 4bc7a7b2f1
4 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      lib/ojdbc8.jar
  2. 2
      src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
  3. 2
      src/main/java/net/mingsoft/cms/action/web/ContentAction.java
  4. 2
      src/main/webapp/WEB-INF/manager/cms/content/form.ftl

BIN
lib/ojdbc8.jar
View File

Binary file not shown.

2
src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
Unescape View File

@ -129,7 +129,7 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
if(category.getId()==null) { if(category.getId()==null) {
return ResultData.build().error(); 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); return ResultData.build().success(_category);
} }

2
src/main/java/net/mingsoft/cms/action/web/ContentAction.java
Unescape View File

@ -118,7 +118,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
if(content.getId()==null) { if(content.getId()==null) {
return ResultData.build().error(); 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); return ResultData.build().success(_content);
} }

2
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
Unescape View File

@ -272,7 +272,7 @@
scaleEnabled: true, scaleEnabled: true,
compressSide: 0, compressSide: 0,
maxImageSideLength: 1000, maxImageSideLength: 1000,
maximumWords: 2000, maximumWords: 100000,
initialFrameWidth: '100%', initialFrameWidth: '100%',
initialFrameHeight: 400, 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", 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",

Write Preview
Loading…
Cancel
Save