From 44c5f65160a48edb1eba59dab2f2414ba19a6800 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Fri, 10 Feb 2017 17:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B9=A6=E7=AD=BE=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/settings-controller.js | 10 ++++++++--
 routes/api.js                                     |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js
index 1c2ad25..642d467 100644
--- a/public/scripts/controllers/settings-controller.js
+++ b/public/scripts/controllers/settings-controller.js
@@ -50,9 +50,15 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
             dragDrop: true,
             fileName: "bookmark",
             acceptFiles: "text/html",
-            maxFileSize: 10 * 1024 * 1024,  // 最大10M
+            maxFileSize: 10 * 1024 * 1024, // 最大10M
             onSuccess: function(files, response, xhr, pd) {
-                console.log(JSON.stringify(response[0]));
+                toastr.success('文件上传成功，3秒钟后自动跳转到书签页面', "错误");
+                setTimeout(function() {
+                    pubSubService.publish('Common.menuActive', {
+                        login: true,
+                        index: 0
+                    });
+                }, 3000);
             },
         });
     }, 1000);
diff --git a/routes/api.js b/routes/api.js
index 5f49024..280ad9f 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -465,6 +465,7 @@ api.post('/addAdvice', function(req, res) {
         });
 });
 
+// 发现使用node启动没问题，forever启动有问题。
 api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
     console.log('hello uploadBookmarkFile');
     if (!req.session.user) {
@@ -473,6 +474,7 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
     }
 
     var file = req.file;
+    res.json(file);
     parseHtml(file.path, function(data){
         console.log(data);
         var bookmarks = data.bookmarks;
@@ -543,7 +545,6 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
             })
             .catch((err) => console.log('uploadBookmarkFile err', err));
     })
-    res.json(file);
 });
 
 api.post('/addBookmark', function(req, res) {