1、修改getMaatTableName方法中获取不到表名的异常信息;
2、如果最后的service没有配置,不论是maat类还是回调类配置,都会传{}+lastCompletedTag(finished)来结束数据传输;
3、找不到业务入库序号时,提示XX业务写入数据库序号映射关系不存在
This commit is contained in:
@@ -311,7 +311,7 @@ public class ServiceAndRDBIndexReal {
|
|||||||
return tableList.get(index);
|
return tableList.get(index);
|
||||||
} else {
|
} else {
|
||||||
logger.error("未从业务类型和表对应关系中,找到业务类型:{},配置类型:{}表名:{}对应的真实表名", service, type, tableName);
|
logger.error("未从业务类型和表对应关系中,找到业务类型:{},配置类型:{}表名:{}对应的真实表名", service, type, tableName);
|
||||||
throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到回调类配置service为"
|
throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到service为"
|
||||||
+ service + ",配置类型:" + type + "对应的真实表名", RestBusinessCode.NotFoundTableName.getValue());
|
+ service + ",配置类型:" + type + "对应的真实表名", RestBusinessCode.NotFoundTableName.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -565,7 +565,7 @@ public class ConfigSourcesController extends BaseRestController {
|
|||||||
String serviceId = request.getHeader("Service-Id");
|
String serviceId = request.getHeader("Service-Id");
|
||||||
String configTable = request.getHeader("Config-Table");
|
String configTable = request.getHeader("Config-Table");
|
||||||
String lastCompletedTag = request.getHeader("Last-Completed-Tag");
|
String lastCompletedTag = request.getHeader("Last-Completed-Tag");
|
||||||
logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:");
|
// logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:");
|
||||||
if (StringUtil.isEmpty(serviceId)) {
|
if (StringUtil.isEmpty(serviceId)) {
|
||||||
logger.error("未在请求头中获取到serviceId");
|
logger.error("未在请求头中获取到serviceId");
|
||||||
throw new RestServiceException(
|
throw new RestServiceException(
|
||||||
@@ -590,7 +590,7 @@ public class ConfigSourcesController extends BaseRestController {
|
|||||||
logger.info("-----------开始存储到json格式数据------->>configType:" + configType + ",serviceId:" + serviceId
|
logger.info("-----------开始存储到json格式数据------->>configType:" + configType + ",serviceId:" + serviceId
|
||||||
+ ",configTable:" + configTable + ",lastCompletedTag:" + lastCompletedTag);
|
+ ",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;
|
String key = null;
|
||||||
if ("1".equals(configType)) {
|
if ("1".equals(configType)) {
|
||||||
key = "MAAT";
|
key = "MAAT";
|
||||||
@@ -637,6 +637,10 @@ public class ConfigSourcesController extends BaseRestController {
|
|||||||
}
|
}
|
||||||
logger.info("-----------配置同步指令下发:" + new Date());
|
logger.info("-----------配置同步指令下发:" + new Date());
|
||||||
// 设置配置同步状态为开始
|
// 设置配置同步状态为开始
|
||||||
|
//在下次开始同步之前把上次记录的key删除
|
||||||
|
if (JedisClusterUtils.exists("allConfigSyncKey")) {
|
||||||
|
JedisClusterUtils.getResource().del("allConfigSyncKey");
|
||||||
|
}
|
||||||
configSourcesService.setAllConfigSyncStatus("0");
|
configSourcesService.setAllConfigSyncStatus("0");
|
||||||
} else if ("0".equals(obj.get("syncStatus").toString())) {// 取消同步指令
|
} else if ("0".equals(obj.get("syncStatus").toString())) {// 取消同步指令
|
||||||
if (allConfigSyncStatus != null
|
if (allConfigSyncStatus != null
|
||||||
|
|||||||
@@ -299,7 +299,7 @@ public class ConfigSourcesService extends BaseService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(),
|
throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",
|
||||||
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -478,7 +478,7 @@ public class ConfigSourcesService extends BaseService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(),
|
throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",
|
||||||
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -801,7 +801,7 @@ public class ConfigSourcesService extends BaseService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",
|
throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",
|
||||||
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -891,7 +891,7 @@ public class ConfigSourcesService extends BaseService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",
|
throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",
|
||||||
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -972,7 +972,7 @@ public class ConfigSourcesService extends BaseService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在",
|
throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在",
|
||||||
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
RestBusinessCode.ServiceNoFoundDBIndex.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user