diff --git a/bin-xml b/bin-xml
deleted file mode 100644
index 870a84ab..00000000
--- a/bin-xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.2.2.RELEASE
-
- 4.0.0
- net.mingsoft
- ms-mcms
- 5.2.0
- ms-mcms
-
- 1.8
-
-
-
-
- net.mingsoft
- ms-mpeople
- 1.0.28
-
-
-
- net.mingsoft
- store-client
- 5.1
-
-
-
- ms-mcms
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
-
- ${java.version}
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
- repackage
-
-
-
-
-
- true
- net.mingsoft.MSApplication
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 3.1.0
-
-
- bin/assembly.xml
-
-
-
-
- make-assembly
- package
-
- single
-
-
-
-
-
-
-
-
- src/main/java
-
- **/*.java
-
-
-
- src/main/webapp
-
-
- static/**
- html/**
- upload/**
- templets/**
- WEB-INF/**
-
-
-
- compile
-
-
\ No newline at end of file
diff --git a/bin/assembly.xml b/bin/assembly.xml
deleted file mode 100644
index b8105c2f..00000000
--- a/bin/assembly.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
- bin
-
- dir
-
- false
-
-
-
- target
-
- *.jar
-
- ./
-
-
- target/lib
- ./lib
-
-
- src/main/resources
- ./config
-
-
- src/main/webapp/static
- ./static
-
-
- src/main/webapp/html
- ./html
-
-
- src/main/webapp/templets
- ./templets
-
-
- src/main/webapp/upload
- ./upload
-
-
- src/main/webapp/WEB-INF
- ./WEB-INF
-
-
- ./bin
-
- *.sh
- *.bat
-
- ./
-
-
-
\ No newline at end of file
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 98a95e89..51f31345 100755
--- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java
@@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation;
import net.mingsoft.base.entity.ResultData;
import net.mingsoft.basic.bean.EUListBean;
import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.bean.ContentBean;
import net.mingsoft.cms.biz.IContentBiz;
import net.mingsoft.cms.biz.IHistoryLogBiz;
import net.mingsoft.cms.entity.ContentEntity;
@@ -98,7 +99,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
})
@RequestMapping("/list")
@ResponseBody
- public ResultData list(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model,BindingResult result) {
+ public ResultData list(@ModelAttribute @ApiIgnore ContentBean content, HttpServletResponse response, HttpServletRequest request, @ApiIgnore ModelMap model, BindingResult result) {
BasicUtil.startPage();
List contentList = contentBiz.query(content);
return ResultData.build().success(new EUListBean(contentList,(int)BasicUtil.endPage(contentList).getTotal()));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 07628eb4..5b117e16 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -86,7 +86,6 @@ spring:
charset: utf-8
enabled: true
-
mybatis-plus:
global-config:
db-config: