From 2e8273d2ae9e4f5fb1361a8302dcb094c2f0025a Mon Sep 17 00:00:00 2001
From: zhuangqian <smallchill@163.com>
Date: Thu, 5 Jan 2017 10:29:43 +0800
Subject: [PATCH] update

---
 .../core/toolbox/file/BladeFileKit.java       | 44 +++++++++++++++++++
 .../resources/spring/springmvc-servlet.xml    |  6 +--
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/smallchill/core/toolbox/file/BladeFileKit.java b/src/main/java/com/smallchill/core/toolbox/file/BladeFileKit.java
index f72696ad..8991df93 100644
--- a/src/main/java/com/smallchill/core/toolbox/file/BladeFileKit.java
+++ b/src/main/java/com/smallchill/core/toolbox/file/BladeFileKit.java
@@ -345,6 +345,27 @@ public class BladeFileKit {
 			map.put(name, url);
 		}
 	}
+	
+	/**   
+	 * 为虚拟路径添加配置的域名前缀
+	 * @param map  对象
+	 * @param name 路径字段名
+	 * @param defaultUrl 默认路径
+	*/
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static void addDomain(Map map, String name, String defaultUrl) {
+		if (null == map) {
+			return;
+		}
+		String url = Func.toStr(map.get(name));
+		// map为引用传递, 防止每次附加到缓存
+		if (url.indexOf(ConstConfig.DOMAIN) >= 0) {
+			return;
+		} else {
+			url = ConstConfig.DOMAIN + (StrKit.isBlank(url) ? defaultUrl : url);
+			map.put(name, url);
+		}
+	}
 
 	/**   
 	 * 为虚拟路径添加配置的域名前缀
@@ -367,5 +388,28 @@ public class BladeFileKit {
 			}
 		}
 	}
+	
+	/**   
+	 * 为虚拟路径添加配置的域名前缀
+	 * @param list 对象
+	 * @param name 路径字段名
+	 * @param defaultUrl 默认路径
+	*/
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static void addDomain(List<Map> list, String name, String defaultUrl) {
+		for (Map m : list) {
+			if (null == m) {
+				continue;
+			}
+			String url = Func.toStr(m.get(name));
+			// map为引用传递, 防止每次附加到缓存
+			if (url.indexOf(ConstConfig.DOMAIN) >= 0) {
+				break;
+			} else {
+				url = ConstConfig.DOMAIN + (StrKit.isBlank(url) ? defaultUrl : url);
+				m.put(name, url);
+			}
+		}
+	}
 
 }
diff --git a/src/main/resources/spring/springmvc-servlet.xml b/src/main/resources/spring/springmvc-servlet.xml
index 2c32951e..e17edd49 100644
--- a/src/main/resources/spring/springmvc-servlet.xml
+++ b/src/main/resources/spring/springmvc-servlet.xml
@@ -91,13 +91,13 @@
     </bean>
 
 
-	<!-- 引入dapplicationContext配置文件 -->
+	<!-- 引入applicationContext配置文件 -->
 	<import resource="applicationContext.xml" />
 	
-	<!-- 引入dapplicationContext-shiro配置文件 -->
+	<!-- 引入applicationContext-shiro配置文件 -->
 	<import resource="applicationContext-shiro.xml" />
 	
-	<!-- 引入dapplicationContext-datasource配置文件 -->
+	<!-- 引入applicationContext-datasource配置文件 -->
 	<import resource="applicationContext-datasource.xml" />
 	
 	<!-- 引入applicationContext-task配置文件 -->