1、修改getMaatTableName方法中获取不到表名的异常信息；Release-1.3-rc1

2、如果最后的service没有配置，不论是maat类还是回调类配置，都会传{}+lastCompletedTag(finished)来结束数据传输；
3、找不到业务入库序号时，提示XX业务写入数据库序号映射关系不存在

3 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java
index b7427c1..578e4e2 100644
--- a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java
+++ b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java
@@ -311,7 +311,7 @@ public class ServiceAndRDBIndexReal {
 						return tableList.get(index);

 					} else {

 						logger.error("未从业务类型和表对应关系中,找到业务类型:{},配置类型:{}表名:{}对应的真实表名", service, type, tableName);

-						throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到回调类配置service为"

+						throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到service为"

 								+ service + ",配置类型:" + type + "对应的真实表名", RestBusinessCode.NotFoundTableName.getValue());

 					}

 

diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
index 7b0fb1f..121d90f 100644
--- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
+++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
@@ -565,7 +565,7 @@ public class ConfigSourcesController extends BaseRestController {
 			String serviceId = request.getHeader("Service-Id");

 			String configTable = request.getHeader("Config-Table");

 			String lastCompletedTag = request.getHeader("Last-Completed-Tag");

-			logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:");

+//			logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:");

 			if (StringUtil.isEmpty(serviceId)) {

 				logger.error("未在请求头中获取到serviceId");

 				throw new RestServiceException(

@@ -590,7 +590,7 @@ public class ConfigSourcesController extends BaseRestController {
 			logger.info("-----------开始存储到json格式数据------->>configType:" + configType + ",serviceId:" + serviceId

 					+ ",configTable:" + configTable + ",lastCompletedTag:" + lastCompletedTag);

 

-			if (jsonString != null && !jsonString.trim().equals("")) {// 张薇说body可能为空,有的service没有数据也会下发一次,譬如最后一次提交时,lastCompletedTag=finished,但是body可能是空的

+			if (jsonString != null && !jsonString.trim().equals("{}")) {// 如果最后的service没有配置，不论是maat类还是回调类配置，都会传{}+lastCompletedTag(finished)来结束数据传输

 				String key = null;

 				if ("1".equals(configType)) {

 					key = "MAAT";

@@ -637,6 +637,10 @@ public class ConfigSourcesController extends BaseRestController {
 				}

 				logger.info("-----------配置同步指令下发:" + new Date());

 				// 设置配置同步状态为开始

+				//在下次开始同步之前把上次记录的key删除

+				if (JedisClusterUtils.exists("allConfigSyncKey")) {

+					JedisClusterUtils.getResource().del("allConfigSyncKey");

+				}

 				configSourcesService.setAllConfigSyncStatus("0");

 			} else if ("0".equals(obj.get("syncStatus").toString())) {// 取消同步指令

 				if (allConfigSyncStatus != null

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 4791ba8..eb4416d 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
@@ -299,7 +299,7 @@ public class ConfigSourcesService extends BaseService {
 

 				}

 			} else {

-				throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(),

+				throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",

 						RestBusinessCode.ServiceNoFoundDBIndex.getValue());

 			}

 		}

@@ -478,7 +478,7 @@ public class ConfigSourcesService extends BaseService {
 

 				}

 			} else {

-				throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(),

+				throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",

 						RestBusinessCode.ServiceNoFoundDBIndex.getValue());

 			}

 		}

@@ -801,7 +801,7 @@ public class ConfigSourcesService extends BaseService {
 					}

 				}

 			} else {

-				throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",

+				throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",

 						RestBusinessCode.ServiceNoFoundDBIndex.getValue());

 			}

 

@@ -891,7 +891,7 @@ public class ConfigSourcesService extends BaseService {
 					}

 				}

 			} else {

-				throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",

+				throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",

 						RestBusinessCode.ServiceNoFoundDBIndex.getValue());

 			}

 

@@ -972,7 +972,7 @@ public class ConfigSourcesService extends BaseService {
 					}

 				}

 			} else {

-				throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",

+				throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",

 						RestBusinessCode.ServiceNoFoundDBIndex.getValue());

 			}

 		}