sitemap time bugfix; add tool admin

polaris1119 · polaris1119 · commit a3d1910a615c · 2014-11-02T11:40:34.000+08:00
diff --git a/websites/code/studygolang/src/controller/admin/tool.go b/websites/code/studygolang/src/controller/admin/tool.go
@@ -0,0 +1,21 @@
+// Copyright 2013 The StudyGolang Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+// http://studygolang.com
+// Author：polaris	studygolang@gmail.com
+
+package admin
+
+import (
+	"net/http"
+
+	"filter"
+	"service"
+)
+
+// uri: /admin/tool/sitemap
+func GenSitemapHandler(rw http.ResponseWriter, req *http.Request) {
+	service.GenSitemap()
+	// 设置内容模板
+	req.Form.Set(filter.CONTENT_TPL_KEY, "/template/admin/tool/sitemap.html")
+}
diff --git a/websites/code/studygolang/src/model/reading.go b/websites/code/studygolang/src/model/reading.go
@@ -23,7 +23,7 @@ type MorningReading struct {
 	Id       int    `json:"id" pk:"1"`
 	Content  string `json:"content"`
 	Rtype    int    `json:"rtype"`
-	Inner    int    `json:"inner,omitempty"`
+	Inner    int    `json:"inner"`
 	Url      string `json:"url"`
 	Moreurls string `json:"moreurls"`
 	Username string `json:"username"`
diff --git a/websites/code/studygolang/src/server/studygolang/router.go b/websites/code/studygolang/src/server/studygolang/router.go
@@ -196,6 +196,9 @@ func initRouter() *mux.Router {
 	subrouter.HandleFunc("/reading/query.html", admin.ReadingQueryHandler)
 	subrouter.HandleFunc("/reading/publish", admin.PublishReadingHandler)
 
+	// 工具类
+	subrouter.HandleFunc("/tool/sitemap", admin.GenSitemapHandler)
+
 	apirouter := router.PathPrefix("/api").Subrouter()
 	apirouter.HandleFunc("/user/login", api.LoginHandler)
 	apirouter.HandleFunc("/blog/category/all", api.BlogCategoryHandler)
diff --git a/websites/code/studygolang/src/service/reading.go b/websites/code/studygolang/src/service/reading.go
@@ -102,6 +102,11 @@ func SaveReading(form url.Values, username string) (errMsg string, err error) {
 		return
 	}
 
+	reading.Moreurls = strings.TrimSpace(reading.Moreurls)
+	if strings.Contains(reading.Moreurls, "\n") {
+		reading.Moreurls = strings.Join(strings.Split(reading.Moreurls, "\n"), ",")
+	}
+
 	reading.Username = username
 
 	logger.Infoln(reading.Rtype, "id=", reading.Id)
diff --git a/websites/code/studygolang/src/service/sitemap.go b/websites/code/studygolang/src/service/sitemap.go
@@ -7,7 +7,6 @@
 package service
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 	"text/template"
@@ -19,7 +18,19 @@ import (
 	"util"
 )
 
-var sitemapTpl = template.Must(template.ParseFiles(config.ROOT + "/template/sitemap.xml"))
+// 自定义模板函数
+var funcMap = template.FuncMap{
+	"time_format": func(s string) string {
+		t, err := time.ParseInLocation("2006-01-02 15:04:05", s, time.Local)
+		if err != nil {
+			return s
+		}
+
+		return t.Format(time.RFC3339)
+	},
+}
+
+var sitemapTpl = template.Must(template.New("sitemap.xml").Funcs(funcMap).ParseFiles(config.ROOT + "/template/sitemap.xml"))
 var sitemapIndexTpl = template.Must(template.ParseFiles(config.ROOT + "/template/sitemapindex.xml"))
 
 var sitemapPath = config.ROOT + "/sitemap/"
@@ -205,8 +216,6 @@ func GenSitemap() {
 	if err != nil {
 		logger.Errorln("execute sitemap index template error:", err)
 	}
-
-	fmt.Println("finish")
 }
 
 func output(filename string, data map[string]interface{}) (err error) {
diff --git a/websites/code/studygolang/template/admin/tool/sitemap.html b/websites/code/studygolang/template/admin/tool/sitemap.html
@@ -0,0 +1,10 @@
+{{define "content"}}
+<div class="pageheader notab">
+	<h1 class="pagetitle">生成sitemap</h1>
+</div><!--pageheader-->
+
+<div id="contentwraapper" class="contentwrapper">
+	<div id="tooltip" class="red">生成成功！<a href="/sitemap/sitemapindex.xml" target="_blank">查看</a></div>
+	<br/>
+</div><!--contentwrapper-->
+{{end}}
diff --git a/websites/code/studygolang/template/sitemap.xml b/websites/code/studygolang/template/sitemap.xml
@@ -9,31 +9,31 @@
     </url>{{range .articles}}
     <url>
         <loc>{{$.home.loc}}/articles/{{.Id}}</loc>
-        <lastmod>{{.Mtime}}</lastmod>
+        <lastmod>{{time_format .Mtime}}</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>{{end}}{{range .topics}}
     <url>
         <loc>{{$.home.loc}}/topics/{{.Tid}}</loc>
-        <lastmod>{{.Mtime}}</lastmod>
+        <lastmod>{{time_format .Mtime}}</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>{{end}}{{range .resources}}
     <url>
         <loc>{{$.home.loc}}/resources/{{.Id}}</loc>
-        <lastmod>{{.Mtime}}</lastmod>
+        <lastmod>{{time_format .Mtime}}</lastmod>
         <changefreq>monthly</changefreq>
         <priority>0.6</priority>
     </url>{{end}}{{range .projects}}
     <url>
         <loc>{{$.home.loc}}/p/{{if .Uri}}{{.Uri}}{{else}}{{.Id}}{{end}}</loc>
-        <lastmod>{{.Mtime}}</lastmod>
+        <lastmod>{{time_format .Mtime}}</lastmod>
         <changefreq>monthly</changefreq>
         <priority>0.6</priority>
     </url>{{end}}{{range .wiki}}
     <url>
         <loc>{{$.home.loc}}/wiki/{{.Uri}}</loc>
-        <lastmod>{{.Mtime}}</lastmod>
+        <lastmod>{{time_format .Mtime}}</lastmod>
         <changefreq>monthly</changefreq>
         <priority>0.4</priority>
     </url>{{end}}
