From c0ab4a020d8ced2e65e237fa7fc39617dcec1ef5 Mon Sep 17 00:00:00 2001
From: jinia91 <creee77@gmail.com>
Date: Fri, 17 Dec 2021 17:04:50 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B9=83=ED=97=99=20=EB=B0=B1=EC=97=85=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/myblog/blog/article/controller/ArticleController.java | 2 +-
 src/main/java/myblog/blog/article/service/ArticleService.java  | 3 ++-
 src/main/java/myblog/blog/seo/service/SiteMapService.java      | 3 ++-
 src/main/resources/templates/login.html                        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/myblog/blog/article/controller/ArticleController.java b/src/main/java/myblog/blog/article/controller/ArticleController.java
index 2714c3d..5531628 100644
--- a/src/main/java/myblog/blog/article/controller/ArticleController.java
+++ b/src/main/java/myblog/blog/article/controller/ArticleController.java
@@ -78,7 +78,7 @@ public class ArticleController {
         }
 
         Long articleId = articleService.writeArticle(articleForm, principal.getMember());
-//        articleService.pushArticleToGithub(article);
+        articleService.pushArticleToGithub(articleId);
         tempArticleService.deleteTemp();
 
         return "redirect:/article/view?articleId=" + articleId;
diff --git a/src/main/java/myblog/blog/article/service/ArticleService.java b/src/main/java/myblog/blog/article/service/ArticleService.java
index 5fe73ed..056d93b 100644
--- a/src/main/java/myblog/blog/article/service/ArticleService.java
+++ b/src/main/java/myblog/blog/article/service/ArticleService.java
@@ -179,8 +179,9 @@ public class ArticleService {
     /*
         - 깃헙에 아티클 푸시하기
     */
-    public void pushArticleToGithub(Article article) {
+    public void pushArticleToGithub(Long articleId) {
         try {
+            Article article = articleRepository.findById(articleId).get();
             GitHub gitHub = new GitHubBuilder().withOAuthToken(gitToken).build();
             GHRepository repository = gitHub.getRepository(gitRepo);
             repository.createContent()
diff --git a/src/main/java/myblog/blog/seo/service/SiteMapService.java b/src/main/java/myblog/blog/seo/service/SiteMapService.java
index c8fcb4f..4bd35d5 100644
--- a/src/main/java/myblog/blog/seo/service/SiteMapService.java
+++ b/src/main/java/myblog/blog/seo/service/SiteMapService.java
@@ -16,6 +16,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 @Service
 @RequiredArgsConstructor
@@ -37,7 +38,7 @@ public class SiteMapService {
     public String makeSiteMap(){
         List<Article> articles = articleService.getTotalArticle();
         List<Category> allCategories = categoryService.getAllCategories();
-        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss Z", Locale.ENGLISH);
 
         // siteMap 레이아웃 루트 작성
         Element siteMap = new Element("urlset", NAMESPACE);
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 2175f31..54a22a5 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -50,7 +50,7 @@
 
             <div class="col m-2">
                 <a href="/oauth2/authorization/naver">
-                    <button class="btnCtm btn-naver">네이버 로그인</button>
+                    <button class="btnCtm btn-naver">네이버 로그인<div>(검토중)</div></button>
                 </a>
             </div>
         </div>