修复二级子目录BUG

conf/enumerate.go

@@ -80,7 +80,7 @@ func GetDatabasePrefix() string {
 
 //获取默认头像
 func GetDefaultAvatar() string {
-	return beego.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg")
+	return URLForWithCdnImage(beego.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
 }
 
 //获取阅读令牌长度.
@@ -90,7 +90,7 @@ func GetTokenSize() int {
 
 //获取默认文档封面.
 func GetDefaultCover() string {
-	return beego.AppConfig.DefaultString("cover", "/static/images/book.jpg")
+	return URLForWithCdnImage(beego.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
 }
 
 //获取允许的商城文件的类型.

controllers/ManagerController.go

@@ -56,6 +56,10 @@ func (c *ManagerController) Users() {
 	if totalCount > 0 {
 		pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl())
 		c.Data["PageHtml"] = pager.HtmlPages()
+
+		for _,item := range members {
+			item.Avatar = conf.URLForWithCdnImage(item.Avatar)
+		}
 	} else {
 		c.Data["PageHtml"] = ""
 	}

routers/filter.go

@@ -24,7 +24,7 @@ func init() {
 
 				ctx.ResponseWriter.Write(returnJSON)
 			} else {
-				ctx.Redirect(302, beego.URLFor("AccountController.Login") + "?url=" + url.PathEscape(ctx.Request.URL.RequestURI()))
+				ctx.Redirect(302, conf.URLFor("AccountController.Login") + "?url=" +  url.PathEscape(conf.BaseUrl + ctx.Request.URL.RequestURI()))
 			}
 		}
 	}

views/account/register.tpl

@@ -7,12 +7,12 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="author" content="SmartWiki" />
-    <title>用户登录 - Powered by MinDoc</title>
+    <title>用户注册 - Powered by MinDoc</title>
 
     <!-- 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="/static/css/main.css" rel="stylesheet">
+    <link href="{{cdncss "/static/css/main.css"}}" 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]>
@@ -26,7 +26,7 @@
 <header class="navbar navbar-static-top smart-nav navbar-fixed-top manual-header" role="banner">
     <div class="container">
         <div class="navbar-header col-sm-12 col-md-6 col-lg-5">
-            <a href="/" class="navbar-brand">{{.SITE_NAME}}</a>
+            <a href="{{.BaseUrl}}" class="navbar-brand">{{.SITE_NAME}}</a>
         </div>
     </div>
 </header>

views/book/dashboard.tpl

@@ -59,7 +59,7 @@
                     <div class="dashboard">
                         <div class="pull-left" style="width: 200px;margin-bottom: 15px;">
                             <div class="book-image">
-                                <img src="{{.Model.Cover}}" onerror="this.src='{{cdnimg "/static/images/book.jpg"}}'" style="border: 1px solid #666">
+                                <img src="{{cdnimg .Model.Cover}}" onerror="this.src='{{cdnimg "/static/images/book.jpg"}}'" style="border: 1px solid #666">
                             </div>
                         </div>
 

views/document/compare.tpl

@@ -5,22 +5,22 @@
     <meta charset="utf-8" />
     <title>文档比较 - Powered by MinDoc</title>
     <link rel="shortcut icon" href="{{cdnimg "/favicon.ico"}}" />
-    <link href="/static/fonts/notosans.css" rel='stylesheet' type='text/css' />
-    <script type="text/javascript" src="/static/jquery/1.12.4/jquery.min.js"></script>
-    <link type='text/css' rel='stylesheet' href='/static/mergely/editor/lib/wicked-ui.css' />
-    <script type="text/javascript" src="/static/mergely/editor/lib/wicked-ui.js"></script>
+    <link href="{{cdncss "/static/fonts/notosans.css"}}" rel='stylesheet' type='text/css' />
+    <link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/lib/wicked-ui.css"}}" />
+    <link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/lib/tipsy/tipsy.css"}}" />
+    <link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/editor/lib/farbtastic/farbtastic.css"}}" />
+    <link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/lib/codemirror.css"}}" />
+    <link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/lib/mergely.css"}}" />
+    <link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/editor.css"}}" />
 
-    <link type='text/css' rel='stylesheet' href='/static/mergely/editor/lib/tipsy/tipsy.css' />
-    <script type="text/javascript" src="/static/mergely/editor/lib/tipsy/jquery.tipsy.js"></script>
-    <script type="text/javascript" src="/static/mergely/editor/lib/farbtastic/farbtastic.js"></script>
-    <link type="text/css" rel="stylesheet" href="/static/mergely/editor/lib/farbtastic/farbtastic.css" />
-    <script type="text/javascript" src="/static/mergely/lib/codemirror.min.js"></script>
-    <script type="text/javascript" src="/static/mergely/lib/mergely.min.js"></script>
-    <script type="text/javascript" src="/static/mergely/editor/editor.js"></script>
-    <link type="text/css" rel="stylesheet" href="/static/mergely/lib/codemirror.css" />
-    <link type="text/css" rel="stylesheet" href="/static/mergely/lib/mergely.css" />
-    <link type='text/css' rel='stylesheet' href='/static/mergely/editor/editor.css' />
-    <script type="text/javascript" src="/static/mergely/lib/searchcursor.js"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/wicked-ui.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/tipsy/jquery.tipsy.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/farbtastic/farbtastic.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/codemirror.min.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/mergely.min.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/editor.js"}}"></script>
+    <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/searchcursor.js"}}"></script>
     <script type="text/javascript">
         var key = '';
        // var isSample = key === 'usaindep';

views/document/kancloud_read_template.tpl

@@ -172,7 +172,7 @@
 <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
 <script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
-<script src="/static/jquery/plugins/imgbox/jquery.imgbox.pack.js"></script>
+<script src="{{cdnjs "/static/jquery/plugins/imgbox/jquery.imgbox.pack.js"}}"></script>
 <script type="text/javascript">
     $(function () {
         $("#sidebar").jstree({

views/manager/users.tpl

@@ -8,10 +8,10 @@
     <title>用户管理 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <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="/static/css/main.css" rel="stylesheet">
+    <link href="{{cdncss "/static/css/main.css"}}" 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]>
@@ -205,11 +205,11 @@
         </form>
     </div>
 </div><!--END Modal-->
-<script src="{{cdncss "/static/jquery/1.12.4/jquery.min.js"}}"></script>
-<script src="{{cdncss "/static/bootstrap/js/bootstrap.min.js"}}"></script>
-<script src="{{cdncss "/static/vuejs/vue.min.js"}}"></script>
-<script src="{{cdncss "/static/js/jquery.form.js"}}" type="text/javascript"></script>
-<script src="{{cdncss "/static/js/main.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
+<script src="{{cdnjs "/static/vuejs/vue.min.js"}}"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/main.js"}}" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {
         $("#addMemberDialogModal").on("show.bs.modal",function () {

views/template.tpl

@@ -78,7 +78,7 @@
         </div>
     </div>
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
 </body>
 </html>