diff --git a/src/main/java/cn/celess/blog/controller/LinksController.java b/src/main/java/cn/celess/blog/controller/LinksController.java index 16c751f..e81ee0e 100644 --- a/src/main/java/cn/celess/blog/controller/LinksController.java +++ b/src/main/java/cn/celess/blog/controller/LinksController.java @@ -66,7 +66,7 @@ public class LinksController { @GetMapping("/admin/links") public Response all(@RequestParam("page") int page, @RequestParam("count") int count) { - return ResponseUtil.success(partnerSiteService.PartnerSitePages(page, count)); + return ResponseUtil.success(partnerSiteService.partnerSitePages(page, count)); } @PostMapping("/apply") @@ -94,6 +94,5 @@ public class LinksController { Boolean send = mailService.send(message); redisUtil.setEx(request.getRemoteAddr() + "-Apply", applyTime + 1 + "", 2, TimeUnit.HOURS); return send ? ResponseUtil.success("") : ResponseUtil.failure(""); - } } diff --git a/src/main/java/cn/celess/blog/entity/request/LinkReq.java b/src/main/java/cn/celess/blog/entity/request/LinkReq.java index 137673e..e7ed027 100644 --- a/src/main/java/cn/celess/blog/entity/request/LinkReq.java +++ b/src/main/java/cn/celess/blog/entity/request/LinkReq.java @@ -11,5 +11,7 @@ public class LinkReq { private long id; private String name; private String url; + private String iconPath; + private String desc; private boolean open; } diff --git a/src/main/java/cn/celess/blog/service/PartnerSiteService.java b/src/main/java/cn/celess/blog/service/PartnerSiteService.java index 6874604..6d28b27 100644 --- a/src/main/java/cn/celess/blog/service/PartnerSiteService.java +++ b/src/main/java/cn/celess/blog/service/PartnerSiteService.java @@ -1,8 +1,8 @@ package cn.celess.blog.service; import cn.celess.blog.entity.PartnerSite; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.LinkReq; -import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; import java.util.List; @@ -44,7 +44,7 @@ public interface PartnerSiteService { * @param page 数据页 * @return 分页数据 */ - PageInfo PartnerSitePages(int page, int count); + PageData partnerSitePages(int page, int count); /** * 获取全部数据 diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java index af47434..9bcf5b8 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java @@ -2,6 +2,7 @@ package cn.celess.blog.service.serviceimpl; import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.PartnerSite; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.exception.MyException; import cn.celess.blog.mapper.PartnerMapper; @@ -87,17 +88,16 @@ public class PartnerSiteServiceImpl implements PartnerSiteService { } @Override - public PageInfo PartnerSitePages(int page, int count) { + public PageData partnerSitePages(int page, int count) { PageHelper.startPage(page, count); List sitePage = partnerMapper.findAll(); - PageInfo pageInfo = new PageInfo(sitePage); - return pageInfo; + PageInfo pageInfo = new PageInfo(sitePage); + return new PageData<>(pageInfo, sitePage); } @Override public List findAll() { - List all = partnerMapper.findAll(); - return all; + return partnerMapper.findAll(); } diff --git a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java index 32791c0..b96c49b 100644 --- a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java @@ -2,6 +2,7 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.PartnerSite; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.mapper.PartnerMapper; import com.github.pagehelper.PageInfo; @@ -73,6 +74,8 @@ public class LinksControllerTest extends BaseTest { PartnerSite partnerSite = new PartnerSite(); partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setOpen(true); + partnerSite.setDesc(""); + partnerSite.setIconPath(""); partnerSite.setUrl("https://www.celess.cn"); mapper.insert(partnerSite); PartnerSite lastest = mapper.getLastest(); @@ -99,6 +102,9 @@ public class LinksControllerTest extends BaseTest { PartnerSite partnerSite = new PartnerSite(); partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setOpen(true); + partnerSite.setDesc(""); + partnerSite.setIconPath(""); + partnerSite.setDelete(false); partnerSite.setUrl("https://www.celess.cn"); mapper.insert(partnerSite); // 查数据 @@ -147,17 +153,15 @@ public class LinksControllerTest extends BaseTest { mockMvc.perform(get("/admin/links?page=1&count=10").header("Authorization", adminLogin())).andDo(result -> { JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PageInfo pageInfo = (PageInfo) JSONObject.toBean(object.getJSONObject(Result), PageInfo.class); - assertNotEquals(0, pageInfo.getStartRow()); - assertNotEquals(0, pageInfo.getEndRow()); - assertEquals(1, pageInfo.getPageNum()); - assertEquals(10, pageInfo.getPageSize()); - pageInfo.getList().forEach(o -> { + PageData pageData = (PageData) JSONObject.toBean(object.getJSONObject(Result), PageData.class); + assertEquals(1, pageData.getPageNum()); + assertEquals(10, pageData.getPageSize()); + for (Object o : pageData.getList()) { PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class); assertNotNull(site.getUrl()); assertNotNull(site.getName()); assertNotNull(site.getOpen()); - }); + } }); }