From d340ba821868c382fc377b0c47447716c2c8d03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Fri, 24 Jul 2020 00:36:13 +0800
Subject: [PATCH] ...

---
 .../blog/controller/ArticleController.java    | 15 ++++++--
 .../controller/ArticleControllerTest.java     | 37 ++++++-------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cn/celess/blog/controller/ArticleController.java b/src/main/java/cn/celess/blog/controller/ArticleController.java
index 7889fba..f11835e 100644
--- a/src/main/java/cn/celess/blog/controller/ArticleController.java
+++ b/src/main/java/cn/celess/blog/controller/ArticleController.java
@@ -9,6 +9,7 @@ import cn.celess.blog.service.ArticleService;
 import cn.celess.blog.util.RedisUserUtil;
 import cn.celess.blog.util.SitemapGenerateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,6 +28,8 @@ public class ArticleController {
     SitemapGenerateUtil sitemapGenerateUtil;
     @Autowired
     RedisUserUtil redisUserUtil;
+    @Value("${spring.profiles.active}")
+    private String activeModel;
 
     /**
      * 新建一篇文章
@@ -37,7 +40,9 @@ public class ArticleController {
     @PostMapping("/admin/article/create")
     public Response create(@RequestBody ArticleReq body) {
         ArticleModel articleModel = articleService.create(body);
-        sitemapGenerateUtil.createSitemap();
+        if ("prod".equals(activeModel)) {
+            sitemapGenerateUtil.createSitemap();
+        }
         return Response.success(articleModel);
     }
 
@@ -50,7 +55,9 @@ public class ArticleController {
     @DeleteMapping("/admin/article/del")
     public Response delete(@RequestParam("articleID") long articleId) {
         boolean delete = articleService.delete(articleId);
-        sitemapGenerateUtil.createSitemap();
+        if ("prod".equals(activeModel)) {
+            sitemapGenerateUtil.createSitemap();
+        }
         return Response.success(delete);
     }
 
@@ -63,7 +70,9 @@ public class ArticleController {
     @PutMapping("/admin/article/update")
     public Response update(@RequestBody ArticleReq body) {
         ArticleModel update = articleService.update(body);
-        sitemapGenerateUtil.createSitemap();
+        if ("prod".equals(activeModel)) {
+            sitemapGenerateUtil.createSitemap();
+        }
         return Response.success(update);
     }
 
diff --git a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java
index 6a0346e..eddf17c 100644
--- a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java
+++ b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java
@@ -70,33 +70,20 @@ public class ArticleControllerTest extends BaseTest {
 
     @Test
     public void delete() {
-        Article article = articleMapper.getLastestArticle();
-
+        Article article;
+        do {
+            article = articleMapper.getLastestArticle();
+            create();
+        } while (article.isDeleted());
+        assertFalse(article.isDeleted());
+        MockHttpServletRequestBuilder delete = MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId());
         try {
-            // 未登录删除文章
-            mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId())
-            ).andDo(result -> {
-                assertEquals(HAVE_NOT_LOG_IN.getCode(),
-                        JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)
-                );
+            getMockData(delete, adminLogin()).andDo(result -> {
+                JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString());
+                assertEquals(SUCCESS.getCode(), object.getInt(Code));
+                // 断言删除成功
+                assertTrue(object.getBoolean(Result));
             });
-            // user 权限删除文章
-            String token = userLogin();
-            mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId())
-                    .header("Authorization", token))
-                    .andDo(result -> assertEquals(PERMISSION_ERROR.getCode(),
-                            JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))
-                    );
-            // admin 权限删除文章
-            token = adminLogin();
-            mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId())
-                    .header("Authorization", token))
-                    .andDo(result -> {
-                        JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString());
-                        assertEquals(SUCCESS.getCode(), object.getInt(Code));
-                        // 断言删除成功
-                        assertTrue(object.getBoolean(Result));
-                    });
         } catch (Exception e) {
             e.printStackTrace();
         }