From 050fd5796d5bf08a1d92c37706864a5dc9668d06 Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Tue, 17 Jul 2018 18:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E4=B8=AD=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC=E4=B8=BA=E5=9B=BA=E5=AE=9A=E5=80=BC0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/service/restful/ConfigJedisServiceimpl.java     | 2 ++
 .../java/com/nis/web/service/restful/ConfigSourcesService.java  | 2 +-
 src/main/resources/maatXml/applicationConfig-maatRedis.xml      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
index 61e5f08..cc23008 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
@@ -92,6 +92,8 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 														valBF.append("\t");
 													} else if (valStr.equals("\\n")) {
 														valBF.append("\n");
+													}else {
+														valBF.append(valStr);
 													}
 												}
 												maatKey = keyBF.toString();
diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
index fc26afb..c75e866 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
@@ -3034,7 +3034,7 @@ public class ConfigSourcesService extends BaseService {
 									.getUnMaatTableName(Integer.valueOf(srcMap.get("service")
 											.toString().trim()));
 							String dstPath = Constants.MM_SAMPLE_DST_PATH.replace("{tableType}", maatTableName.substring(maatTableName.lastIndexOf("_")+1));
-							dstPath=dstPath.replace("{fileName}", dstStr.substring(dstStr.lastIndexOf("/")+1));
+							dstStr=dstPath.replace("{fileName}", dstStr.substring(dstStr.lastIndexOf("/")+1));
 						}else if ("file_id".equals(commonSourceFieldCfg
 							.getDstName())) {
 							dstStr= dstStr.substring(dstStr.indexOf("/group"));
diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
index d17ed49..1719ff5 100644
--- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml
+++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
@@ -10,7 +10,7 @@
 	<p:maatType service="261;262;263;264;389;390;391;392">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];\t;[service];\t;[action];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
+			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];\t;[service];\t;[action];&amp;nbsp;0;\t;[file_id];\n</p:valueExpression>
 <!-- 			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> -->
 		</p:expressions>
 		<p:sequences>