From 7d7a0fc82dff35540b822dd804af98ef9bb222a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Tue, 26 May 2020 14:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=B1=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/celess/blog/entity/PartnerSite.java      | 2 +-
 src/main/java/cn/celess/blog/entity/TagCategory.java      | 4 ++--
 .../blog/service/serviceimpl/ArticleServiceImpl.java      | 8 +++++++-
 .../blog/service/serviceimpl/PartnerSiteServiceImpl.java  | 4 +++-
 src/main/java/cn/celess/blog/util/ModalTrans.java         | 6 ++++++
 src/main/resources/mapper/WebUpdateInfoMapper.xml         | 1 +
 .../java/cn/celess/blog/mapper/CategoryMapperTest.java    | 8 ++++----
 .../java/cn/celess/blog/mapper/PartnerMapperTest.java     | 2 +-
 src/test/java/cn/celess/blog/mapper/TagMapperTest.java    | 6 +++---
 9 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cn/celess/blog/entity/PartnerSite.java b/src/main/java/cn/celess/blog/entity/PartnerSite.java
index 40ae597..a45c477 100644
--- a/src/main/java/cn/celess/blog/entity/PartnerSite.java
+++ b/src/main/java/cn/celess/blog/entity/PartnerSite.java
@@ -23,7 +23,7 @@ public class PartnerSite {
 
     private String desc;
 
-    private boolean delete;
+    private Boolean delete = false;
 
     public PartnerSite() {
     }
diff --git a/src/main/java/cn/celess/blog/entity/TagCategory.java b/src/main/java/cn/celess/blog/entity/TagCategory.java
index e8c0a16..78ec3ed 100644
--- a/src/main/java/cn/celess/blog/entity/TagCategory.java
+++ b/src/main/java/cn/celess/blog/entity/TagCategory.java
@@ -13,7 +13,7 @@ public class TagCategory {
 
     private String name;
 
-    private boolean category = true;
+    private Boolean category = true;
 
-    private boolean deleted = false;
+    private Boolean deleted = false;
 }
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
index 68ae080..ecb1b92 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
@@ -321,7 +321,10 @@ public class ArticleServiceImpl implements ArticleService {
         open.forEach(article -> {
             ArticleModel model = ModalTrans.article(article, true);
             model.setTags(null);
-            setPreAndNextArticle(model);
+            //            setPreAndNextArticle(model);
+            model.setNextArticle(null);
+            model.setPreArticle(null);
+            modelList.add(model);
         });
         return new PageData<ArticleModel>(new PageInfo<Article>(open), modelList);
     }
@@ -337,6 +340,9 @@ public class ArticleServiceImpl implements ArticleService {
         List<ArticleModel> modelList = new ArrayList<>();
         articleByTag.forEach(articleTag -> {
             ArticleModel model = ModalTrans.article(articleTag.getArticle(), true);
+            model.setNextArticle(null);
+            model.setPreArticle(null);
+            modelList.add(model);
         });
         return new PageData<ArticleModel>(new PageInfo<ArticleTag>(articleByTag), modelList);
     }
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 9bcf5b8..992b7b0 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
@@ -97,7 +97,9 @@ public class PartnerSiteServiceImpl implements PartnerSiteService {
 
     @Override
     public List<PartnerSite> findAll() {
-        return partnerMapper.findAll();
+        List<PartnerSite> all = partnerMapper.findAll();
+        all.forEach(partnerSite -> partnerSite.setDelete(null));
+        return all;
     }
 
 
diff --git a/src/main/java/cn/celess/blog/util/ModalTrans.java b/src/main/java/cn/celess/blog/util/ModalTrans.java
index a8c817f..22c6eec 100644
--- a/src/main/java/cn/celess/blog/util/ModalTrans.java
+++ b/src/main/java/cn/celess/blog/util/ModalTrans.java
@@ -22,6 +22,10 @@ public class ModalTrans {
         articleModel.setOriginal(article.getType());
         articleModel.setCategory(article.getCategory().getName());
         articleModel.setAuthor(user(article.getUser()));
+        articleModel.getTags().forEach(tag -> {
+            tag.setCategory(null);
+            tag.setDeleted(null);
+        });
         return articleModel;
     }
 
@@ -46,6 +50,8 @@ public class ModalTrans {
         userModel.setAvatarImgUrl(user.getAvatarImgUrl() == null || user.getAvatarImgUrl().length() == 0 ?
                 null :
                 "http://cdn.celess.cn/" + user.getAvatarImgUrl());
+        userModel.setRole(null);
+        userModel.setEmailStatus(null);
         userModel.setDisplayName(user.getDisplayName() == null ? user.getEmail() : user.getDisplayName());
         userModel.setRecentlyLandedDate(DateFormatUtil.get(user.getRecentlyLandedDate()));
         return userModel;
diff --git a/src/main/resources/mapper/WebUpdateInfoMapper.xml b/src/main/resources/mapper/WebUpdateInfoMapper.xml
index 4f42e4e..eb0094e 100644
--- a/src/main/resources/mapper/WebUpdateInfoMapper.xml
+++ b/src/main/resources/mapper/WebUpdateInfoMapper.xml
@@ -37,6 +37,7 @@
     <select id="findAll" resultMap="webUpdateResultMap">
         select *
         from web_update
+        order by wu_id desc
     </select>
 
     <select id="findAllNotDeleted" resultMap="webUpdateResultMap">
diff --git a/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java b/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java
index d43d79e..3cdd172 100644
--- a/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java
+++ b/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java
@@ -25,11 +25,11 @@ public class CategoryMapperTest extends BaseTest {
     @Test
     public void delete() {
         Category category = generateCategory();
-        assertFalse(category.isDeleted());
+        assertFalse(category.getDeleted());
         int lines = categoryMapper.delete(category.getId());
         assertNotEquals(0, lines);
         Category categoryById = categoryMapper.findCategoryById(category.getId());
-        assertTrue(categoryById.isDeleted());
+        assertTrue(categoryById.getDeleted());
     }
 
     @Test
@@ -76,7 +76,7 @@ public class CategoryMapperTest extends BaseTest {
     public void findAll() {
         List<Category> all = categoryMapper.findAll();
         assertNotEquals(0, all);
-        all.forEach(category -> assertTrue(category.isCategory()));
+        all.forEach(category -> assertTrue(category.getCategory()));
     }
 
     @Test
@@ -107,7 +107,7 @@ public class CategoryMapperTest extends BaseTest {
     @Test
     public void count() {
         List<Category> all = categoryMapper.findAll();
-        List<Category> collect = all.stream().filter(category -> !category.isDeleted()).collect(Collectors.toList());
+        List<Category> collect = all.stream().filter(category -> !category.getDeleted()).collect(Collectors.toList());
         assertEquals(collect.size(), categoryMapper.count());
     }
 
diff --git a/src/test/java/cn/celess/blog/mapper/PartnerMapperTest.java b/src/test/java/cn/celess/blog/mapper/PartnerMapperTest.java
index 8662432..478cd22 100644
--- a/src/test/java/cn/celess/blog/mapper/PartnerMapperTest.java
+++ b/src/test/java/cn/celess/blog/mapper/PartnerMapperTest.java
@@ -25,7 +25,7 @@ public class PartnerMapperTest extends BaseTest {
         PartnerSite partnerSite = generatePartnerSite();
         assertEquals(1, partnerMapper.delete(partnerSite.getId()));
         partnerSite = partnerMapper.findById(partnerSite.getId());
-        assertTrue(partnerSite.isDelete());
+        assertTrue(partnerSite.getDelete());
     }
 
     @Test
diff --git a/src/test/java/cn/celess/blog/mapper/TagMapperTest.java b/src/test/java/cn/celess/blog/mapper/TagMapperTest.java
index b9c1445..58ddff3 100644
--- a/src/test/java/cn/celess/blog/mapper/TagMapperTest.java
+++ b/src/test/java/cn/celess/blog/mapper/TagMapperTest.java
@@ -32,10 +32,10 @@ public class TagMapperTest extends BaseTest {
     @Test
     public void delete() {
         Tag tag = generateTag();
-        assertFalse(tag.isDeleted());
+        assertFalse(tag.getDeleted());
         assertEquals(1, tagMapper.delete(tag.getId()));
         Tag tagById = tagMapper.findTagById(tag.getId());
-        assertTrue(tagById.isDeleted());
+        assertTrue(tagById.getDeleted());
     }
 
     @Test
@@ -80,7 +80,7 @@ public class TagMapperTest extends BaseTest {
     public void count() {
         assertNotEquals(0, tagMapper.count());
         List<Tag> all = tagMapper.findAll();
-        List<Tag> collect = all.stream().filter(tag -> !tag.isDeleted()).collect(Collectors.toList());
+        List<Tag> collect = all.stream().filter(tag -> !tag.getDeleted()).collect(Collectors.toList());
         assertEquals(collect.size(), tagMapper.count());
     }