From 097497f87a886aaad78e6860aec8b889bd204ab5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 23 Mar 2020 13:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/api/Queue.php | 21 +++++++++++++++++++++
 public/static/admin.js             |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php
index 36def8b6a..ebec73e5d 100644
--- a/app/admin/controller/api/Queue.php
+++ b/app/admin/controller/api/Queue.php
@@ -1,13 +1,34 @@
 <?php
 
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
 
 namespace app\admin\controller\api;
 
 use think\admin\Controller;
 use think\admin\service\QueueService;
 
+/**
+ * 后台任务通用接口
+ * Class Queue
+ * @package app\admin\controller\api
+ */
 class Queue extends Controller
 {
+    /**
+     * 任务进度查询
+     * @login true
+     */
     public function progress()
     {
         $input = $this->_vali(['code.require' => '任务编号不能为空！']);
diff --git a/public/static/admin.js b/public/static/admin.js
index 81a29a673..361eeec11 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -788,7 +788,9 @@ $(function () {
                         this.lines = [];
                         for (this.i in lines) {
                             this.line = lines[this.i], this.percent = '[ ' + this.line.progress + '% ] ';
-                            this.lines.push(this.line.message.indexOf('>>>') > -1 ? this.line.message : this.percent + this.line.message);
+                            if (this.line.message.indexOf('javascript:') === -1) {
+                                this.lines.push(this.line.message.indexOf('>>>') > -1 ? this.line.message : this.percent + this.line.message);
+                            }
                         }
                         that.$area.val(this.lines.join("\n")), that.$area.animate({scrollTop: that.$area[0].scrollHeight + 'px'}, 200);
                     })(ret.data.history);