diff --git a/src/controller/api.js b/src/controller/api.js index ed9e874..e33022b 100644 --- a/src/controller/api.js +++ b/src/controller/api.js @@ -1,6 +1,7 @@ const Base = require('./base.js'); const crypto = require('crypto'); const fs = require('fs-extra'); +const path = require('path'); const read = require('node-readability'); function md5(str) { @@ -366,6 +367,23 @@ module.exports = class extends Base { this.json({ code: 1, msg: error.toString() }); } } + + // 书签上传 + async bookmarkUploadAction() { + // size: 367450, + // path: 'C:\\Users\\lucq\\AppData\\Local\\Temp\\upload_4ae3b14dacaa107076d3bddd471ebe39.html', + // name: 'exportbookmark-lcq-20200402084709.html', + // type: 'text/html', + const file = this.file(); + this.json({ code: 0 }); + // const fileName = this.ctx.state.user.username; + // if (file) { + // const filepath = path.join(think.ROOT_PATH, `runtime/upload/${fileName}.html`); + // think.mkdir(path.dirname(filepath)); + // await rename(file.path, filepath); + // } + } + // 获取文章 async articleAction() { let url = this.get("url"); diff --git a/www/scripts/controllers/bookmark-info-controller.js b/www/scripts/controllers/bookmark-info-controller.js index 00834c9..3d38b23 100644 --- a/www/scripts/controllers/bookmark-info-controller.js +++ b/www/scripts/controllers/bookmark-info-controller.js @@ -20,7 +20,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win }, 500); $scope.loading = true; try { - let data = get("getArticle", { url: bookmark.url }); + let data = get("article", { url: bookmark.url }); $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('
数据获取失败,可能是服务器不允许获取,或者是https网站!
'); setTimeout(function () { $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh"); diff --git a/www/scripts/controllers/settings-controller.js b/www/scripts/controllers/settings-controller.js index 2ec2501..78b1de2 100644 --- a/www/scripts/controllers/settings-controller.js +++ b/www/scripts/controllers/settings-controller.js @@ -127,22 +127,29 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ setTimeout(function () { $("#fileuploader").uploadFile({ - url: "/api/uploadBookmarkFile", + url: "/api/bookmarkUpload", multiple: false, dragDrop: true, fileName: "bookmark", acceptFiles: "text/html", maxFileSize: 10 * 1024 * 1024, // 最大10M dragdropWidth: "100%", - onSuccess: function (files, response, xhr, pd) { - toastr.success('文件上传成功,3秒钟自动跳转到书签页面', "提示"); - setTimeout(function () { - pubSubService.publish('Common.menuActive', { - login: true, - index: dataService.LoginIndexBookmarks - }); - $state.go('bookmarks', {}) - }, 3000); + headers: { + Authorization: localStorage.getItem("authorization"), + }, + onSuccess: function (files, response) { + console.log(files, response); + if (response.code == 0) { + setTimeout(function () { + pubSubService.publish('Common.menuActive', { + login: true, + index: dataService.LoginIndexBookmarks + }); + $state.go('bookmarks', {}) + }, 3000); + } else { + toastr.success('文件上传失败:' + response.msg, "提示"); + } }, }); $(".ui.pointing.menu .item").removeClass("selected"); diff --git a/www/scripts/externe/jquery.uploadfile.min.js b/www/scripts/externe/jquery.uploadfile.min.js index 5c99020..d2117eb 100644 --- a/www/scripts/externe/jquery.uploadfile.min.js +++ b/www/scripts/externe/jquery.uploadfile.min.js @@ -1,8 +1,8 @@ -/*! - * jQuery Upload File Plugin - * version: 4.0.10 - * @requires jQuery v1.5 or later & form plugin - * Copyright (c) 2013 Ravishanker Kusuma - * http://hayageek.com/ - */ -!function(e){void 0==e.fn.ajaxForm&&e.getScript("http://mybookmark.cn/scripts/externe/jquery.form.js");var a={};a.fileapi=void 0!==e("").get(0).files,a.formdata=void 0!==window.FormData,e.fn.uploadFile=function(t){function r(){S||(S=!0,function e(){if(w.sequential||(w.sequentialCount=99999),0==x.length&&0==D.length)w.afterUploadAll&&w.afterUploadAll(C),S=!1;else{if(D.length