From 525648e15b0389335a0f6558c1aad5ccd7c3262f Mon Sep 17 00:00:00 2001 From: Abbey Date: Tue, 30 Jul 2019 11:04:26 +0000 Subject: [PATCH] =?UTF-8?q?1.=20=E6=94=AF=E6=8C=81pdf=E9=A2=84=E8=A7=88;2.?= =?UTF-8?q?=20=E6=94=AF=E6=8C=81=E6=B5=81=E9=87=8F=E8=BD=AC=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/install.py | 2 +- app/admin/manage.py | 6 +- app/admin/setting.py | 8 +- app/front/views.py | 35 +- app/static/js/jquery.media.js | 511 ++++++++++++++++++ app/templates/admin/manage/upload_local.html | 2 + app/templates/admin/setting/show_setting.html | 46 ++ app/templates/show/pdf.html | 13 + app/templates/theme/bst4/show/any.html | 7 - app/templates/theme/bst4/show/pdf.html | 41 ++ app/templates/theme/bst_sketchy/show/any.html | 7 - app/templates/theme/bst_sketchy/show/pdf.html | 68 +++ app/templates/theme/layui/show/any.html | 7 - app/templates/theme/layui/show/pdf.html | 43 ++ app/templates/theme/material/show/pdf.html | 30 + config.py | 2 +- self_config.py.sample | 3 + update.sh | 8 + 18 files changed, 812 insertions(+), 27 deletions(-) create mode 100644 app/static/js/jquery.media.js create mode 100644 app/templates/show/pdf.html delete mode 100644 app/templates/theme/bst4/show/any.html create mode 100644 app/templates/theme/bst4/show/pdf.html delete mode 100644 app/templates/theme/bst_sketchy/show/any.html create mode 100644 app/templates/theme/bst_sketchy/show/pdf.html delete mode 100644 app/templates/theme/layui/show/any.html create mode 100644 app/templates/theme/layui/show/pdf.html create mode 100644 app/templates/theme/material/show/pdf.html diff --git a/app/admin/install.py b/app/admin/install.py index a9dd9dc..5e3889b 100644 --- a/app/admin/install.py +++ b/app/admin/install.py @@ -69,7 +69,7 @@ def install(): if od_type=='cn': data+='&resource=00000003-0000-0ff1-ce00-000000000000' url=GetOAuthUrl(od_type) - r=requests.post(url,data=data,headers=headers,vefiry=False) + r=requests.post(url,data=data,headers=headers,verify=False) Atoken=json.loads(r.text) if Atoken.get('access_token'): with open(os.path.join(config_dir,'data/{}_Atoken.json'.format(user)),'w') as f: diff --git a/app/admin/manage.py b/app/admin/manage.py index af75493..2270fde 100644 --- a/app/admin/manage.py +++ b/app/admin/manage.py @@ -68,9 +68,13 @@ def upload_local(): def checkChunk(): fileName=request.form.get('name').encode('utf-8') chunk=request.form.get('chunk',0,type=int) + chunkSize=request.form.get('chunkSize',type=int) filename = u'./upload/{}-{}'.format(fileName, chunk) if os.path.exists(filename): - exists=True + if os.path.getsize(filename)==chunkSize: + exists=True + else: + exists=False else: exists=False return jsonify({'ifExist':exists}) diff --git a/app/admin/setting.py b/app/admin/setting.py index d51a766..7429199 100644 --- a/app/admin/setting.py +++ b/app/admin/setting.py @@ -156,6 +156,13 @@ def setCode(): @admin.route('/show_setting',methods=['GET','POST']) def show_setting(): if request.method=='POST': + action=request.form.get('action') + redirect_file=request.form.get('redirect') + if action is not None: + set_config('redirect_file',redirect_file) + redis_client.set('redirect_file',redirect_file) + resp={'msg':'设置成功'} + return jsonify(resp) show_redirect=request.form.get('show_redirect') set_config('show_redirect',show_redirect) redis_client.set('show_redirect',show_redirect) @@ -184,7 +191,6 @@ def show_setting(): set_config('show_code',show_code) redis_client.set('show_code',show_code) - flash('更新成功') resp=MakeResponse(redirect(url_for('admin.show_setting'))) return resp diff --git a/app/front/views.py b/app/front/views.py index 4968388..7f538de 100644 --- a/app/front/views.py +++ b/app/front/views.py @@ -1,9 +1,11 @@ #-*- coding=utf-8 -*- -from flask import render_template,redirect,abort,make_response,jsonify,request,url_for,Response,send_from_directory +from flask import render_template,redirect,abort,make_response,jsonify,request,url_for,Response,send_from_directory,stream_with_context,send_file from flask_sqlalchemy import Pagination from ..utils import * from ..extend import * from . import front +from fpdf import FPDF + ################################################################################ ###################################前台函数##################################### @@ -156,6 +158,11 @@ def show(fileid,user,action='download',token=None): if ext in GetConfig('show_redirect').split(','): downloadUrl,play_url=GetDownloadUrl(fileid,user) resp=MakeResponse(redirect(downloadUrl)) + elif ext=='pdf': + if action=='share': + resp=MakeResponse(render_template('theme/{}/show/pdf.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name)) + else: + resp=MakeResponse(render_template('show/pdf.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name)) elif ext in GetConfig('show_doc').split(','): downloadUrl,play_url=GetDownloadUrl(fileid,user) url = 'https://view.officeapps.live.com/op/view.aspx?src='+urllib.quote(downloadUrl) @@ -200,11 +207,35 @@ def show(fileid,user,action='download',token=None): if not downloadUrl.startswith('http'): return MakeResponse(downloadUrl) else: - resp=MakeResponse(redirect(play_url)) + if GetConfig('redirect_file')=='True' or ext=='pdf': + resp=redirect_file(user,fileid) + else: + resp=MakeResponse(redirect(play_url)) else: resp=MakeResponse(abort(404)) return resp +# @front.route('/py_redirect//') +def redirect_file(user,fileid): + filename=GetName(fileid) + ext=filename.split('.')[-1].lower() + _headers={} + _headers['User-Agent']=request.headers['User-Agent'] + _range=request.headers.get('Range') + if _range is not None: + _headers['Range']=_range + downloadUrl,play_url=GetDownloadUrl(fileid,user) + req = browser.get(play_url, stream = True ,headers=_headers) + headers = dict([(name, value) for (name, value) in req.raw.headers.items()]) + if ext=='pdf': + def generate(): + for chunk in req.iter_content(1024*5): + if chunk: + yield chunk + return Response(generate(),mimetype='application/pdf') + else: + return Response(stream_with_context(req.iter_content()),headers=headers) + @front.route('/py_find/') diff --git a/app/static/js/jquery.media.js b/app/static/js/jquery.media.js new file mode 100644 index 0000000..23c9c76 --- /dev/null +++ b/app/static/js/jquery.media.js @@ -0,0 +1,511 @@ +/* + * jQuery Media Plugin for converting elements into rich media content. + * + * Examples and documentation at: http://malsup.com/jquery/media/ + * Copyright (c) 2007-2010 M. Alsup + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * @author: M. Alsup + * @version: 0.99 (05-JUN-2013) + * @requires jQuery v1.1.2 or later + * $Id: jquery.media.js 2460 2007-07-23 02:53:15Z malsup $ + * + * Supported Media Players: + * - Flash + * - Quicktime + * - Real Player + * - Silverlight + * - Windows Media Player + * - iframe + * + * Supported Media Formats: + * Any types supported by the above players, such as: + * Video: asf, avi, flv, mov, mpg, mpeg, mp4, qt, smil, swf, wmv, 3g2, 3gp + * Audio: aif, aac, au, gsm, mid, midi, mov, mp3, m4a, snd, rm, wav, wma + * Other: bmp, html, pdf, psd, qif, qtif, qti, tif, tiff, xaml + * + * Thanks to Mark Hicken and Brent Pedersen for helping me debug this on the Mac! + * Thanks to Dan Rossi for numerous bug reports and code bits! + * Thanks to Skye Giordano for several great suggestions! + * Thanks to Richard Connamacher for excellent improvements to the non-IE behavior! + */ +/*global SWFObject alert Sys */ +/*jshint forin:false */ +;(function($) { +"use strict"; + +var mode = document.documentMode || 0; +var msie = /MSIE/.test(navigator.userAgent); +var lameIE = msie && (/MSIE (6|7|8)\.0/.test(navigator.userAgent) || mode < 9); + +/** + * Chainable method for converting elements into rich media. + * + * @param options + * @param callback fn invoked for each matched element before conversion + * @param callback fn invoked for each matched element after conversion + */ +$.fn.media = function(options, f1, f2) { + if (options == 'undo') { + return this.each(function() { + var $this = $(this); + var html = $this.data('media.origHTML'); + if (html) + $this.replaceWith(html); + }); + } + + return this.each(function() { + if (typeof options == 'function') { + f2 = f1; + f1 = options; + options = {}; + } + var o = getSettings(this, options); + // pre-conversion callback, passes original element and fully populated options + if (typeof f1 == 'function') f1(this, o); + + var r = getTypesRegExp(); + var m = r.exec(o.src.toLowerCase()) || ['']; + var fn; + + if (o.type) + m[0] = o.type; + else + m.shift(); + + for (var i=0; i < m.length; i++) { + fn = m[i].toLowerCase(); + if (isDigit(fn[0])) fn = 'fn' + fn; // fns can't begin with numbers + if (!$.fn.media[fn]) + continue; // unrecognized media type + // normalize autoplay settings + var player = $.fn.media[fn+'_player']; + if (!o.params) o.params = {}; + if (player) { + var num = player.autoplayAttr == 'autostart'; + o.params[player.autoplayAttr || 'autoplay'] = num ? (o.autoplay ? 1 : 0) : o.autoplay ? true : false; + } + var $div = $.fn.media[fn](this, o); + + $div.css('backgroundColor', o.bgColor).width(o.width); + + if (o.canUndo) { + var $temp = $('
').append(this); + $div.data('media.origHTML', $temp.html()); // store original markup + } + + // post-conversion callback, passes original element, new div element and fully populated options + if (typeof f2 == 'function') f2(this, $div[0], o, player.name); + break; + } + }); +}; + +/** + * Non-chainable method for adding or changing file format / player mapping + * @name mapFormat + * @param String format File format extension (ie: mov, wav, mp3) + * @param String player Player name to use for the format (one of: flash, quicktime, realplayer, winmedia, silverlight or iframe + */ +$.fn.media.mapFormat = function(format, player) { + if (!format || !player || !$.fn.media.defaults.players[player]) return; // invalid + format = format.toLowerCase(); + if (isDigit(format[0])) format = 'fn' + format; + $.fn.media[format] = $.fn.media[player]; + $.fn.media[format+'_player'] = $.fn.media.defaults.players[player]; +}; + +// global defautls; override as needed +$.fn.media.defaults = { + standards: true, // use object tags only (no embeds for non-IE browsers) + canUndo: true, // tells plugin to store the original markup so it can be reverted via: $(sel).mediaUndo() + width: 400, + height: 400, + autoplay: 0, // normalized cross-player setting + bgColor: '#ffffff', // background color + params: { wmode: 'transparent'}, // added to object element as param elements; added to embed element as attrs + attrs: {}, // added to object and embed elements as attrs + flvKeyName: 'file', // key used for object src param (thanks to Andrea Ercolino) + flashvars: {}, // added to flash content as flashvars param/attr + flashVersion: '7', // required flash version + expressInstaller: null, // src for express installer + + // default flash video and mp3 player (@see: http://jeroenwijering.com/?item=Flash_Media_Player) + flvPlayer: 'mediaplayer.swf', + mp3Player: 'mediaplayer.swf', + + // @see http://msdn2.microsoft.com/en-us/library/bb412401.aspx + silverlight: { + inplaceInstallPrompt: 'true', // display in-place install prompt? + isWindowless: 'true', // windowless mode (false for wrapping markup) + framerate: '24', // maximum framerate + version: '0.9', // Silverlight version + onError: null, // onError callback + onLoad: null, // onLoad callback + initParams: null, // object init params + userContext: null // callback arg passed to the load callback + } +}; + +// Media Players; think twice before overriding +$.fn.media.defaults.players = { + flash: { + name: 'flash', + title: 'Flash', + types: 'flv,mp3,swf', + mimetype: 'application/x-shockwave-flash', + pluginspage: 'http://www.adobe.com/go/getflashplayer', + ieAttrs: { + classid: 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000', + type: 'application/x-oleobject', + codebase: 'http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=' + $.fn.media.defaults.flashVersion + } + }, + quicktime: { + name: 'quicktime', + title: 'QuickTime', + mimetype: 'video/quicktime', + pluginspage: 'http://www.apple.com/quicktime/download/', + types: 'aif,aiff,aac,au,bmp,gsm,mov,mid,midi,mpg,mpeg,mp4,m4a,psd,qt,qtif,qif,qti,snd,tif,tiff,wav,3g2,3gp', + ieAttrs: { + classid: 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B', + codebase: 'http://www.apple.com/qtactivex/qtplugin.cab' + } + }, + realplayer: { + name: 'real', + title: 'RealPlayer', + types: 'ra,ram,rm,rpm,rv,smi,smil', + mimetype: 'audio/x-pn-realaudio-plugin', + pluginspage: 'http://www.real.com/player/', + autoplayAttr: 'autostart', + ieAttrs: { + classid: 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA' + } + }, + winmedia: { + name: 'winmedia', + title: 'Windows Media', + types: 'asx,asf,avi,wma,wmv', + mimetype: isFirefoxWMPPluginInstalled() ? 'application/x-ms-wmp' : 'application/x-mplayer2', + pluginspage: 'http://www.microsoft.com/Windows/MediaPlayer/', + autoplayAttr: 'autostart', + oUrl: 'url', + ieAttrs: { + classid: 'clsid:6BF52A52-394A-11d3-B153-00C04F79FAA6', + type: 'application/x-oleobject' + } + }, + // special cases + img: { + name: 'img', + title: 'Image', + types: 'gif,png,jpg' + }, + iframe: { + name: 'iframe', + types: 'html,pdf' + }, + silverlight: { + name: 'silverlight', + types: 'xaml' + } +}; + +// +// everything below here is private +// + + +// detection script for FF WMP plugin (http://www.therossman.org/experiments/wmp_play.html) +// (hat tip to Mark Ross for this script) +function isFirefoxWMPPluginInstalled() { + var plugs = navigator.plugins || []; + for (var i = 0; i < plugs.length; i++) { + var plugin = plugs[i]; + if (plugin['filename'] == 'np-mswmp.dll') + return true; + } + return false; +} + +var counter = 1; + +for (var player in $.fn.media.defaults.players) { + var types = $.fn.media.defaults.players[player].types; + $.each(types.split(','), function(i,o) { + if (isDigit(o[0])) o = 'fn' + o; + $.fn.media[o] = $.fn.media[player] = getGenerator(player); + $.fn.media[o+'_player'] = $.fn.media.defaults.players[player]; + }); +} + +function getTypesRegExp() { + var types = ''; + for (var player in $.fn.media.defaults.players) { + if (types.length) types += ','; + types += $.fn.media.defaults.players[player].types; + } + return new RegExp('\\.(' + types.replace(/,/ig,'|') + ')\\b'); +} + +function getGenerator(player) { + return function(el, options) { + return generate(el, options, player); + }; +} + +function isDigit(c) { + return '0123456789'.indexOf(c) > -1; +} + +// flatten all possible options: global defaults, meta, option obj +function getSettings(el, options) { + options = options || {}; + var a, n; + var $el = $(el); + var cls = el.className || ''; + // support metadata plugin (v1.0 and v2.0) + var meta = $.metadata ? $el.metadata() : $.meta ? $el.data() : {}; + meta = meta || {}; + var w = meta.width || parseInt(((cls.match(/\bw:(\d+)/)||[])[1]||0),10) || parseInt(((cls.match(/\bwidth:(\d+)/)||[])[1]||0),10); + var h = meta.height || parseInt(((cls.match(/\bh:(\d+)/)||[])[1]||0),10) || parseInt(((cls.match(/\bheight:(\d+)/)||[])[1]||0),10); + + if (w) meta.width = w; + if (h) meta.height = h; + if (cls) meta.cls = cls; + + // crank html5 style data attributes + var dataName = 'data-'; + for (var i=0; i < el.attributes.length; i++) { + a = el.attributes[i], n = $.trim(a.name); + var index = n.indexOf(dataName); + if (index === 0) { + n = n.substring(dataName.length); + meta[n] = a.value; + } + } + + a = $.fn.media.defaults; + var b = options; + var c = meta; + + var p = { params: { bgColor: options.bgColor || $.fn.media.defaults.bgColor } }; + var opts = $.extend({}, a, b, c); + $.each(['attrs','params','flashvars','silverlight'], function(i,o) { + opts[o] = $.extend({}, p[o] || {}, a[o] || {}, b[o] || {}, c[o] || {}); + }); + + if (typeof opts.caption == 'undefined') opts.caption = $el.text(); + + // make sure we have a source! + opts.src = opts.src || $el.attr('href') || $el.attr('src') || 'unknown'; + return opts; +} + +// +// Flash Player +// + +// generate flash using SWFObject library if possible +$.fn.media.swf = function(el, opts) { + var f, p; + if (!window.SWFObject && !window.swfobject) { + // roll our own + if (opts.flashvars) { + var a = []; + for (f in opts.flashvars) + a.push(f + '=' + opts.flashvars[f]); + if (!opts.params) opts.params = {}; + opts.params.flashvars = a.join('&'); + } + return generate(el, opts, 'flash'); + } + + var id = el.id ? (' id="'+el.id+'"') : ''; + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + + // swfobject v2+ + if (window.swfobject) { + $(el).after($div).appendTo($div); + if (!el.id) el.id = 'movie_player_' + counter++; + + // replace el with swfobject content + window.swfobject.embedSWF(opts.src, el.id, opts.width, opts.height, opts.flashVersion, + opts.expressInstaller, opts.flashvars, opts.params, opts.attrs); + } + // swfobject < v2 + else { + $(el).after($div).remove(); + var so = new SWFObject(opts.src, 'movie_player_' + counter++, opts.width, opts.height, opts.flashVersion, opts.bgColor); + if (opts.expressInstaller) so.useExpressInstall(opts.expressInstaller); + + for (p in opts.params) + if (p != 'bgColor') so.addParam(p, opts.params[p]); + for (f in opts.flashvars) + so.addVariable(f, opts.flashvars[f]); + so.write($div[0]); + } + + if (opts.caption) $('
').appendTo($div).html(opts.caption); + return $div; +}; + +// map flv and mp3 files to the swf player by default +$.fn.media.flv = $.fn.media.mp3 = function(el, opts) { + var src = opts.src; + var player = /\.mp3\b/i.test(src) ? opts.mp3Player : opts.flvPlayer; + var key = opts.flvKeyName; + src = encodeURIComponent(src); + opts.src = player; + opts.src = opts.src + '?'+key+'=' + (src); + var srcObj = {}; + srcObj[key] = src; + opts.flashvars = $.extend({}, srcObj, opts.flashvars ); + return $.fn.media.swf(el, opts); +}; + +// +// Silverlight +// +$.fn.media.xaml = function(el, opts) { + if (!window.Sys || !window.Sys.Silverlight) { + if ($.fn.media.xaml.warning) return; + $.fn.media.xaml.warning = 1; + alert('You must include the Silverlight.js script.'); + return; + } + + var props = { + width: opts.width, + height: opts.height, + background: opts.bgColor, + inplaceInstallPrompt: opts.silverlight.inplaceInstallPrompt, + isWindowless: opts.silverlight.isWindowless, + framerate: opts.silverlight.framerate, + version: opts.silverlight.version + }; + var events = { + onError: opts.silverlight.onError, + onLoad: opts.silverlight.onLoad + }; + + var id1 = el.id ? (' id="'+el.id+'"') : ''; + var id2 = opts.id || 'AG' + counter++; + // convert element to div + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + $(el).after($div).remove(); + + Sys.Silverlight.createObjectEx({ + source: opts.src, + initParams: opts.silverlight.initParams, + userContext: opts.silverlight.userContext, + id: id2, + parentElement: $div[0], + properties: props, + events: events + }); + + if (opts.caption) $('
').appendTo($div).html(opts.caption); + return $div; +}; + +// +// generate object/embed markup +// +function generate(el, opts, player) { + var $el = $(el); + var o = $.fn.media.defaults.players[player]; + var a, key, v; + + if (player == 'iframe') { + o = $(''); + o.attr('src', opts.src); + o.css('backgroundColor', o.bgColor); + } + else if (player == 'img') { + o = $(''); + o.attr('src', opts.src); + if (opts.width) + o.attr('width', opts.width); + if (opts.height) + o.attr('height', opts.height); + o.css('backgroundColor', o.bgColor); + } + else if (lameIE) { + a = [''); + var p = ['']; + for (key in opts.params) + p.push(''); + o = document.createElement(a.join('')); + for (var i=0; i < p.length; i++) + o.appendChild(document.createElement(p[i])); + } + else if (opts.standards) { + // Rewritten to be standards compliant by Richard Connamacher + a = [''); + a.push(''); + for (key in opts.params) { + if (key == 'wmode' && player != 'flash') // FF3/Quicktime borks on wmode + continue; + a.push(''); + } + // Alternate HTML + a.push('

'+o.title+' Required

'+o.title+' is required to view this media. Download Here.

'); + a.push(''); + } + else { + a = [''); + } + // convert element to div + var id = el.id ? (' id="'+el.id+'"') : ''; + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + $el.after($div).remove(); + if (lameIE || player == 'iframe' || player == 'img') + $div.append(o); + else + $div.html(a.join('')); + + if (opts.caption) + $('
').appendTo($div).html(opts.caption); + return $div; +} + + +})(jQuery); diff --git a/app/templates/admin/manage/upload_local.html b/app/templates/admin/manage/upload_local.html index 3e89f7d..10c2fa3 100644 --- a/app/templates/admin/manage/upload_local.html +++ b/app/templates/admin/manage/upload_local.html @@ -133,9 +133,11 @@ success : function(response) { if (response.ifExist) { //分块存在，跳过 + console.log('分块存在'); deferred.reject(); } else { //分块不存在或不完整，重新发送该分块内容 + console.log('分块不存在'); deferred.resolve(); } } diff --git a/app/templates/admin/setting/show_setting.html b/app/templates/admin/setting/show_setting.html index 391ea8f..0f0ffc4 100644 --- a/app/templates/admin/setting/show_setting.html +++ b/app/templates/admin/setting/show_setting.html @@ -9,8 +9,14 @@

1. 可用于某些后缀的文件用那种窗口展示，没设置的后缀直接下载；

2. 下方设置的顺序决定了文件展示的优先级，比如mp4格式在“直接下载”和“视频”两类都出现了，但是“直接下载”优先级更高，因此mp4文件将直接下载

3. 后缀通过英文逗号(,)分隔，无需加点(.)

+

*4. 开启“转发流量”之后，所有文件预览/下载将走服务器流量，对服务器要求较高，慎重开启！

+
@@ -54,5 +60,45 @@
+ {%endblock content%} diff --git a/app/templates/show/pdf.html b/app/templates/show/pdf.html new file mode 100644 index 0000000..786621e --- /dev/null +++ b/app/templates/show/pdf.html @@ -0,0 +1,13 @@ +{%extends 'show/iframe_base.html'%} +{%block content%} + + + + +{%endblock content%} + + diff --git a/app/templates/theme/bst4/show/any.html b/app/templates/theme/bst4/show/any.html deleted file mode 100644 index e4eea15..0000000 --- a/app/templates/theme/bst4/show/any.html +++ /dev/null @@ -1,7 +0,0 @@ -{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} - -{%block content%} -
-{{content}} -
-{%endblock content%} diff --git a/app/templates/theme/bst4/show/pdf.html b/app/templates/theme/bst4/show/pdf.html new file mode 100644 index 0000000..e41d54a --- /dev/null +++ b/app/templates/theme/bst4/show/pdf.html @@ -0,0 +1,41 @@ +{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} + +{%block content%} +
+ + + +
+ +
+ +
+
+ + 分享地址 + + + 点击复制 +
+
+ + 内嵌窗口 + + + 点击复制 +
+
+ + 调用地址 + + + 点击复制 +
+
+ +
+{%endblock content%} diff --git a/app/templates/theme/bst_sketchy/show/any.html b/app/templates/theme/bst_sketchy/show/any.html deleted file mode 100644 index e4eea15..0000000 --- a/app/templates/theme/bst_sketchy/show/any.html +++ /dev/null @@ -1,7 +0,0 @@ -{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} - -{%block content%} -
-{{content}} -
-{%endblock content%} diff --git a/app/templates/theme/bst_sketchy/show/pdf.html b/app/templates/theme/bst_sketchy/show/pdf.html new file mode 100644 index 0000000..953be72 --- /dev/null +++ b/app/templates/theme/bst_sketchy/show/pdf.html @@ -0,0 +1,68 @@ +{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} + +{%block content%} +
+ + + +
+ +
+ +
+
+
+
+
+ 分享地址 +
+ + +
+ 点击复制 +
+ +
+
+
+ +
+
+
+
+ 内嵌窗口 +
+ + +
+ 点击复制 +
+ +
+
+
+ +
+
+
+
+ 调用地址 +
+ + +
+ 点击复制 +
+ +
+
+
+
+ + +
+{%endblock content%} diff --git a/app/templates/theme/layui/show/any.html b/app/templates/theme/layui/show/any.html deleted file mode 100644 index e4eea15..0000000 --- a/app/templates/theme/layui/show/any.html +++ /dev/null @@ -1,7 +0,0 @@ -{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} - -{%block content%} -
-{{content}} -
-{%endblock content%} diff --git a/app/templates/theme/layui/show/pdf.html b/app/templates/theme/layui/show/pdf.html new file mode 100644 index 0000000..7df257f --- /dev/null +++ b/app/templates/theme/layui/show/pdf.html @@ -0,0 +1,43 @@ +{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} + +{%block content%} +
+ + + +
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ + +
+{%endblock content%} diff --git a/app/templates/theme/material/show/pdf.html b/app/templates/theme/material/show/pdf.html new file mode 100644 index 0000000..be08db7 --- /dev/null +++ b/app/templates/theme/material/show/pdf.html @@ -0,0 +1,30 @@ +{%extends 'theme/'+GetConfig('theme')+'/layout.html'%} + +{%block content%} + + + +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+file_download +{%endblock content%} diff --git a/config.py b/config.py index dcab8ec..3a028f3 100644 --- a/config.py +++ b/config.py @@ -14,7 +14,7 @@ class config: if REDIS_PASSWORD!='': CACHE_REDIS_PASSWORD=REDIS_PASSWORD SEND_FILE_MAX_AGE_DEFAULT=timedelta(seconds=1) - version='4.190729' + version='4.190730' @staticmethod def init_app(app): diff --git a/self_config.py.sample b/self_config.py.sample index e26ade9..c791b83 100644 --- a/self_config.py.sample +++ b/self_config.py.sample @@ -119,3 +119,6 @@ show_redirect="exe" #上传服务器文件完成之后是否删除文件 delete_after_upload="True" + +#是否转发流量 +redirect_file="False" diff --git a/update.sh b/update.sh index 4a0f04e..c4ece66 100755 --- a/update.sh +++ b/update.sh @@ -163,6 +163,13 @@ Disallow: / fi + num=`cat self_config.py | grep "redirect_file" | wc -l` + if [ $num == 0 ]; then + echo '' >> self_config.py + echo 'redirect_file="False"' >> self_config.py + fi + + } @@ -259,6 +266,7 @@ echo "2019.06.14更新版本：稍微完善一下日志记录；分享页面取 echo "2019.07.24更新版本：1. 优化安装脚本，适应Centos7、Debian9+、Ubuntu16+等系统；2、优化安装流程" echo "2019.07.26更新版本：修复若干bug" echo "2019.07.29更新版本：1. 修复上传文件bug；2. 添加自定义选项" +echo "2019.07.30更新版本：1. 支持pdf预览;2. 支持流量转发" echo "---------------------------------------------------------------" echo "更新完成！" echo "如果网站无法访问，请检查config.py!"