From 50b82303eb88c9ab89446b846a54adc7b18938c4 Mon Sep 17 00:00:00 2001
From: zhuangqian <smallchill@163.com>
Date: Sun, 20 Nov 2016 19:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=8A=A0=E8=BD=BD=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/KindEditorController.java           | 8 +++++++-
 src/main/webapp/WEB-INF/view/common/_curd/_edit.html      | 2 +-
 src/main/webapp/WEB-INF/view/common/_curd/_view.html      | 2 +-
 .../webapp/WEB-INF/view/common/_widget/fileupload.tag     | 2 +-
 src/main/webapp/WEB-INF/view/common/_widget/imgupload.tag | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/smallchill/system/controller/KindEditorController.java b/src/main/java/com/smallchill/system/controller/KindEditorController.java
index 248c39dc..e98aacc0 100644
--- a/src/main/java/com/smallchill/system/controller/KindEditorController.java
+++ b/src/main/java/com/smallchill/system/controller/KindEditorController.java
@@ -99,18 +99,24 @@ public class KindEditorController extends BladeController {
 	public AjaxResult initimg(@RequestParam String id) { 
 		Map<String, Object> img = Db.findById("TFW_ATTACH", id);
 		if (null != img) {
+			String url = ConstConfig.DOMAIN + img.get("URL");
+			img.put("URL", url);
 			return json(img);
 		} else {
 			return fail("获取图片失败！");
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@ResponseBody
 	@RequestMapping("/initfile")
 	public AjaxResult initfile(@RequestParam String ids) {
 		List<Map> file = Db.selectList("select ID as \"id\",NAME as \"name\",URL as \"url\" from TFW_ATTACH where ID in (#{join(ids)})", Paras.create().set("ids", ids.split(",")));
 		if (null != file) {
+			for (Map<String, Object> m : file) {
+				String url = ConstConfig.DOMAIN + m.get("url");
+				m.put("url", url);
+			}
 			return json(file);
 		} else {
 			return fail("获取附件失败！");
diff --git a/src/main/webapp/WEB-INF/view/common/_curd/_edit.html b/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
index 7082158f..7a8e2346 100644
--- a/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
+++ b/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
@@ -164,7 +164,7 @@
 					else if(_model[x] != null && $x.attr("data-type") == "fileupload"){
 						var ids = _model[x];
 						$x.val(ids);
-						initFileUpload(ids, "edit");
+						eval("_" + x + "_initFileUpload('" + ids + "', 'edit')"); 
 					}
 					else if(_model[x] != null && $x.attr("data-type") == "opentree"){
 						var ids = _model[x];
diff --git a/src/main/webapp/WEB-INF/view/common/_curd/_view.html b/src/main/webapp/WEB-INF/view/common/_curd/_view.html
index 3225c6b6..380835ad 100644
--- a/src/main/webapp/WEB-INF/view/common/_curd/_view.html
+++ b/src/main/webapp/WEB-INF/view/common/_curd/_view.html
@@ -86,7 +86,7 @@
 						}
 						else if(_model[x] != null && $x.attr("data-type") == "fileupload"){
 							var ids = _model[x];
-							initFileUpload(ids, "view");
+							eval("_" + x + "_initFileUpload('" + ids + "', 'view')"); 
 							$x.val(ids);
 						}
 						else if($x.is("span")){
diff --git a/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag b/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
index fbd19da7..db8e5b07 100644
--- a/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
+++ b/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
@@ -64,7 +64,7 @@
 							for(var x = 0; x < file.length; x++){
 								var id = file[x].id;
 								var name = file[x].name;
-								var url = "${ctxPath}/kindeditor/renderFile/" + id;
+								var url = file[x].url;
 								if(type == "edit"){
 									$("#${x.index!}_file").append(_${x.index!}_getFile(url, id, name));
 								}
diff --git a/src/main/webapp/WEB-INF/view/common/_widget/imgupload.tag b/src/main/webapp/WEB-INF/view/common/_widget/imgupload.tag
index 71bfb24a..af176c43 100644
--- a/src/main/webapp/WEB-INF/view/common/_widget/imgupload.tag
+++ b/src/main/webapp/WEB-INF/view/common/_widget/imgupload.tag
@@ -69,7 +69,7 @@
 			function initImgUpload(id){
 				$.post("${ctxPath}/kindeditor/initimg", {id : id}, function(data){
 					if(data.code === 0){
-						$("#_${x.index!}_IMG").attr("src", "${ctxPath}"+ data.data.URL);
+						$("#_${x.index!}_IMG").attr("src", data.data.URL);
 					}
 					else{
 						/* layer.alert("加载图片失败", {