diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index e9f84153c..5786acf1f 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -73,7 +73,7 @@ class Oplog extends Controller { try { SystemOplog::mQuery()->empty(); - sysoplog('系统运维管理', '成功清理所有日志数据'); + sysoplog('系统运维管理', '成功清理所有日志'); $this->success('日志清理成功！'); } catch (HttpResponseException $exception) { throw $exception; diff --git a/app/admin/controller/api/Runtime.php b/app/admin/controller/api/Runtime.php index e17149bf7..43f6096cb 100644 --- a/app/admin/controller/api/Runtime.php +++ b/app/admin/controller/api/Runtime.php @@ -39,7 +39,7 @@ class Runtime extends Controller if (AdminService::instance()->isSuper()) try { AdminService::instance()->clearCache(); SystemService::instance()->pushRuntime(); - sysoplog('系统运维管理', '刷新并创建路由缓存'); + sysoplog('系统运维管理', '刷新创建路由缓存'); $this->success('网站缓存加速成功！', 'javascript:location.reload()'); } catch (HttpResponseException $exception) { throw $exception; @@ -59,8 +59,8 @@ class Runtime extends Controller if (AdminService::instance()->isSuper()) try { AdminService::instance()->clearCache(); SystemService::instance()->clearRuntime(); - sysoplog('系统运维管理', '清理网站日志及缓存数据'); - $this->success('清空缓存日志成功！', 'javascript:location.reload()'); + sysoplog('系统运维管理', '清理网站日志缓存'); + $this->success('清空日志缓存成功！', 'javascript:location.reload()'); } catch (HttpResponseException $exception) { throw $exception; } catch (\Exception $exception) { @@ -89,6 +89,25 @@ class Runtime extends Controller } } + /** + * 修改富文本编辑器 + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function editor() + { + if (AdminService::instance()->isSuper()) { + $editor = input('editor', 'auto'); + sysconf('base.editor', $editor); + sysoplog('系统运维管理', "切换编辑器为{$editor}"); + $this->success('已切换后台编辑器！', 'javascript:location.reload()'); + } else { + $this->error('只有超级管理员才能操作！'); + } + } + /** * 清理系统配置 * @login true diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index 2f6848580..0f526dc5d 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -22,6 +22,7 @@ use think\admin\storage\AliossStorage; use think\admin\storage\LocalStorage; use think\admin\storage\QiniuStorage; use think\admin\storage\TxcosStorage; +use think\admin\storage\UpyunStorage; use think\exception\HttpResponseException; use think\file\UploadedFile; use think\Response; @@ -92,6 +93,12 @@ class Upload extends Controller $data['q-signature'] = $token['q-signature']; $data['q-sign-algorithm'] = $token['q-sign-algorithm']; $data['server'] = TxcosStorage::instance()->upload(); + } elseif ('upyun' === $data['uptype']) { + $token = UpyunStorage::instance()->buildUploadToken($data['key'], 3600, $name, input('size'), input('hash')); + $data['url'] = $token['siteurl']; + $data['policy'] = $token['policy']; + $data['authorization'] = $token['authorization']; + $data['server'] = UpyunStorage::instance()->upload(); } $this->success('获取上传授权参数', $data, 404); } @@ -176,7 +183,7 @@ class Upload extends Controller private function getType(): string { $type = strtolower(input('uptype', '')); - if (in_array($type, ['local', 'qiniu', 'alioss', 'txcos'])) { + if (in_array($type, ['local', 'qiniu', 'alioss', 'txcos', 'uptype'])) { return $type; } else { return strtolower(sysconf('storage.type')); diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index a350faafe..fea6a0824 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -1,151 +1,310 @@ -define(['md5'], function (SparkMD5, allowMime) { +define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) { allowMime = JSON.parse('{$exts|raw}'); - return function (element, callable) { - /*! 初始化变量 */ - var opt = {elem: $(element), exts: [], mimes: [], files: {}, cache: {}, load: 0, count: {total: 0, uploaded: 0}}; - opt.size = opt.elem.data('size') || 0, opt.mult = opt.elem.data('multiple') > 0; - opt.safe = opt.elem.data('safe') ? 1 : 0, opt.hide = opt.elem.data('hide-load') ? 1 : 0; - opt.type = opt.safe ? 'local' : opt.elem.attr('data-uptype') || ''; + function UploadAdapter(elem, done) { + return new (function (elem, done, that) { - /*! 查找表单元素, 如果没有找到将不会自动写值 */ - if (!opt.elem.data('input') && opt.elem.data('field')) { - var $input = $('input[name="' + opt.elem.data('field') + '"]:not([type=file])'); - opt.elem.data('input', $input.size() > 0 ? $input.get(0) : null); - } + /*! 初始化变量 */ + that = this; + this.option = {elem: $(elem), exts: [], mimes: []}; + this.option.size = this.option.elem.data('size') || 0; + this.option.safe = this.option.elem.data('safe') ? 1 : 0; + this.option.hide = this.option.elem.data('hload') ? 1 : 0; + this.option.mult = this.option.elem.data('multiple') > 0; + this.option.type = this.option.safe ? 'local' : this.option.elem.attr('data-uptype') || ''; - /*! 文件选择筛选，使用 MIME 规则过滤文件列表 */ - $((opt.elem.data('type') || '').split(',')).map(function (i, e) { - if (allowMime[e]) opt.exts.push(e), opt.mimes.push(allowMime[e]); - }); + /*! 查找表单元素, 如果没有找到将不会自动写值 */ + if (!this.option.elem.data('input') && this.option.elem.data('field')) { + this.$input = $('input[name="' + this.option.elem.data('field') + '"]:not([type=file])'); + this.option.elem.data('input', this.$input.size() > 0 ? this.$input.get(0) : null); + } - /*! 初始化上传组件 */ - opt.uploader = layui.upload.render({ - url: '{:sysuri("admin/api.upload/file")}', auto: false, elem: element, accept: 'file', multiple: opt.mult, exts: opt.exts.join('|'), acceptMime: opt.mimes.join(','), choose: function (object) { - opt.elem.triggerHandler('upload.choose', opt.files = object.pushFile()); - opt.uploader.config.elem.next().val(''), layui.each(opt.files, function (index, file) { - if (opt.size > 0 && file.size > opt.size) return delete opt.files[index], $.msg.tips('文件大小超出限制！'); - opt.load = opt.hide || $.msg.loading('上传进度 0%'); - opt.count.total++, file.index = index, opt.cache[index] = file, delete opt.files[index]; - md5file(file).then(function (file) { - opt.elem.triggerHandler('upload.hash', file), jQuery.ajax("{:sysuri('admin/api.upload/state')}", { - data: {key: file.xkey, uptype: opt.type, safe: opt.safe, name: file.name}, method: 'post', success: function (ret) { - file.xurl = ret.data.url, file.xsafe = ret.data.safe; - file.xpath = ret.data.key, file.xtype = ret.data.uptype; - if (parseInt(ret.code) === 404) { - opt.uploader.config.url = ret.data.server; - opt.uploader.config.data.key = ret.data.key; - opt.uploader.config.data.safe = ret.data.safe; - opt.uploader.config.data.uptype = ret.data.uptype; - if (ret.data.uptype === 'qiniu') { - opt.uploader.config.data.token = ret.data.token; - } else if (ret.data.uptype === 'alioss') { - opt.uploader.config.data['policy'] = ret.data.policy; - opt.uploader.config.data['signature'] = ret.data.signature; - opt.uploader.config.data['OSSAccessKeyId'] = ret.data.OSSAccessKeyId; - opt.uploader.config.data['success_action_status'] = 200; - opt.uploader.config.data['Content-Disposition'] = 'inline;filename=' + encodeURIComponent(file.name); - } else if (ret.data.uptype === 'txcos') { - opt.uploader.config.data['q-ak'] = ret.data['q-ak']; - opt.uploader.config.data['policy'] = ret.data['policy']; - opt.uploader.config.data['q-key-time'] = ret.data['q-key-time']; - opt.uploader.config.data['q-signature'] = ret.data['q-signature']; - opt.uploader.config.data['q-sign-algorithm'] = ret.data['q-sign-algorithm']; - opt.uploader.config.data['success_action_status'] = 200; - opt.uploader.config.data['Content-Disposition'] = 'inline;filename=' + encodeURIComponent(file.name); - } - object.upload(file.index, file); - } else if (parseInt(ret.code) === 200) { - file.xurl = ret.data.url; - opt.uploader.config.done({code: 1, url: file.xurl, info: '文件秒传成功！'}, file.index); - } else { - $.msg.tips(ret.info || ret.error.message || '文件上传出错！'); - } - } - }); + /*! 文件选择筛选，使用 MIME 规则过滤文件列表 */ + $((this.option.elem.data('type') || '').split(',')).map(function (i, e) { + if (allowMime[e]) that.option.exts.push(e), that.option.mimes.push(allowMime[e]); + }); + + /*! 初始化上传组件 */ + this.adapter = new Adapter(this.option, layui.upload.render({ + url: '{:url("admin/api.upload/file")}', auto: false, elem: elem, accept: 'file', multiple: this.option.mult, exts: this.option.exts.join('|'), acceptMime: this.option.mimes.join(','), choose: function (object) { + object.files = object.pushFile(); + that.adapter.event('upload.choose', object.files); + that.adapter.upload(object.files, done), layui.each(object.files, function (index) { + delete object.files[index]; }); - }); - }, progress: function (number) { - /*! 文件上传进度处理 */ - opt.elem.triggerHandler('upload.progress', {number: number, event: arguments[2], file: arguments[3]}); - if (opt.count.total > 1) { - $('[data-upload-progress]').html(number + '%' + ' ' + (opt.count.uploaded + 1) + '/' + opt.count.total); - } else { - $('[data-upload-progress]').html(number + '%'); } - }, done: function (ret, idx) { - // 兼容部分环境不解析 JSON 数据 - if (typeof ret === 'string' && ret.length > 0) try { - ret = JSON.parse(ret) || ret; - } catch (e) { - console.log(e) - } - /*! 检查单个文件上传返回的结果 */ - if (ret.code < 1) return $.msg.tips(ret.info || '文件上传失败！'); - if (typeof opt.cache[idx].xurl !== 'string') return $.msg.tips('无效的文件上传对象！'); - /*! 单个文件上传成功结果处理 */ - if (typeof callable === 'function') { - callable.call(opt.elem, opt.cache[idx].xurl, opt.cache['id']); - } else if (opt.mult < 1 && opt.elem.data('input')) { - $(opt.elem.data('input')).val(opt.cache[idx].xurl).trigger('change', opt.cache[idx]); - } - opt.elem.html(opt.elem.data('html')).triggerHandler('upload.done', {file: opt.cache[idx], data: ret}); - /*! 所有文件上传完成后结果处理 */ - if (++opt.count.uploaded >= opt.count.total) { - opt.hide || $.msg.close(opt.load); - if (opt.mult > 0 && opt.elem.data('input')) { - var urls = opt.elem.data('input').value || []; - if (typeof urls === 'string') urls = urls.split('|'); - for (var i in opt.cache) urls.push(opt.cache[i].xurl); - $(opt.elem.data('input')).val(urls.join('|')).trigger('change', opt.cache); + })); + })(elem, done) + } + + // 创建对象 + UploadAdapter.adapter = window.AdminUploadAdapter = Adapter; + + // 上传文件 + function Adapter(option, uploader) { + this.uploader = uploader, this.config = function (option) { + return (this.option = Object.assign({}, this.option || {}, option || {})), this; + }, this.init = function (option) { + this.uploader && this.uploader.config.elem.next().val(''); + this.files = {}, this.loader = 0, this.count = {total: 0, error: 0, success: 0}; + return this.config(option).config({safe: this.option.safe || 0, type: this.option.type || ''}); + }, this.init(option); + } + + // 文件推送 + Adapter.prototype.upload = function (files, done) { + var that = this.init(); + layui.each(files, function (index, file) { + that.count.total++, file.index = index, that.files[index] = file; + if (that.option.size && file.size > that.option.size) { + that.count.error++, file.xstate = -1, file.xstats = '大小超限'; + return $.msg.tips('文件大小超出限制！'); + } + if (!that.option.hide) { + file.notify = new NotifyExtend(file); + } + }), layui.each(files, function (index, file) { + that.hash(file).then(function (file) { + that.event('upload.hash', file).request(file, done); + }); + }); + }; + + // 文件上传 + Adapter.prototype.request = function (file, done) { + var that = this, data = {key: file.xkey, safe: that.option.safe, uptype: that.option.type}; + data.size = file.size, data.name = file.name, data.hash = file.xmd5; + jQuery.ajax("{:url('admin/api.upload/state')}", { + data: data, method: 'post', success: function (ret) { + file.xurl = ret.data.url, file.xsafe = ret.data.safe, file.xpath = ret.data.key, file.xtype = ret.data.uptype; + if (parseInt(ret.code) === 404) { + var uploader = {}; + uploader.url = ret.data.server; + uploader.form = new FormData(); + uploader.form.append('key', ret.data.key); + uploader.form.append('safe', ret.data.safe); + uploader.form.append('uptype', ret.data.uptype); + if (ret.data.uptype === 'qiniu') { + uploader.form.append('token', ret.data.token); + } else if (ret.data.uptype === 'alioss') { + uploader.form.append('policy', ret.data['policy']); + uploader.form.append('signature', ret.data['signature']); + uploader.form.append('OSSAccessKeyId', ret.data['OSSAccessKeyId']); + uploader.form.append('success_action_status', '200'); + uploader.form.append('Content-Disposition', 'inline;filename=' + encodeURIComponent(file.name)); + } else if (ret.data.uptype === 'txcos') { + uploader.form.append('q-ak', ret.data['q-ak']); + uploader.form.append('policy', ret.data['policy']); + uploader.form.append('q-key-time', ret.data['q-key-time']); + uploader.form.append('q-signature', ret.data['q-signature']); + uploader.form.append('q-sign-algorithm', ret.data['q-sign-algorithm']); + uploader.form.append('success_action_status', '200'); + uploader.form.append('Content-Disposition', 'inline;filename=' + encodeURIComponent(file.name)); + } else if (ret.data.uptype === 'upyun') { + uploader.form.delete('key'); + uploader.form.delete('safe'); + uploader.form.delete('uptype'); + uploader.form.append('save-key', ret.data['key']); + uploader.form.append('policy', ret.data['policy']); + uploader.form.append('authorization', ret.data['authorization']); + uploader.form.append('Content-Disposition', 'inline;filename=' + encodeURIComponent(file.name)); } - opt.elem.triggerHandler('upload.complete', {file: opt.cache}); - (opt.cache = [], opt.files = [], opt.count = {uploaded: 0, total: 0}), opt.uploader.reload(); + uploader.form.append('file', file), jQuery.ajax({ + url: uploader.url, data: uploader.form, type: 'post', xhr: function (xhr) { + xhr = new XMLHttpRequest(); + return xhr.upload.addEventListener('progress', function (event) { + file.xtotal = event.total, file.xloaded = event.loaded || 0; + that.progress((file.xloaded / file.xtotal * 100).toFixed(2), file) + }), xhr; + }, contentType: false, error: function () { + that.event('upload.error', {file: file}, file, '接口异常'); + }, processData: false, success: function (ret) { + // 兼容数据格式 + if (typeof ret === 'string' && ret.length > 0) try { + ret = JSON.parse(ret) || ret; + } catch (e) { + console.log(e) + } + if (typeof ret !== 'object') { + ret = {code: 1, url: file.xurl, info: '上传成功'}; + } + /*! 检查单个文件上传返回的结果 */ + if (typeof ret === 'object' && ret.code < 1) { + that.event('upload.error', {file: file}, file, ret.info || '上传失败'); + } else { + that.done(ret, file.index, file, done, '上传成功'); + } + } + }); + } else if (parseInt(ret.code) === 200) { + (file.xurl = ret.data.url), that.progress('100.00', file); + that.done({code: 1, url: file.xurl, info: file.xstats}, file.index, file, done, '秒传成功'); + } else { + that.event('upload.error', {file: file}, file, ret.info || ret.error.message || '上传出错！'); } } }); }; - function md5file(file) { - var deferred = jQuery.Deferred(); + // 上传进度 + Adapter.prototype.progress = function (number, file) { + this.event('upload.progress', {number: number, file: file}); + if (file.notify) file.notify.setProgress(number); + }; + + // 上传结果 + Adapter.prototype.done = function (ret, idx, file, done, message) { + /*! 检查单个文件上传返回的结果 */ + if (ret.code < 1) return $.msg.tips(ret.info || '文件上传失败！'); + if (typeof file.xurl !== 'string') return $.msg.tips('无效的文件上传对象！'); + /*! 单个文件上传成功结果处理 */ + if (typeof done === 'function') { + done.call(this.option.elem, file.xurl, this.files['id']); + } else if (this.option.mult < 1 && this.option.elem.data('input')) { + $(this.option.elem.data('input')).val(file.xurl).trigger('change', file); + } + // 文件上传成功事件 + this.event('upload.done', {file: file, data: ret}, file, message); + /*! 所有文件上传完成后结果处理 */ + if (this.count.success + this.count.error >= this.count.total) { + this.option.hide || $.msg.close(this.loader); + if (this.option.mult > 0 && this.option.elem.data('input')) { + var urls = this.option.elem.data('input').value || []; + if (typeof urls === 'string') urls = urls.split('|'); + for (var i in this.files) urls.push(this.files[i].xurl); + $(this.option.elem.data('input')).val(urls.join('|')).trigger('change', files); + } + this.event('upload.complete', {file: this.files}, file).init().uploader && this.uploader.reload(); + } + }; + + /*! 触发事件过程 */ + Adapter.prototype.event = function (name, data, file, message) { + if (name === 'upload.error') { + this.count.error++, file.xstate = -1, file.xstats = message; + if (file.notify) file.notify.setError(message || file.xstats || ''); + } else if (name === 'upload.done') { + this.count.success++, file.xstate = 1, file.xstats = message; + if (file.notify) file.notify.setSuccess(message || file.xstats || '') + } + if (this.option.elem) { + this.option.elem.triggerHandler(name, data); + } + return this; + }; + + /*! 计算文件 HASH 值 */ + Adapter.prototype.hash = function (file) { + var defer = jQuery.Deferred(); file.xext = file.name.indexOf('.') > -1 ? file.name.split('.').pop() : 'tmp'; /*! 兼容不能计算文件 HASH 的情况 */ var IsDate = '{$nameType|default=""}'.indexOf('date') > -1; if (!window.FileReader || IsDate) return jQuery.when((function (xmd5, chars) { while (xmd5.length < 32) xmd5 += chars.charAt(Math.floor(Math.random() * chars.length)); - return setFileXdata(file, xmd5, 6), deferred.resolve(file, file.xmd5, file.xkey), deferred; + return SetFileXdata(file, xmd5, 6), defer.promise(); })(layui.util.toDateString(Date.now(), 'yyyyMMddHHmmss-'), '0123456789')); /*! 读取文件并计算 HASH 值 */ - var spark = new SparkMD5.ArrayBuffer(); - var slice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice; - file.chunkIdx = 0, file.chunkSize = 2097152, file.chunkTotal = Math.ceil(this.size / this.chunkSize); - return jQuery.when(loadNextChunk(file)); + return new LoadNextChunk(file).ReadAsChunk(); - function setFileXdata(file, xmd5, slice) { - file.xmd5 = xmd5, file.xkey = file.xmd5.substr(0, slice || 2) + '/' + file.xmd5.substr(slice || 2, 30) + '.' + file.xext; - return delete file.chunkIdx, delete file.chunkSize, delete file.chunkTotal, file; + function SetFileXdata(file, xmd5, slice) { + file.xmd5 = xmd5, file.xstate = 0, file.xstats = ''; + file.xkey = file.xmd5.substring(0, slice || 2) + '/' + file.xmd5.substring(slice || 2) + '.' + file.xext; + return defer.resolve(file, file.xmd5, file.xkey), file; } - function loadNextChunk(file) { - this.reader = new FileReader(); - this.reader.onload = function (event) { + function LoadNextChunk(file) { + var that = this, reader = new FileReader(), spark = new SparkMD5.ArrayBuffer(); + var slice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice; + this.chunkIdx = 0, this.chunkSize = 2097152, this.chunkTotal = Math.ceil(file.size / this.chunkSize); + reader.onload = function (event) { spark.append(event.target.result); - if (++file.chunkIdx < file.chunkTotal) { - loadNextChunk(file); - } else { - setFileXdata(file, spark.end()); - deferred.resolve(file, file.xmd5, file.xkey); - } + ++that.chunkIdx < that.chunkTotal ? that.ReadAsChunk() : SetFileXdata(file, spark.end()); + }, reader.onerror = function () { + defer.reject(); + }, this.ReadAsChunk = function () { + this.start = that.chunkIdx * that.chunkSize; + this.loaded = this.start + that.chunkSize >= file.size ? file.size : this.start + that.chunkSize; + reader.readAsArrayBuffer(slice.call(file, this.start, this.loaded)); + defer.notify(file, (this.loaded / file.size * 100).toFixed(2)); + return defer.promise(); }; - this.reader.onerror = function () { - deferred.reject(); - }; - this.start = file.chunkIdx * file.chunkSize; - this.loaded = (this.start + file.chunkSize >= file.size) ? file.size : this.start + file.chunkSize; - this.reader.readAsArrayBuffer(slice.call(file, this.start, this.loaded)); - return deferred.notify(file, (this.loaded / file.size * 100).toFixed(2)), deferred; } + }; + + return UploadAdapter; + + /*! Base64 内容转 File 对象 */ + function Base64ToFile(base64, filename) { + var arr = base64.split(','); + var mime = arr[0].match(/:(.*?);/)[1], suffix = mime.split('/')[1]; + var bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n); + while (n--) u8arr[n] = bstr.charCodeAt(n); + return new File([u8arr], filename + '.' + suffix, {type: mime}); + } + + /*! File 对象转 Base64 内容 */ + function FileToBase64(file) { + var defer = jQuery.Deferred(), reader = new FileReader(); + reader.onload = function () { + defer.resolve(this.result); + }; + return reader.readAsDataURL(file), defer.promise(); + } + + /*! 图片压缩处理 */ + function ImageToThumb(url, quality) { + var deferred = jQuery.Deferred(); + var maxWidth = 500, maxHeight = 400, image = new Image(); + image.src = url, image.onload = function () { + var canvas = document.createElement('canvas'); + var context = canvas.getContext('2d'); + // 原始尺寸 + var originWidth = this.width, originHeight = this.height; + // 目标尺寸 + var targetWidth = originWidth, targetHeight = originHeight; + // 图片尺寸超过最大值的限制 + if (originWidth > maxWidth || originHeight > maxHeight) { + if (originWidth / originHeight > maxWidth / maxHeight) { + targetWidth = maxWidth; + targetHeight = Math.round(maxWidth * (originHeight / originWidth)); + } else { + targetHeight = maxHeight; + targetWidth = Math.round(maxHeight * (originWidth / originHeight)); + } + } + canvas.width = targetWidth, canvas.height = targetHeight; + context.clearRect(0, 0, targetWidth, targetHeight); + context.drawImage(this, 0, 0, targetWidth, targetHeight); + deferred.resolve(canvas.toDataURL('image/jpeg', quality || 0.92)); + }; + } + + /*! 上传状态提示扩展插件 */ + function NotifyExtend(file) { + var that = this; + this.notify = Notify.notify({width: 260, title: file.name, showProgress: true, description: '上传进度 0%', type: 'default', position: 'top-right', closeTimeout: 0}); + this.$elem = $(this.notify.notification.nodes); + this.$elem.find('.growl-notification__progress').addClass('is-visible'); + this.$elem.find('.growl-notification__progress-bar').addClass('transition'); + this.setProgress = function (number) { + this.$elem.find('[data-upload-progress]').html(number + '%'); + this.$elem.find('.growl-notification__progress-bar').css({width: number + '%'}); + return this; + }, this.setError = function (message) { + this.$elem.find('.growl-notification__desc').html(message || '文件上传失败！'); + this.$elem.removeClass('growl-notification--default').addClass('growl-notification--error') + return this.close(); + }, this.setSuccess = function (message) { + this.setProgress('100.00'); + this.$elem.find('.growl-notification__desc').html(message || '文件上传成功！'); + this.$elem.removeClass('growl-notification--default').addClass('growl-notification--success'); + return this.close(); + }, this.close = function (timeout) { + return setTimeout(function () { + that.notify.close(); + }, timeout || 2000), this; + }; } }); \ No newline at end of file diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index 9917d3851..104c78ab1 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -32,15 +32,42 @@ + +
+
+ 富编辑器Rich Text Editor +
+
+
+ {if !in_array(sysconf('base.editor'),['ckeditor4','ckeditor5','auto'])}{php}sysconf('base.editor','ckeditor4');{/php}{/if} + {foreach ['ckeditor4'=>'CKEditor4','ckeditor5'=>'CKEditor5','auto'=>'自适应模式'] as $k => $v}{if sysconf('base.editor') eq $k} + {if auth('storage')}{$v}{else}{$v}{/if} + {else} + {if auth('storage')}{$v}{else}{$v}{/if} + {/if}{/foreach} +
+
+

CKEditor4：旧版本编辑器，对浏览器兼容较好，但内容编辑体验稍有不足。

+

CKEditor5：新版本编辑器，只支持新特性浏览器，对内容编辑体验较好，推荐使用。

+

自适应模式：优先使用新版本编辑器，若浏览器不支持新版本时自动降级为旧版本编辑器。

+
+
+
存储引擎Storage Engine
+ + {if !sysconf('storage.type')}{php}sysconf('storage.type','local');{/php}{/if} + {if !sysconf('storage.link_type')}{php}sysconf('storage.link_type','none');{/php}{/if} + {if !sysconf('storage.name_type')}{php}sysconf('storage.name_type','xmd5');{/php}{/if} + {if !sysconf('storage.allow_exts')}{php}sysconf('storage.allow_exts','doc,gif,ico,jpg,mp3,mp4,p12,pem,png,rar,xls,xlsx');{/php}{/if} + {if !sysconf('storage.local_http_protocol')}{php}sysconf('storage.local_http_protocol','http');{/php}{/if}
- {foreach ['local' => '本地服务器存储','qiniu' => '七牛云对象存储','alioss' => '阿里云OSS存储','txcos' => '腾讯云COS存储'] as $k => $v} {if sysconf('storage.type') eq $k} + {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','upyun'=>'又拍云USS存储','alioss'=>'阿里云OSS存储','txcos'=>'腾讯云COS存储'] as $k => $v}{if sysconf('storage.type') eq $k} {if auth('storage')}{$v}{else}{$v}{/if} {else} {if auth('storage')}{$v}{else}{$v}{/if} @@ -49,6 +76,7 @@

本地服务器存储：文件直接上传到本地服务器的 `static/upload` 目录，不支持大文件上传，占用服务器磁盘空间，访问时消耗服务器带宽流量。

七牛云对象存储：文件直接上传到七牛云存储空间，支持大文件上传，不占用服务器空间及服务器带宽流量，支持 CDN 加速访问，访问量大时推荐使用。

+

又拍云USS存储：文件直接上传到又拍云 USS 存储空间，支持大文件上传，不占用服务器空间及服务器带宽流量，支持 CDN 加速访问，访问量大时推荐使用。

阿里云OSS存储：文件直接上传到阿里云 OSS 存储空间，支持大文件上传，不占用服务器空间及服务器带宽流量，支持 CDN 加速访问，访问量大时推荐使用。

腾讯云COS存储：文件直接上传到腾讯云 COS 存储空间，支持大文件上传，不占用服务器空间及服务器带宽流量，支持 CDN 加速访问，访问量大时推荐使用。

diff --git a/app/admin/view/config/storage-0.html b/app/admin/view/config/storage-0.html index ee3293f09..ab617daaf 100644 --- a/app/admin/view/config/storage-0.html +++ b/app/admin/view/config/storage-0.html @@ -1,10 +1,9 @@
- {if !sysconf('storage.name_type')}{php}sysconf('storage.name_type','xmd5');{/php}{/if} - {foreach ['xmd5'=>'文件哈希值','date'=>'日期+随机'] as $k=>$v} + {foreach ['xmd5'=>'文件哈希值 ( 支持秒传 )','date'=>'日期+随机 ( 普通上传 )'] as $k=>$v}
+
- {if !sysconf('storage.link_type')}{php}sysconf('storage.link_type','none');{/php}{/if} {foreach ['none'=>'简洁链接','full'=>'完整链接','none+compress'=>'简洁并压缩图片','full+compress'=>'完整并压缩图片'] as $k=>$v}