下载文档

TruthHun88 · TruthHun88 · commit a6402664639b · 2018-10-09T20:50:55.000+08:00
diff --git a/controllers/BookController.go b/controllers/BookController.go
@@ -808,12 +808,12 @@ func (this *BookController) GitPull() {
 	}
 	//GitHub&#39033;&#30446;&#38142;&#25509;
 	link := this.GetString("link")
-	folder := "store/" + identify
-	err := utils.GitClone(link, folder)
-	if err != nil {
-		this.JsonResult(1, err.Error())
-	}
 	go func() {
+		folder := "store/" + identify
+		err := utils.GitClone(link, folder)
+		if err != nil {
+			this.JsonResult(1, err.Error())
+		}
 		this.loadByFolder(book.BookId, identify, folder)
 	}()
 
diff --git a/views/book/index.html b/views/book/index.html
@@ -133,17 +133,16 @@
                                             </ul>
                                         </div>
                                         <!-- Split button -->
-                                        <div class="btn-group">
+                                        <div class="btn-group btn-group-download">
                                             <button type="button" class="btn btn-default"><i class="fa fa-cloud-download"></i> &#23548;&#20986;&#39033;&#30446;</button>
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                 <span class="caret"></span>
                                                 <span class="sr-only">Toggle Dropdown</span>
                                             </button>
                                             <ul class="dropdown-menu">
-                                                <li><a href="#">&#23548;&#20986; PDF</a></li>
-                                                <li><a href="#">&#23548;&#20986; MOBI</a></li>
-                                                <li><a href="#">&#23548;&#20986; EPUB</a></li>
-                                                {{/*<li><a href="#">&#23548;&#20986; MD</a></li>*/}}
+                                                <li><a :href="'{{urlfor "DocumentController.Export" ":key" ""}}' + item.identify+'?output=pdf'">&#23548;&#20986; PDF</a></li>
+                                                <li><a :href="'{{urlfor "DocumentController.Export" ":key" ""}}' + item.identify+'?output=mobi'">&#23548;&#20986; MOBI</a></li>
+                                                <li><a :href="'{{urlfor "DocumentController.Export" ":key" ""}}' + item.identify+'?output=epub'">&#23548;&#20986; EPUB</a></li>
                                             </ul>
                                         </div>
                                     </div>
@@ -306,7 +305,17 @@ <h4 class="modal-title" id="myModalLabel">&#28155;&#21152;&#39033;&#30446;</h4>
             }
         });
 
-
+        $(".btn-group-download a").click(function (e) {
+            e.preventDefault();
+            var href=$(this).attr("href");
+            $.get(href,function (res) {
+                if(res.errcode==1){
+                    alertTips("error",res.message,3000);
+                }else{
+                    location.href=res.data.url;
+                }
+            });
+        });
 
     });
 </script>
diff --git a/views/widgets/pull.html b/views/widgets/pull.html
@@ -35,7 +35,7 @@ <h4 class="modal-title" id="ModalPullByGitLabel">&#25289;&#21462;&#39033;&#30446;</h4>
                         <input type="text" name="link" required class="form-control" placeholder="&#35831;&#36755;&#20837;Git&#20179;&#24211;&#22320;&#22336;">
                         <input type="hidden" value="" name="identify">
                     </div>
-                    <div class="help-block">&#20174;Git&#20179;&#24211;&#25289;&#21462;markdown&#39033;&#30446;</div>
+                    <div class="help-block">&#20174;Git&#20179;&#24211;&#25289;&#21462;markdown&#39033;&#30446;(&#21482;&#25903;&#25345;git&#20844;&#24320;&#20179;&#24211;&#39033;&#30446;&#30340;&#23548;&#20837;)</div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-danger" data-dismiss="modal">&#21462;&#28040;</button>

-Original file line number
+Diff line change
                         <input type="text" name="link" required class="form-control" placeholder="请输入Git仓库地址">
                         <input type="hidden" value="" name="identify">
                     </div>
 -                    <div class="help-block">从Git仓库拉取markdown项目</div>
 +                    <div class="help-block">从Git仓库拉取markdown项目(只支持git公开仓库项目的导入)</div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-danger" data-dismiss="modal">取消</button>