From da4d034ad3d3255a3d46d8fc7bc7738e6f6b718c Mon Sep 17 00:00:00 2001
From: lifei6671 <longfei6671@163.com>
Date: Wed, 19 Sep 2018 16:12:32 +0800
Subject: [PATCH] =?UTF-8?q?perf:1=E3=80=81=E4=BC=98=E5=8C=96=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=84=9A=E6=9C=AC=E5=8A=9F=E8=83=BD=202?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/BaseController.go   | 12 +++++++-----
 views/account/login.tpl         |  5 +++--
 views/blog/index.tpl            |  1 +
 views/blog/list.tpl             | 13 ++++---------
 views/document/default_read.tpl |  2 +-
 views/home/index.tpl            | 12 ++++--------
 views/label/index.tpl           | 10 +++-------
 views/label/list.tpl            |  9 +++------
 views/search/index.tpl          | 10 +++-------
 9 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/controllers/BaseController.go b/controllers/BaseController.go
index d9cce7e8..8c5edd10 100644
--- a/controllers/BaseController.go
+++ b/controllers/BaseController.go
@@ -12,8 +12,9 @@ import (
 	"github.com/lifei6671/mindoc/conf"
 	"github.com/lifei6671/mindoc/models"
 	"github.com/lifei6671/mindoc/utils"
-	"github.com/lifei6671/mindoc/utils/filetil"
 	"path/filepath"
+	"io/ioutil"
+	"html/template"
 )
 
 type BaseController struct {
@@ -69,13 +70,14 @@ func (c *BaseController) Prepare() {
 			c.Option[item.OptionName] = item.OptionValue
 		}
 		c.EnableAnonymous = strings.EqualFold(c.Option["ENABLE_ANONYMOUS"], "true")
-		c.EnableDocumentHistory = strings.EqualFold(c.Option["ENABLE_DOCUMENT_HISTORY"],"true")
+		c.EnableDocumentHistory = strings.EqualFold(c.Option["ENABLE_DOCUMENT_HISTORY"], "true")
 	}
-	c.Data["HighlightStyle"] = beego.AppConfig.DefaultString("highlight_style","github")
+	c.Data["HighlightStyle"] = beego.AppConfig.DefaultString("highlight_style", "github")
 
-	if filetil.FileExists(filepath.Join(beego.BConfig.WebConfig.ViewsPath,"widgets","scripts.tpl")) {
-		c.LayoutSections["Scripts"] = "widgets/scripts.tpl"
+	if b, err := ioutil.ReadFile(filepath.Join(beego.BConfig.WebConfig.ViewsPath, "widgets", "scripts.tpl")); err == nil {
+		c.Data["Scripts0"] = template.HTML(string(b))
 	}
+
 }
 
 // SetMember 获取或设置当前登录用户信息,如果 MemberId 小于 0 则标识删除 Session
diff --git a/views/account/login.tpl b/views/account/login.tpl
index 362ff4d4..8766a32e 100644
--- a/views/account/login.tpl
+++ b/views/account/login.tpl
@@ -6,9 +6,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="author" content="SmartWiki" />
+    <meta name="author" content="MinDoc" />
     <title>用户登录 - Powered by MinDoc</title>
-
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <!-- Bootstrap -->
     <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
diff --git a/views/blog/index.tpl b/views/blog/index.tpl
index 03ddb3f1..403a758e 100644
--- a/views/blog/index.tpl
+++ b/views/blog/index.tpl
@@ -129,5 +129,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file
diff --git a/views/blog/list.tpl b/views/blog/list.tpl
index 46660209..d4567c02 100644
--- a/views/blog/list.tpl
+++ b/views/blog/list.tpl
@@ -4,20 +4,14 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-
     <title>文章列表 - Powered by MinDoc</title>
-
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <!-- Bootstrap -->
     <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
-
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
+
     <style type="text/css">
         .footer{margin-top: 0;}
         .label {
@@ -63,5 +57,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file
diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl
index 1559deea..64148765 100644
--- a/views/document/default_read.tpl
+++ b/views/document/default_read.tpl
@@ -10,7 +10,7 @@
     <meta name="renderer" content="webkit">
     <meta name="author" content="Minho" />
     <meta name="site" content="https://www.iminho.me" />
-    <meta name="keywords" content="{{.Model.BookName}},{{.Title}}">
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理,{{.Model.BookName}},{{.Title}}">
     <meta name="description" content="{{.Title}}-{{if .Description}}{{.Description}}{{else}}{{.Model.Description}}{{end}}">
 
     <!-- Bootstrap -->
diff --git a/views/home/index.tpl b/views/home/index.tpl
index 6a2b9dc3..d0d97a01 100644
--- a/views/home/index.tpl
+++ b/views/home/index.tpl
@@ -8,18 +8,13 @@
     <meta name="renderer" content="webkit">
     <meta name="author" content="Minho" />
     <meta name="site" content="https://www.iminho.me" />
-    <meta name="description" content="{{.site_description}}">
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <!-- Bootstrap -->
     <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
-
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
+
 </head>
 <body>
 <div class="manual-reader manual-container">
@@ -77,5 +72,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file
diff --git a/views/label/index.tpl b/views/label/index.tpl
index b358d742..bcfb858c 100644
--- a/views/label/index.tpl
+++ b/views/label/index.tpl
@@ -6,18 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>{{.LabelName}} - Powered by MinDoc</title>
-
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理,{{.LabelName}}">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <!-- Bootstrap -->
     <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
 
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="manual-reader manual-container manual-search-reader">
@@ -63,5 +58,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file
diff --git a/views/label/list.tpl b/views/label/list.tpl
index 5c4fa86e..99cf0a3a 100644
--- a/views/label/list.tpl
+++ b/views/label/list.tpl
@@ -6,6 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>标签列表 - Powered by MinDoc</title>
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <meta name="author" content="Minho" />
     <meta name="site" content="https://www.iminho.me" />
     <!-- Bootstrap -->
@@ -13,12 +15,6 @@
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
 
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="manual-reader manual-container manual-search-reader">
@@ -50,5 +46,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file
diff --git a/views/search/index.tpl b/views/search/index.tpl
index b09ec3fa..f8c49da8 100644
--- a/views/search/index.tpl
+++ b/views/search/index.tpl
@@ -6,18 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>搜索 - Powered by MinDoc</title>
-
+    <meta name="keywords" content="MinDoc,文档在线管理系统,WIKI,wiki,wiki在线,文档在线管理,接口文档在线管理,接口文档管理,{{.Keyword}}">
+    <meta name="description" content="MinDoc文档在线管理系统 {{.site_description}}">
     <!-- Bootstrap -->
     <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
 
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="manual-reader manual-container manual-search-reader">
@@ -57,5 +52,6 @@
 </div>
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
+{{.Scripts}}
 </body>
 </html>
\ No newline at end of file