Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
leijun
2018-10-16 13:51:16 +08:00
5 changed files with 13 additions and 11 deletions

View File

@@ -56,7 +56,7 @@ public class MmVoipIpLogController extends BaseController{
model.addAttribute("serviceList", serviceList);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG;
url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_LOG;
String jsonString = HttpClientUtil.getMsg(url,params,request);
Gson gson = new GsonBuilder().create();
@@ -72,10 +72,10 @@ public class MmVoipIpLogController extends BaseController{
setLogAction(l,serviceList);
}
model.addAttribute("page", page);
logger.info("查询VoipIp日志成功");
logger.info("查询Voip日志成功");
}
} catch (Exception e) {
logger.error("查询VoipIp日志失败", e);
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmVoipIpList";