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
articles = articleService.getTotalArticle(); List 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 @@