Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
===================================================================
diff -u -r18351 -r18711
--- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java	(.../InitializeDataManagerImpl.java)	(revision 18351)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java	(.../InitializeDataManagerImpl.java)	(revision 18711)
@@ -854,44 +854,46 @@
 				pathList.forEach(new Consumer<java.nio.file.Path>() {
 					@Override
 					public void accept(java.nio.file.Path path) {
-//						String fileName = path.getFileName().toString();
-						String json = FileUtils.readAllContentAsString(path,
-								"utf-8");
-						if (StringUtils.isBlank(json)) {
-							return;
-						}
-						
-						JSONObject obj = JSONObject.fromObject(json);
-						String name = JSONUtil.optString(obj,
-								"name", "");
-						// 判断该模板是否已存在
-						LabelTemplate labelTemplate = (LabelTemplate) objectDao
-								.getByProperty(
-										LabelTemplate.class.getSimpleName(),
-										"name", name);
-						if (labelTemplate != null) {
-							return;
-						}
-						labelTemplate = new LabelTemplate();
-						String dataSourceName = JSONUtil.optString(obj,
-								"dataSourceName", "");
-						String description = JSONUtil.optString(obj,
-								"description", "");
-						String width = JSONUtil.optString(obj, "width", "");
-						String height = JSONUtil.optString(obj, "height", "");
-						String programCodes = JSONUtil.optString(obj,
-								"programCodes", "");
-						String templateInfo = JSONUtil.optString(obj,
-								"templateInfo", "");
+						String fileName = path.getFileName().toString();
+						// 如果该路径不是.svn文件，则进行处理，Terry Kwan, 2017-07-08
+						if (fileName.indexOf(".svn") == -1) {
+							String json = FileUtils.readAllContentAsString(
+									path, "utf-8");
+							if (StringUtils.isBlank(json)) {
+								return;
+							}
 
-						labelTemplate.setName(name);
-						labelTemplate.setDataSourceName(dataSourceName);
-						labelTemplate.setDescription(description);
-						labelTemplate.setWidth(width);
-						labelTemplate.setHeight(height);
-						labelTemplate.setProgramCodes(programCodes);
-						labelTemplate.setTemplateInfo(templateInfo);
-						objectDao.saveOrUpdate(labelTemplate);
+							JSONObject obj = JSONObject.fromObject(json);
+							String name = JSONUtil.optString(obj, "name", "");
+							// 判断该模板是否已存在
+							LabelTemplate labelTemplate = (LabelTemplate) objectDao.getByProperty(
+									LabelTemplate.class.getSimpleName(),
+									"name", name);
+							if (labelTemplate != null) {
+								return;
+							}
+							labelTemplate = new LabelTemplate();
+							String dataSourceName = JSONUtil.optString(obj,
+									"dataSourceName", "");
+							String description = JSONUtil.optString(obj,
+									"description", "");
+							String width = JSONUtil.optString(obj, "width", "");
+							String height = JSONUtil.optString(obj, "height",
+									"");
+							String programCodes = JSONUtil.optString(obj,
+									"programCodes", "");
+							String templateInfo = JSONUtil.optString(obj,
+									"templateInfo", "");
+
+							labelTemplate.setName(name);
+							labelTemplate.setDataSourceName(dataSourceName);
+							labelTemplate.setDescription(description);
+							labelTemplate.setWidth(width);
+							labelTemplate.setHeight(height);
+							labelTemplate.setProgramCodes(programCodes);
+							labelTemplate.setTemplateInfo(templateInfo);
+							objectDao.saveOrUpdate(labelTemplate);
+						}
 					}
 				});
 			}