From 021aff2fc5166ba19fae9e5f11642e81c5003073 Mon Sep 17 00:00:00 2001 From: xierz Date: Tue, 19 Jan 2021 14:32:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4web=E5=B1=82=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/web/ContentAction.java | 5 +++-- src/main/java/net/mingsoft/cms/dao/IContentDao.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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..8d6a0170 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())); @@ -113,7 +114,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ @ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query") @GetMapping("/get") @ResponseBody - public ResultData get(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){ + public ResultData get(@ModelAttribute @ApiIgnore ContentBean content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){ if(content.getId()==null) { return ResultData.build().error(); } diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml index b26e8820..d59a619c 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml @@ -156,7 +156,7 @@ - select * from cms_content del=0 From bf60f341fe43fa7054055ff3cfd304cd410fe84d Mon Sep 17 00:00:00 2001 From: msgroup Date: Tue, 19 Jan 2021 14:43:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin-xml | 106 ----------------------------------------------- bin/assembly.xml | 53 ------------------------ 2 files changed, 159 deletions(-) delete mode 100644 bin-xml delete mode 100644 bin/assembly.xml 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} - ${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 From fcdc208b19a53e27854478a002d351779d174c77 Mon Sep 17 00:00:00 2001 From: xierz Date: Tue, 19 Jan 2021 15:07:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/dao/IContentDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml index d59a619c..b26e8820 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml @@ -156,7 +156,7 @@ - select * from cms_content del=0 From 83df45be528345bdde1d537b1a34ca4bad8574da Mon Sep 17 00:00:00 2001 From: xierz Date: Tue, 19 Jan 2021 15:08:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/web/ContentAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d6a0170..51f31345 100755 --- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java @@ -114,7 +114,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ @ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query") @GetMapping("/get") @ResponseBody - public ResultData get(@ModelAttribute @ApiIgnore ContentBean content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){ + public ResultData get(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){ if(content.getId()==null) { return ResultData.build().error(); } From b871d8a24011b7448b271fa5bf0387b691aa1695 Mon Sep 17 00:00:00 2001 From: msgroup Date: Tue, 19 Jan 2021 15:59:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 1 - 1 file changed, 1 deletion(-) 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: