diff --git a/app/service/UeditorService.php b/app/service/UeditorService.php
index cac6fe3ee..aeeeb837a 100644
--- a/app/service/UeditorService.php
+++ b/app/service/UeditorService.php
@@ -307,6 +307,7 @@ class UeditorService
                     $ret = ResourcesService::AttachmentAdd($data);
                     if($ret['code'] == 0)
                     {
+                        $ret['data']['source'] = htmlspecialchars($imgUrl);
                         array_push($list, $ret['data']);
                     }
                 }
diff --git a/extend/base/Uploader.php b/extend/base/Uploader.php
index f43ce204e..7a4c15dba 100755
--- a/extend/base/Uploader.php
+++ b/extend/base/Uploader.php
@@ -375,29 +375,12 @@ class Uploader
             return;
         }
 
-        //获取请求头并检测死链
-        $heads = get_headers($imgUrl, 1);
-        if (!(stristr($heads[0], "200") && stristr($heads[0], "OK"))) {
+        //打开输出缓冲区并获取远程图片
+        $img = RequestGet($imgUrl);
+        if(empty($img)) {
             $this->stateInfo = $this->getStateInfo("ERROR_DEAD_LINK");
             return;
         }
-        //格式验证(扩展名验证和Content-Type验证)
-        $fileType = strtolower(strrchr($imgUrl, '.'));
-        if (!in_array($fileType, $this->config['allowFiles']) || !isset($heads['Content-Type']) || !stristr($heads['Content-Type'], "image")) {
-            $this->stateInfo = $this->getStateInfo("ERROR_HTTP_CONTENTTYPE");
-            return;
-        }
-
-        //打开输出缓冲区并获取远程图片
-        ob_start();
-        $context = stream_context_create(
-            array('http' => array(
-                'follow_location' => false // don't follow redirects
-            ))
-        );
-        readfile($imgUrl, false, $context);
-        $img = ob_get_contents();
-        ob_end_clean();
         preg_match("/[\/]([^\/]*)[\.]?[^\.\/]*$/", $imgUrl, $m);
 
         $this->oriName = $m ? $m[1]:"";
diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js
index 4f3075e8b..83fd3d89b 100755
--- a/public/static/common/lib/ueditor/ueditor.all.js
+++ b/public/static/common/lib/ueditor/ueditor.all.js
@@ -23253,21 +23253,19 @@ UE.plugins['catchremoteimage'] = function () {
                     }
 
                     /* 获取源路径和新路径 */
-                    var i, newSrc, list = info.data || null;
-                    if(list == null || list.length <= 0 || list.length != imgs.length)
-                    {
-                        return;
-                    }
-
-                    // 循环处理图片替换
-                    for (i = 0; i<imgs.length;i++) {
-                        if((list[i] || null) != null && (list[i]['url'] || null) != null)
-                        {
-                            newSrc = catcherUrlPrefix + list[i]['url'];
-                            domUtils.setAttributes(imgs[i], {
-                                "src": newSrc,
-                                "_src": newSrc
-                            });
+                    var i, j, ci, cj, oldSrc, newSrc, list = info.data;
+                    for (i = 0; ci = imgs[i++];) {
+                        oldSrc = ci.getAttribute('_src') || ci.src || "";
+                        for (j = 0; cj = list[j++];) {
+                            if (oldSrc == cj.source && cj.state == 'SUCCESS') {
+                                //抓取失败时不做替换处理
+                                newSrc = catcherUrlPrefix + cj.url;
+                                domUtils.setAttributes(ci, {
+                                    "src": newSrc,
+                                    "_src": newSrc
+                                });
+                                break;
+                            }
                         }
                     }
                     me.fireEvent('catchremotesuccess')