Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangwei
2018-07-03 11:18:04 +08:00

View File

@@ -514,19 +514,19 @@ public class BaseController {
}
if (StringUtils.isNotBlank(entry.getProtocol())) {
params.put("searchProtocol", entry.getProtocol());
params.put("searchTransProto", entry.getProtocol());
}
if (entry.getServiceType()!=null) {
params.put("searchServiceType", entry.getServiceType());
params.put("searchService", entry.getServiceType());
}
if (StringUtils.isNotBlank(entry.getServerIp())) {
params.put("searchServerIp", entry.getServerIp());
params.put("searchDIp", entry.getServerIp());
}
if (StringUtils.isNotBlank(entry.getClientIp())) {
params.put("searchClientIp", entry.getClientIp());
params.put("searchSIp", entry.getClientIp());
}
if (StringUtils.isNotBlank(entry.getCljIp())) {
params.put("searchCljIp", entry.getCljIp());
params.put("searchCapIp", entry.getCljIp());
}
if (entry.getDirection()!=null) {
params.put("searchDirection", entry.getDirection());