✨ add sitemap

otale · Dec 14, 2017 · 2a9502b · 2a9502b
1 parent 4d32f55
commit 2a9502b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/com/tale/controller/IndexController.java b/src/main/java/com/tale/controller/IndexController.java
@@ -102,8 +102,6 @@ public String page(@PathParam String cid, Request request) {
     @GetRoute(value = {"page/:page", "page/:page.html"})
     public String index(Request request, @PathParam int page, @Param(defaultValue = "12") int limit) {
         page = page < 0 || page > TaleConst.MAX_PAGE ? 1 : page;
-//        Page<Contents> articles = new Contents().where("type", Types.ARTICLE).and("status", Types.PUBLISH).page(page, limit, "created desc");
-//        request.attribute("articles", articles);
         if (page > 1) {
             this.title(request, "第" + page + "页");
         }

diff --git a/src/main/java/com/tale/utils/TaleUtils.java b/src/main/java/com/tale/utils/TaleUtils.java
@@ -285,24 +285,34 @@ public static String getRssXml(java.util.List<Contents> articles) throws FeedExc
     static class Url {
         String loc;
         String lastmod;
+
+        public Url(String loc) {
+            this.loc = loc;
+        }
     }
 
     public static String getSitemapXml(List<Contents> articles) {
         List<Url> urls = articles.stream()
                 .map(TaleUtils::parse)
                 .collect(Collectors.toList());
+        urls.add(new Url(Commons.site_url() + "/archives"));
 
         String urlBody = urls.stream()
-                .map(url -> "<url><loc>" + url.loc + "</loc><lastmod>" + url.lastmod + "</lastmod></url>")
+                .map(url -> {
+                    String s = "<url><loc>" + url.loc + "</loc>";
+                    if (null != url.lastmod) {
+                        s += "<lastmod>" + url.lastmod + "</lastmod>";
+                    }
+                    return s + "</url>";
+                })
                 .collect(Collectors.joining("\n"));
 
-        return SITEMAP_HEAD + urlBody;
+        return SITEMAP_HEAD + urlBody + "</urlset>";
     }
 
     private static Url parse(Contents contents) {
-        Url url = new Url();
-        url.loc = Commons.site_url() + "/article/" + contents.getCid();
-        url.lastmod = DateKit.toString(contents.getModified(), "YYYY-MM-DDThh:mmTZD");
+        Url url = new Url(Commons.site_url() + "/article/" + contents.getCid());
+        url.lastmod = DateKit.toString(contents.getModified(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
         return url;
     }