From 063d137afd75212a3cb75787f33ce31e8552e784 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 8 Apr 2023 13:31:44 +0800 Subject: [PATCH] update --- .../jeesite/modules/cms/db/InitCmsData.xlsx | Bin 28598 -> 28464 bytes .../modules/cmsfront/web/FrontController.java | 2 +- .../cmsfront/web/FrontSearchController.java | 2 +- .../modules/sys/web/user/UserController.java | 4 ++-- .../java/com/jeesite/test/DaoMapperTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx b/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx index a9f1e7d075dc2f9e33bc0f50bf1c345e132b95a1..89964fe9b69b5d99f545279973a5705edf52e971 100644 GIT binary patch delta 10484 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

^#A|> diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java index 71015c4e..3fb1e764 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java @@ -313,7 +313,7 @@ public class FrontController extends BaseController { @RequestMapping(value = "comment-{theme}", method = RequestMethod.GET) public String comment(Comment comment, @PathVariable String theme, HttpServletRequest request, HttpServletResponse response, Model model) { - Page page = new Page(request, response); + Page page = new Page<>(request, response); Comment c = new Comment(); c.setCategory(comment.getCategory()); c.setArticleId(comment.getArticleId()); diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java index b625c84a..21955790 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java @@ -56,7 +56,7 @@ public class FrontSearchController extends BaseController{ // 文章检索 if (StringUtils.isBlank(t) || "article".equals(t)){ - Page> page = new Page>(request, response); + Page> page = new Page<>(request, response); Map parmas = MapUtils.newHashMap(); if (StringUtils.isNotBlank(siteCode)){ parmas.put("siteCode", siteCode); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java index 5961bb1e..efa533e5 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java @@ -53,10 +53,10 @@ public class UserController extends BaseController { @ResponseBody public Page listData(User user, HttpServletRequest request, HttpServletResponse response) { // if (User.USER_TYPE_NONE.equals(user.getUserType())){ -// return new Page(request, response); +// return new Page<>(request, response); // } if (Global.isStrictMode() && !user.currentUser().isAdmin()){ - return new Page(request, response); + return new Page<>(request, response); } user.setPage(new Page<>(request, response)); Page page = userService.findPage(user); diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java index eb45e15a..4110d959 100644 --- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java +++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java @@ -178,7 +178,7 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("============ 分页测试,查询子节点 ============"); Company company4 = new Company("1"); company4.setFullName(company.getFullName()); - company4.setPage(new Page(1, 2)); + company4.setPage(new Page<>(1, 2)); company4.setIsQueryChildren(true); List companyListPage = companyDao.findList(company4); Assert.assertEquals("find page list size", companyListPage.size(), 2);