修正邮件与IP或域名拦截配置模板,业务无配置数据时统一下发{}
This commit is contained in:
@@ -717,6 +717,7 @@ public class ConfigServiceUtil {
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw e;
|
||||
}finally {
|
||||
if (response != null) {
|
||||
@@ -781,6 +782,7 @@ public class ConfigServiceUtil {
|
||||
//创建连接
|
||||
WebTarget wt = ClientUtil.getWebTarger(url);
|
||||
logger.info("sync_send url:"+url);
|
||||
logger.info("Last-Completed-Tag:"+completeTag);
|
||||
//获取响应结果
|
||||
Builder header = wt.request(MediaType.APPLICATION_JSON)
|
||||
.header("Content-Type", MediaType.APPLICATION_JSON)
|
||||
|
||||
@@ -136,12 +136,12 @@ public class ConfigSynchronizationService extends BaseService{
|
||||
handleCallbackData(className,page,entity,request,response,false);
|
||||
}
|
||||
if(!isFinished && lastServiceTag){//如果业务没有配置数据,并且为最后一个业务,需要发送给服务接口一个结束标识
|
||||
String json = "";
|
||||
if("1".equals(serviceType)){
|
||||
String json = "{}";
|
||||
/*if("1".equals(serviceType)){
|
||||
json="{}";
|
||||
}else{
|
||||
json="[]";
|
||||
}
|
||||
}*/
|
||||
JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user