|
@@ -56,10 +56,12 @@ public class CdrPush implements ApplicationListener<ApplicationReadyEvent> {
|
|
|
try {
|
|
try {
|
|
|
String url = SystemConfig.getValue("post_cdr_url");
|
|
String url = SystemConfig.getValue("post_cdr_url");
|
|
|
//如果有自定义回调地址 替换回调地址为自定义回调地址 否则默认回调
|
|
//如果有自定义回调地址 替换回调地址为自定义回调地址 否则默认回调
|
|
|
- String callBackUrlByUuid = getCallBackUrlByUuid(cdr.getUuid());
|
|
|
|
|
- if(org.apache.commons.lang3.StringUtils.isNotBlank(callBackUrlByUuid)){
|
|
|
|
|
- url = callBackUrlByUuid;
|
|
|
|
|
|
|
+ String callBackUrl = getCallBackUrlByUuid(cdr.getUuid());
|
|
|
|
|
+ logger.info("测试日志cdrUUid:{} ,callBackUrlByUuid: {}", cdr.getUuid(), callBackUrl);
|
|
|
|
|
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(callBackUrl)){
|
|
|
|
|
+ url = callBackUrl;
|
|
|
}
|
|
}
|
|
|
|
|
+ logger.info("测试日志最后请求的url:{}",url);
|
|
|
if (StringUtils.isNullOrEmpty(url)) {
|
|
if (StringUtils.isNullOrEmpty(url)) {
|
|
|
logger.error("post_cdr_url has not been configured yet.");
|
|
logger.error("post_cdr_url has not been configured yet.");
|
|
|
return false;
|
|
return false;
|
|
@@ -106,6 +108,7 @@ public class CdrPush implements ApplicationListener<ApplicationReadyEvent> {
|
|
|
|
|
|
|
|
private String getCallBackUrlByUuid(String uuid){
|
|
private String getCallBackUrlByUuid(String uuid){
|
|
|
String userBizJson = sysDao.getUserBizJson(uuid);
|
|
String userBizJson = sysDao.getUserBizJson(uuid);
|
|
|
|
|
+ logger.info("测试日志userBizJson:{},查询uuid:{}", userBizJson,uuid);
|
|
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(userBizJson)){
|
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(userBizJson)){
|
|
|
JSONObject obj = JSONObject.parseObject(userBizJson);
|
|
JSONObject obj = JSONObject.parseObject(userBizJson);
|
|
|
if(null != obj && !obj.isEmpty() && obj.containsKey("callbackUrl")){
|
|
if(null != obj && !obj.isEmpty() && obj.containsKey("callbackUrl")){
|